Merging upstream version 1.17.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 85 insertions, 28 deletions

diff --git a/daemon/unit_test.c b/daemon/unit_test.c
index 1c84022c..36ccd9f6 100644
--- a/daemon/unit_test.c
+++ b/daemon/unit_test.c
@@ -1928,42 +1928,54 @@ error_out:
     return errors;
 }
 
-void generate_dbengine_dataset(unsigned history_seconds)
+struct dbengine_chart_thread {
+    uv_thread_t thread;
+    RRDHOST *host;
+    char *chartname; /* Will be prefixed by type, e.g. "example_local1.", "example_local2." etc */
+    int dset_charts; /* number of charts */
+    int dset_dims; /* dimensions per chart */
+    int chart_i; /* current chart offset */
+    time_t time_present; /* current virtual time of the benchmark */
+    unsigned history_seconds; /* how far back in the past to go */
+};
+
+collected_number generate_dbengine_chart_value(struct dbengine_chart_thread *thread_info, int dim_i,
+                                               time_t time_current)
 {
-    const int DSET_DIMS = 128;
-    const uint64_t EXPECTED_COMPRESSION_RATIO = 94;
-    int j, update_every = 1;
-    RRDHOST *host = NULL;
-    RRDSET *st;
-    RRDDIM *rd[DSET_DIMS];
-    char name[101];
-    time_t time_current, time_present;
+    collected_number value;
 
-    default_rrd_memory_mode = RRD_MEMORY_MODE_DBENGINE;
-    default_rrdeng_page_cache_mb = 128;
-    // Worst case for uncompressible data
-    default_rrdeng_disk_quota_mb = (((uint64_t)DSET_DIMS) * sizeof(storage_number) * history_seconds) / (1024 * 1024);
-    default_rrdeng_disk_quota_mb -= default_rrdeng_disk_quota_mb * EXPECTED_COMPRESSION_RATIO / 100;
+    value = ((collected_number)time_current) * thread_info->chart_i;
+    value += ((collected_number)time_current) * dim_i;
+    value %= 1024LLU;
 
-    error_log_limit_unlimited();
-    debug(D_RRDHOST, "Initializing localhost with hostname 'dbengine-dataset'");
+    return value;
+}
 
-    host = dbengine_rrdhost_find_or_create("dbengine-dataset");
-    if (NULL == host)
-        return;
+static void generate_dbengine_chart(void *arg)
+{
+    struct dbengine_chart_thread *thread_info = (struct dbengine_chart_thread *)arg;
+    RRDHOST *host = thread_info->host;
+    char *chartname = thread_info->chartname;
+    const int DSET_DIMS = thread_info->dset_dims;
+    unsigned history_seconds = thread_info->history_seconds;
+    time_t time_present = thread_info->time_present;
 
-    fprintf(stderr, "\nRunning DB-engine workload generator\n");
+    int j, update_every = 1;
+    RRDSET *st;
+    RRDDIM *rd[DSET_DIMS];
+    char name[RRD_ID_LENGTH_MAX + 1];
+    time_t time_current;
 
     // create the chart
-    st = rrdset_create(host, "example", "random", "random", "example", NULL, "random", "random", "random",
-                          NULL, 1, update_every, RRDSET_TYPE_LINE);
+    snprintfz(name, RRD_ID_LENGTH_MAX, "example_local%d", thread_info->chart_i + 1);
+    st = rrdset_create(host, name, chartname, chartname, "example", NULL, chartname, chartname, chartname, NULL, 1,
+                       update_every, RRDSET_TYPE_LINE);
     for (j = 0 ; j < DSET_DIMS ; ++j) {
-        snprintfz(name, 100, "random%d", j);
+        snprintfz(name, RRD_ID_LENGTH_MAX, "%s%d", chartname, j);
 
         rd[j] = rrddim_add(st, name, NULL, 1, 1, RRD_ALGORITHM_ABSOLUTE);
     }
 
-    time_present = now_realtime_sec();
     // feed it with the test data
     time_current = time_present - history_seconds;
     for (j = 0 ; j < DSET_DIMS ; ++j) {
@@ -1972,17 +1984,62 @@ void generate_dbengine_dataset(unsigned history_seconds)
         rd[j]->last_collected_time.tv_usec =
         st->last_collected_time.tv_usec = st->last_updated.tv_usec = 0;
     }
-    for( ; time_current < time_present; ++time_current) {
+    for( ; time_current < time_present ; ++time_current) {
         st->usec_since_last_update = USEC_PER_SEC;
 
         for (j = 0; j < DSET_DIMS; ++j) {
-            rrddim_set_by_pointer_fake_time(rd[j], (time_current + j) % 128, time_current);
+            collected_number value;
+
+            value = generate_dbengine_chart_value(thread_info, j, time_current);
+            rrddim_set_by_pointer_fake_time(rd[j], value, time_current);
         }
         rrdset_done(st);
     }
+}
+
+void generate_dbengine_dataset(unsigned history_seconds)
+{
+    const int DSET_CHARTS = 16;
+    const int DSET_DIMS = 128;
+    const uint64_t EXPECTED_COMPRESSION_RATIO = 20;
+    RRDHOST *host = NULL;
+    struct dbengine_chart_thread thread_info[DSET_CHARTS];
+    int i;
+    time_t time_present;
+
+    default_rrd_memory_mode = RRD_MEMORY_MODE_DBENGINE;
+    default_rrdeng_page_cache_mb = 128;
+    // Worst case for uncompressible data
+    default_rrdeng_disk_quota_mb = (((uint64_t)DSET_DIMS * DSET_CHARTS) * sizeof(storage_number) * history_seconds) /
+                                   (1024 * 1024);
+    default_rrdeng_disk_quota_mb -= default_rrdeng_disk_quota_mb * EXPECTED_COMPRESSION_RATIO / 100;
+
+    error_log_limit_unlimited();
+    debug(D_RRDHOST, "Initializing localhost with hostname 'dbengine-dataset'");
+
+    host = dbengine_rrdhost_find_or_create("dbengine-dataset");
+    if (NULL == host)
+        return;
+
+    fprintf(stderr, "\nRunning DB-engine workload generator\n");
+
+    time_present = now_realtime_sec();
+    for (i = 0 ; i < DSET_CHARTS ; ++i) {
+        thread_info[i].host = host;
+        thread_info[i].chartname = "random";
+        thread_info[i].dset_charts = DSET_CHARTS;
+        thread_info[i].chart_i = i;
+        thread_info[i].dset_dims = DSET_DIMS;
+        thread_info[i].history_seconds = history_seconds;
+        thread_info[i].time_present = time_present;
+        assert(0 == uv_thread_create(&thread_info[i].thread, generate_dbengine_chart, &thread_info[i]));
+    }
+    for (i = 0 ; i < DSET_CHARTS ; ++i) {
+        assert(0 == uv_thread_join(&thread_info[i].thread));
+    }
+
     rrd_wrlock();
     rrdhost_free(host);
     rrd_unlock();
-
 }
-#endif
\ No newline at end of file
+#endif