diff options
author | Luca Deri <deri@ntop.org> | 2024-10-06 18:36:28 +0200 |
---|---|---|
committer | Luca Deri <deri@ntop.org> | 2024-10-07 20:08:53 +0200 |
commit | 5475625c463a0c9066986db3263fba4f076ea69c (patch) | |
tree | 47103e78ea04735ef8978f4ff1fa41b0370c0852 /src | |
parent | 6cb16311324c3af7acb8edc0d4d0243642c95d25 (diff) |
Indent fix
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/ndpi_cache.c | 10 | ||||
-rw-r--r-- | src/lib/third_party/src/libcache.c | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/ndpi_cache.c b/src/lib/ndpi_cache.c index fbbd83900..abc03604d 100644 --- a/src/lib/ndpi_cache.c +++ b/src/lib/ndpi_cache.c @@ -47,6 +47,7 @@ struct ndpi_lru_cache *ndpi_lru_cache_init(u_int32_t num_entries, u_int32_t ttl, c->ttl = ttl & 0x7FFFFFFF; c->shared = !!shared; + #ifdef USE_GLOBAL_CONTEXT if(c->shared) { if(pthread_mutex_init(&c->mutex, NULL) != 0) { @@ -55,6 +56,7 @@ struct ndpi_lru_cache *ndpi_lru_cache_init(u_int32_t num_entries, u_int32_t ttl, } } #endif + c->entries = (struct ndpi_lru_cache_entry *) ndpi_calloc(num_entries, sizeof(struct ndpi_lru_cache_entry)); if(!c->entries) { @@ -113,8 +115,10 @@ u_int8_t ndpi_lru_find_cache(struct ndpi_lru_cache *c, u_int64_t key, now_sec >= c->entries[slot].timestamp && (c->ttl == 0 || now_sec - c->entries[slot].timestamp <= c->ttl)) { *value = c->entries[slot].value; + if(clean_key_when_found) c->entries[slot].is_full = 0; + c->stats.n_found++; ret = 1; } else @@ -133,7 +137,8 @@ void ndpi_lru_add_to_cache(struct ndpi_lru_cache *c, u_int64_t key, u_int16_t va __lru_cache_lock(c); c->stats.n_insert++; - c->entries[slot].is_full = 1, c->entries[slot].key = key, c->entries[slot].value = value, c->entries[slot].timestamp = now_sec; + c->entries[slot].is_full = 1, c->entries[slot].key = key, + c->entries[slot].value = value, c->entries[slot].timestamp = now_sec; __lru_cache_unlock(c); } @@ -169,9 +174,12 @@ int ndpi_get_lru_cache_stats(struct ndpi_global_context *g_ctx, } else { snprintf(param, sizeof(param), "lru.%s.scope", ndpi_lru_cache_idx_to_name(cache_type)); rc = ndpi_get_config(ndpi_struct, NULL, param, buf, sizeof(buf)); + if(rc == NULL) return -1; + scope = atoi(buf); + if(scope == NDPI_LRUCACHE_SCOPE_GLOBAL) { is_local = 0; if(!g_ctx) diff --git a/src/lib/third_party/src/libcache.c b/src/lib/third_party/src/libcache.c index f6a12aa38..f7faf414d 100644 --- a/src/lib/third_party/src/libcache.c +++ b/src/lib/third_party/src/libcache.c @@ -159,7 +159,6 @@ cache_result cache_add(cache_t cache, void *item, uint32_t item_size) { return CACHE_MALLOC_ERROR; } - entry->item = ndpi_malloc(item_size); if(!entry->item) { ndpi_free(entry); |