From 69bee6fb711adc060e8b162684bc87bb8b4eada1 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Wed, 7 Sep 2011 09:15:33 +0000
Subject: move bitmap cache initialisation up a level improve stats reporting

svn path=/trunk/netsurf/; revision=12770
---
 image/image.c | 29 -----------------------------
 1 file changed, 29 deletions(-)

(limited to 'image/image.c')

diff --git a/image/image.c b/image/image.c
index d65ae8a67..099b58ac0 100644
--- a/image/image.c
+++ b/image/image.c
@@ -24,7 +24,6 @@
 #include "utils/errors.h"
 
 #include "image/image.h"
-#include "image/image_cache.h"
 #include "image/bmp.h"
 #include "image/gif.h"
 #include "image/ico.h"
@@ -38,22 +37,6 @@
 
 #include "utils/config.h"
 
-/** low water mark for speculative pre-conversion */
-
-/* Experimenting by visiting every page from default page in order and
- * then netsurf homepage
- *
- * 0    : Cache hit/miss/speculative miss/fail 604/147/  0/0 (80%/19%/ 0%/ 0%)
- * 2048 : Cache hit/miss/speculative miss/fail 622/119/ 17/0 (82%/15%/ 2%/ 0%)
- * 4096 : Cache hit/miss/speculative miss/fail 656/109/ 25/0 (83%/13%/ 3%/ 0%)
- * 8192 : Cache hit/miss/speculative miss/fail 648/104/ 40/0 (81%/13%/ 5%/ 0%)
- * ALL  : Cache hit/miss/speculative miss/fail 775/  0/161/0 (82%/ 0%/17%/ 0%)
-*/
-#define SPECULATE_SMALL 4096
-
-/* the time between cache clean runs in ms */
-#define CACHE_CLEAN_TIME (10 * 1000)
-
 /**
  * Initialise image content handlers
  *
@@ -62,16 +45,6 @@
 nserror image_init(void)
 {
 	nserror error;
-	struct image_cache_parameters image_cache_parameters = {
-		.bg_clean_time = CACHE_CLEAN_TIME,
-		.limit = (8 * 1024 * 1024),
-		.hysteresis = (2 * 1024 * 1024),
-		.speculative_small = SPECULATE_SMALL
-	};
-
-	error = image_cache_init(&image_cache_parameters);
-	if (error != NSERROR_OK)
-		return error;
 
 #ifdef WITH_BMP
 	error = nsbmp_init();
@@ -187,7 +160,5 @@ void image_fini(void)
 	webp_fini();
 #endif 
 
-	/* dump any remaining cache entries */
-	image_cache_fini();
 }
 
-- 
cgit v1.2.3