diff options
author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-22 22:34:19 +0000 |
---|---|---|
committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-11-22 22:34:19 +0000 |
commit | 0a57b790871b27ea6fd3b1ba97474dddcce7845f (patch) | |
tree | 0ad46b248e42f96e93b54874aa3b073ad1273aa1 /navit/cache.c | |
parent | cffcb036be4aa6097d064c5fb55f3de1a84b23d0 (diff) | |
download | navit-svn-0a57b790871b27ea6fd3b1ba97474dddcce7845f.tar.gz |
Refactor:core:Introduce enum for debug levels, and use it everywhere.|First part of #1269.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5960 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/cache.c')
-rw-r--r-- | navit/cache.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/navit/cache.c b/navit/cache.c index 0596a65f..8e63b53c 100644 --- a/navit/cache.c +++ b/navit/cache.c @@ -33,13 +33,13 @@ static void cache_entry_dump(struct cache *cache, struct cache_entry *entry) { int i,size; - dbg(0,"Usage: %d size %d\n",entry->usage, entry->size); + dbg(lvl_error,"Usage: %d size %d\n",entry->usage, entry->size); if (cache) size=cache->id_size; else size=5; for (i = 0 ; i < size ; i++) { - dbg(0,"0x%x\n", entry->id[i]); + dbg(lvl_error,"0x%x\n", entry->id[i]); } } @@ -47,7 +47,7 @@ static void cache_list_dump(char *str, struct cache *cache, struct cache_entry_list *list) { struct cache_entry *first=list->first; - dbg(0,"dump %s %d\n",str, list->size); + dbg(lvl_error,"dump %s %d\n",str, list->size); while (first) { cache_entry_dump(cache, first); first=first->next; @@ -106,7 +106,7 @@ cache_new(int id_size, int size) cache->hash=g_hash_table_new(cache_hash20, cache_equal20); break; default: - dbg(0,"cache with id_size of %d not supported\n", id_size); + dbg(lvl_error,"cache with id_size of %d not supported\n", id_size); g_free(cache); cache=NULL; } @@ -152,7 +152,7 @@ cache_remove_from_list(struct cache_entry_list *list, struct cache_entry *entry) static void cache_remove(struct cache *cache, struct cache_entry *entry) { - dbg(1,"remove 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); + dbg(lvl_warning,"remove 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); g_hash_table_remove(cache->hash, (gpointer)(entry->id)); g_slice_free1(entry->size, entry); } @@ -185,7 +185,7 @@ cache_remove_lru(struct cache *cache, struct cache_entry_list *list) last=list->last; if (! last || last->usage || seen >= list->size) return NULL; - dbg(1,"removing %d\n", last->id[0]); + dbg(lvl_warning,"removing %d\n", last->id[0]); cache_remove_lru_helper(list); if (cache) { cache_remove(cache, last); @@ -211,7 +211,7 @@ void cache_entry_destroy(struct cache *cache, void *data) { struct cache_entry *entry=(struct cache_entry *)((char *)data-cache->entry_size); - dbg(1,"destroy 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); + dbg(lvl_warning,"destroy 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); entry->usage--; } @@ -219,8 +219,8 @@ static struct cache_entry * cache_trim(struct cache *cache, struct cache_entry *entry) { struct cache_entry *new_entry; - dbg(1,"trim 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); - dbg(1,"Trim %x from %d -> %d\n", entry->id[0], entry->size, cache->size); + dbg(lvl_warning,"trim 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); + dbg(lvl_warning,"Trim %x from %d -> %d\n", entry->id[0], entry->size, cache->size); if ( cache->entry_size < entry->size ) { g_hash_table_remove(cache->hash, (gpointer)(entry->id)); @@ -256,11 +256,11 @@ static int cache_replace(struct cache *cache) { if (cache->t1.size >= MAX(1,cache->t1_target)) { - dbg(1,"replace 12\n"); + dbg(lvl_warning,"replace 12\n"); if (!cache_move(cache, &cache->t1, &cache->b1)) cache_move(cache, &cache->t2, &cache->b2); } else { - dbg(1,"replace t2\n"); + dbg(lvl_warning,"replace t2\n"); if (!cache_move(cache, &cache->t2, &cache->b2)) cache_move(cache, &cache->t1, &cache->b1); } @@ -298,17 +298,17 @@ void * cache_lookup(struct cache *cache, void *id) { struct cache_entry *entry; - dbg(1,"get %d\n", ((int *)id)[0]); + dbg(lvl_warning,"get %d\n", ((int *)id)[0]); entry=g_hash_table_lookup(cache->hash, id); if (entry == NULL) { cache->insert=&cache->t1; #ifdef DEBUG_CACHE fprintf(stderr,"-"); #endif - dbg(1,"not in cache\n"); + dbg(lvl_warning,"not in cache\n"); return NULL; } - dbg(1,"found 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); + dbg(lvl_warning,"found 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); if (entry->where == &cache->t1 || entry->where == &cache->t2) { cache->hits+=entry->size; #ifdef DEBUG_CACHE @@ -317,7 +317,7 @@ cache_lookup(struct cache *cache, void *id) { else fprintf(stderr,"H"); #endif - dbg(1,"in cache %s\n", entry->where == &cache->t1 ? "T1" : "T2"); + dbg(lvl_warning,"in cache %s\n", entry->where == &cache->t1 ? "T1" : "T2"); cache_remove_from_list(entry->where, entry); cache_insert_mru(NULL, &cache->t2, entry); entry->usage++; @@ -327,18 +327,18 @@ cache_lookup(struct cache *cache, void *id) { #ifdef DEBUG_CACHE fprintf(stderr,"m"); #endif - dbg(1,"in phantom cache B1\n"); + dbg(lvl_warning,"in phantom cache B1\n"); cache->t1_target=MIN(cache->t1_target+MAX(cache->b2.size/cache->b1.size, 1),cache->size); cache_remove_from_list(&cache->b1, entry); } else if (entry->where == &cache->b2) { #ifdef DEBUG_CACHE fprintf(stderr,"M"); #endif - dbg(1,"in phantom cache B2\n"); + dbg(lvl_warning,"in phantom cache B2\n"); cache->t1_target=MAX(cache->t1_target-MAX(cache->b1.size/cache->b2.size, 1),0); cache_remove_from_list(&cache->b2, entry); } else { - dbg(0,"**ERROR** invalid where\n"); + dbg(lvl_error,"**ERROR** invalid where\n"); } cache_replace(cache); cache_remove(cache, entry); @@ -351,7 +351,7 @@ void cache_insert(struct cache *cache, void *data) { struct cache_entry *entry=(struct cache_entry *)((char *)data-cache->entry_size); - dbg(1,"insert 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); + dbg(lvl_warning,"insert 0x%x 0x%x 0x%x 0x%x 0x%x\n", entry->id[0], entry->id[1], entry->id[2], entry->id[3], entry->id[4]); if (cache->insert == &cache->t1) { if (cache->t1.size + cache->b1.size >= cache->size) { if (cache->t1.size < cache->size) { @@ -382,8 +382,8 @@ cache_insert_new(struct cache *cache, void *id, int size) static void cache_stats(struct cache *cache) { - dbg(0,"hits %d misses %d hitratio %d size %d entry_size %d id_size %d T1 target %d\n", cache->hits, cache->misses, cache->hits*100/(cache->hits+cache->misses), cache->size, cache->entry_size, cache->id_size, cache->t1_target); - dbg(0,"T1:%d B1:%d T2:%d B2:%d\n", cache->t1.size, cache->b1.size, cache->t2.size, cache->b2.size); + dbg(lvl_error,"hits %d misses %d hitratio %d size %d entry_size %d id_size %d T1 target %d\n", cache->hits, cache->misses, cache->hits*100/(cache->hits+cache->misses), cache->size, cache->entry_size, cache->id_size, cache->t1_target); + dbg(lvl_error,"T1:%d B1:%d T2:%d B2:%d\n", cache->t1.size, cache->b1.size, cache->t2.size, cache->b2.size); cache->hits=0; cache->misses=0; } @@ -396,6 +396,6 @@ cache_dump(struct cache *cache) cache_list_dump("B1", cache, &cache->b1); cache_list_dump("T2", cache, &cache->t2); cache_list_dump("B2", cache, &cache->b2); - dbg(0,"dump end\n"); + dbg(lvl_error,"dump end\n"); } |