diff options
Diffstat (limited to 'daemon/unit_test.c')
| -rw-r--r-- | daemon/unit_test.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/daemon/unit_test.c b/daemon/unit_test.c index 7a52735d5..35f8613a2 100644 --- a/daemon/unit_test.c +++ b/daemon/unit_test.c @@ -1732,7 +1732,8 @@ static int test_dbengine_check_rrdr(RRDSET *st[CHARTS], RRDDIM *rd[CHARTS][DIMS] update_every = REGION_UPDATE_EVERY[current_region]; long points = (time_end - time_start) / update_every; for (i = 0 ; i < CHARTS ; ++i) { - RRDR *r = rrd2rrdr(st[i], points, time_start + update_every, time_end, RRDR_GROUPING_AVERAGE, 0, 0, NULL, NULL, 0); + ONEWAYALLOC *owa = onewayalloc_create(0); + RRDR *r = rrd2rrdr(owa, st[i], points, time_start + update_every, time_end, RRDR_GROUPING_AVERAGE, 0, 0, NULL, NULL, 0); if (!r) { fprintf(stderr, " DB-engine unittest %s: empty RRDR ### E R R O R ###\n", st[i]->name); return ++errors; @@ -1766,8 +1767,9 @@ static int test_dbengine_check_rrdr(RRDSET *st[CHARTS], RRDDIM *rd[CHARTS][DIMS] } } } - rrdr_free(r); + rrdr_free(owa, r); } + onewayalloc_destroy(owa); } return errors; } @@ -1851,7 +1853,8 @@ int test_dbengine(void) long points = (time_end[REGIONS - 1] - time_start[0]) / update_every; // cover all time regions with RRDR long point_offset = (time_start[current_region] - time_start[0]) / update_every; for (i = 0 ; i < CHARTS ; ++i) { - RRDR *r = rrd2rrdr(st[i], points, time_start[0] + update_every, time_end[REGIONS - 1], RRDR_GROUPING_AVERAGE, 0, 0, NULL, NULL, 0); + ONEWAYALLOC *owa = onewayalloc_create(0); + RRDR *r = rrd2rrdr(owa, st[i], points, time_start[0] + update_every, time_end[REGIONS - 1], RRDR_GROUPING_AVERAGE, 0, 0, NULL, NULL, 0); if (!r) { fprintf(stderr, " DB-engine unittest %s: empty RRDR ### E R R O R ###\n", st[i]->name); ++errors; @@ -1888,8 +1891,9 @@ int test_dbengine(void) } } } - rrdr_free(r); + rrdr_free(owa, r); } + onewayalloc_destroy(owa); } error_out: rrd_wrlock(); @@ -2186,6 +2190,7 @@ void dbengine_stress_test(unsigned TEST_DURATION_SEC, unsigned DSET_CHARTS, unsi fprintf(stderr, "Initializing localhost with hostname 'dbengine-stress-test'\n"); + (void) sql_init_database(DB_CHECK_NONE, 1); host = dbengine_rrdhost_find_or_create("dbengine-stress-test"); if (NULL == host) return; @@ -2262,9 +2267,8 @@ void dbengine_stress_test(unsigned TEST_DURATION_SEC, unsigned DSET_CHARTS, unsi for (i = 0 ; i < DSET_CHARTS ; ++i) { stored_metrics_nr += chart_threads[i]->stored_metrics_nr; } - unsigned long queries_nr = 0, queried_metrics_nr = 0; + unsigned long queried_metrics_nr = 0; for (i = 0 ; i < QUERY_THREADS ; ++i) { - queries_nr += query_threads[i]->queries_nr; queried_metrics_nr += query_threads[i]->queried_metrics_nr; } fprintf(stderr, "%u metrics were stored (dataset size of %lu MiB) in %u charts by 1 writer thread per chart.\n", |