diff options
| author | Daniel Salzman <daniel.salzman@nic.cz> | 2024-12-15 21:39:38 +0100 |
|---|---|---|
| committer | Daniel Salzman <daniel.salzman@nic.cz> | 2024-12-16 09:43:37 +0100 |
| commit | bfb18da9dfe34a35ff5d290284a8f5a672d94c8f (patch) | |
| tree | 1c3791686a6ebb99d1d469c51d2ae192430941a7 | |
| parent | tests/atomic: lower the iteration counts with spinlock-emulated atomics (diff) | |
| download | knot-bfb18da9dfe34a35ff5d290284a8f5a672d94c8f.tar.xz knot-bfb18da9dfe34a35ff5d290284a8f5a672d94c8f.zip | |
query_module: fix statistics counters cleanup if allocation fails
| -rw-r--r-- | src/knot/nameserver/query_module.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/knot/nameserver/query_module.c b/src/knot/nameserver/query_module.c index 8b7d7958f..009f42db5 100644 --- a/src/knot/nameserver/query_module.c +++ b/src/knot/nameserver/query_module.c @@ -251,6 +251,19 @@ void knotd_mod_vlog(knotd_mod_t *mod, int priority, const char *fmt, va_list arg #undef LOG_ARGS } +static void clean_vals(knot_atomic_uint64_t **stats_vals, unsigned dirty_threads, + uint32_t offset, uint32_t count) +{ + assert(stats_vals); + + for (unsigned i = 0; i < dirty_threads; i++) { + assert(stats_vals[i]); + for (unsigned j = 0; j < count; j++) { + ATOMIC_DEINIT(stats_vals[i][offset + j]); + } + } +} + _public_ int knotd_mod_stats_add(knotd_mod_t *mod, const char *ctr_name, uint32_t idx_count, knotd_mod_idx_to_str_f idx_to_str) @@ -281,6 +294,7 @@ int knotd_mod_stats_add(knotd_mod_t *mod, const char *ctr_name, uint32_t idx_cou for (unsigned i = 0; i < threads; i++) { mod->stats_vals[i] = calloc(idx_count, sizeof(**mod->stats_vals)); if (mod->stats_vals[i] == NULL) { + clean_vals(mod->stats_vals, i, 0, idx_count); knotd_mod_stats_free(mod); return KNOT_ENOMEM; } @@ -311,6 +325,7 @@ int knotd_mod_stats_add(knotd_mod_t *mod, const char *ctr_name, uint32_t idx_cou knot_atomic_uint64_t *new_vals = realloc(mod->stats_vals[i], (offset + idx_count) * sizeof(*new_vals)); if (new_vals == NULL) { + clean_vals(mod->stats_vals, i, offset, idx_count); knotd_mod_stats_free(mod); return KNOT_ENOMEM; } @@ -341,10 +356,11 @@ void knotd_mod_stats_free(knotd_mod_t *mod) if (mod->stats_vals != NULL) { unsigned threads = knotd_mod_threads(mod); + for (unsigned i = 0; i < mod->stats_count; i++) { + clean_vals(mod->stats_vals, threads, mod->stats_info[i].offset, + mod->stats_info[i].count); + } for (unsigned i = 0; i < threads; i++) { - for (unsigned j = 0; j < mod->stats_info->count; j++) { - ATOMIC_DEINIT(mod->stats_vals[i][j]); - } free(mod->stats_vals[i]); } } |