diff options
Diffstat (limited to 'content/llcache.c')
-rw-r--r-- | content/llcache.c | 45 |
1 files changed, 26 insertions, 19 deletions
diff --git a/content/llcache.c b/content/llcache.c index eb300534d..b81aba84f 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -1331,13 +1331,13 @@ llcache_serialise_metadata(llcache_object *object, overflow: /* somehow we overflowed the buffer - hth? */ - LOG("Overflowed metadata buffer"); + NSLOG(netsurf, INFO, "Overflowed metadata buffer"); free(data); return NSERROR_INVALID; operror: /* output error */ - LOG("Output error"); + NSLOG(netsurf, INFO, "Output error"); free(data); return NSERROR_INVALID; } @@ -1374,7 +1374,7 @@ llcache_process_metadata(llcache_object *object) size_t num_headers; size_t hloop; - LOG("Retrieving metadata"); + NSLOG(netsurf, INFO, "Retrieving metadata"); /* attempt to retrieve object metadata from the backing store */ res = guit->llcache->fetch(object->url, @@ -1385,7 +1385,7 @@ llcache_process_metadata(llcache_object *object) return res; } - LOG("Processing retrieved data"); + NSLOG(netsurf, INFO, "Processing retrieved data"); /* metadata line 1 is the url the metadata referrs to */ line = 1; @@ -1408,8 +1408,8 @@ llcache_process_metadata(llcache_object *object) * by simply skipping caching of this object. */ - LOG("Got metadata for %s instead of %s", - nsurl_access(metadataurl), nsurl_access(object->url)); + NSLOG(netsurf, INFO, "Got metadata for %s instead of %s", + nsurl_access(metadataurl), nsurl_access(object->url)); nsurl_unref(metadataurl); @@ -1502,7 +1502,8 @@ llcache_process_metadata(llcache_object *object) return NSERROR_OK; format_error: - LOG("metadata error on line %d error code %d\n", line, res); + NSLOG(netsurf, INFO, "metadata error on line %d error code %d\n", + line, res); guit->llcache->release(object->url, BACKING_STORE_META); return res; @@ -1898,7 +1899,7 @@ static nserror llcache_fetch_redirect(llcache_object *object, /* Forcibly stop redirecting if we've followed too many redirects */ #define REDIRECT_LIMIT 10 if (object->fetch.redirect_count > REDIRECT_LIMIT) { - LOG("Too many nested redirects"); + NSLOG(netsurf, INFO, "Too many nested redirects"); event.type = LLCACHE_EVENT_ERROR; event.data.msg = messages_get("BadRedirect"); @@ -2493,8 +2494,10 @@ static void llcache_persist_slowcheck(void *p) total_bandwidth = (llcache->total_written * 1000) / llcache->total_elapsed; if (total_bandwidth < llcache->minimum_bandwidth) { - LOG("Current bandwidth %" PRIu64 " less than minimum %" PRIsizet, - total_bandwidth, llcache->minimum_bandwidth); + NSLOG(netsurf, INFO, + "Current bandwidth %"PRIu64" less than minimum %"PRIsizet, + total_bandwidth, + llcache->minimum_bandwidth); guit->llcache->finalise(); } } @@ -2550,7 +2553,7 @@ static void llcache_persist(void *p) * (bandwidth) for this run being exceeded. */ if (total_elapsed > llcache->time_quantum) { - LOG("Overran timeslot"); + NSLOG(netsurf, INFO, "Overran timeslot"); /* writeout has exhausted the available time. * Either the writeout is slow or the last * object was very large. @@ -2920,12 +2923,14 @@ static nserror llcache_object_notify_users(llcache_object *object) #ifdef LLCACHE_TRACE if (handle->state != objstate) { if (emitted_notify == false) { - LOG("Notifying users of %p", object); + NSLOG(netsurf, INFO, "Notifying users of %p", + object); emitted_notify = true; } - LOG("User %p state: %d Object state: %d", user, - handle->state, objstate); + NSLOG(netsurf, INFO, + "User %p state: %d Object state: %d", user, + handle->state, objstate); } #endif @@ -3364,7 +3369,8 @@ llcache_initialise(const struct llcache_parameters *prm) llcache->fetch_attempts = prm->fetch_attempts; llcache->all_caught_up = true; - LOG("llcache initialising with a limit of %d bytes", llcache->limit); + NSLOG(netsurf, INFO, "llcache initialising with a limit of %d bytes", + llcache->limit); /* backing store initialisation */ return guit->llcache->initialise(&prm->store); @@ -3427,10 +3433,11 @@ void llcache_finalise(void) llcache->total_elapsed; } - LOG("Backing store wrote %"PRIu64" bytes in %"PRIu64" ms " - "(average %"PRIu64" bytes/second)", - llcache->total_written, llcache->total_elapsed, - total_bandwidth); + NSLOG(netsurf, INFO, + "Backing store wrote %"PRIu64" bytes in %"PRIu64" ms ""(average %"PRIu64" bytes/second)", + llcache->total_written, + llcache->total_elapsed, + total_bandwidth); free(llcache); llcache = NULL; |