Skip to content

Commit 349fdce

Browse files
committed
benchmark: expose used namespace as CLI argument
1 parent be60653 commit 349fdce

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

benchmark/benchmark.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ static gboolean opt_machine_readable = FALSE;
3434
static gchar* opt_path = NULL;
3535
static gchar* opt_semantics = NULL;
3636
static gchar* opt_template = NULL;
37+
static gchar* opt_namespace = "benchmark";
3738

3839
static JSemantics* j_benchmark_semantics = NULL;
3940

@@ -115,6 +116,7 @@ j_benchmark_add(gchar const* name, BenchmarkFunc benchmark_func)
115116
run->iterations = 0;
116117
run->operations = 0;
117118
run->bytes = 0;
119+
run->namespace = opt_namespace;
118120

119121
j_benchmarks = g_list_prepend(j_benchmarks, run);
120122
}
@@ -301,6 +303,7 @@ main(int argc, char** argv)
301303
{ "path", 'p', 0, G_OPTION_ARG_STRING, &opt_path, "Benchmark path to use", NULL },
302304
{ "semantics", 's', 0, G_OPTION_ARG_STRING, &opt_semantics, "Semantics to use", NULL },
303305
{ "template", 't', 0, G_OPTION_ARG_STRING, &opt_template, "Semantics template to use", NULL },
306+
{ "namespace", 'n', 0, G_OPTION_ARG_STRING, &opt_namespace, "Namespace for benchmark to use", NULL },
304307
{ NULL, 0, 0, 0, NULL, NULL, NULL }
305308
};
306309

@@ -373,6 +376,7 @@ main(int argc, char** argv)
373376
g_free(opt_path);
374377
g_free(opt_semantics);
375378
g_free(opt_template);
379+
g_free(opt_namespace);
376380

377381
return 0;
378382
}

benchmark/benchmark.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ struct BenchmarkRun
3030
guint iterations;
3131
guint64 operations;
3232
guint64 bytes;
33+
34+
gchar* namespace;
3335
};
3436

3537
typedef struct BenchmarkRun BenchmarkRun;

benchmark/object/object.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ _benchmark_object_create(BenchmarkRun* run, gboolean use_batch)
5151
g_autofree gchar* name = NULL;
5252

5353
name = g_strdup_printf("benchmark-%d", i);
54-
object = j_object_new("benchmark", name);
54+
object = j_object_new(run->namespace, name);
5555
j_object_create(object, batch);
5656

5757
j_object_delete(object, delete_batch);
@@ -110,7 +110,7 @@ _benchmark_object_delete(BenchmarkRun* run, gboolean use_batch)
110110
g_autofree gchar* name = NULL;
111111

112112
name = g_strdup_printf("benchmark-%d", i);
113-
object = j_object_new("benchmark", name);
113+
object = j_object_new(run->namespace, name);
114114
j_object_create(object, batch);
115115
}
116116

@@ -125,7 +125,7 @@ _benchmark_object_delete(BenchmarkRun* run, gboolean use_batch)
125125
g_autofree gchar* name = NULL;
126126

127127
name = g_strdup_printf("benchmark-%d", i);
128-
object = j_object_new("benchmark", name);
128+
object = j_object_new(run->namespace, name);
129129

130130
j_object_delete(object, batch);
131131

@@ -178,7 +178,7 @@ _benchmark_object_status(BenchmarkRun* run, gboolean use_batch)
178178
semantics = j_benchmark_get_semantics();
179179
batch = j_batch_new(semantics);
180180

181-
object = j_object_new("benchmark", "benchmark");
181+
object = j_object_new(run->namespace, "benchmark");
182182
j_object_create(object, batch);
183183
j_object_write(object, dummy, 1, 0, &size, batch);
184184

@@ -245,7 +245,7 @@ _benchmark_object_read(BenchmarkRun* run, gboolean use_batch, guint block_size)
245245
semantics = j_benchmark_get_semantics();
246246
batch = j_batch_new(semantics);
247247

248-
object = j_object_new("benchmark", "benchmark");
248+
object = j_object_new(run->namespace, "benchmark");
249249
j_object_create(object, batch);
250250

251251
for (guint i = 0; i < n; i++)
@@ -320,7 +320,7 @@ _benchmark_object_write(BenchmarkRun* run, gboolean use_batch, guint block_size)
320320
semantics = j_benchmark_get_semantics();
321321
batch = j_batch_new(semantics);
322322

323-
object = j_object_new("benchmark", "benchmark");
323+
object = j_object_new(run->namespace, "benchmark");
324324
j_object_create(object, batch);
325325
ret = j_batch_execute(batch);
326326
g_assert_true(ret);
@@ -393,7 +393,7 @@ _benchmark_object_unordered_create_delete(BenchmarkRun* run, gboolean use_batch)
393393
g_autofree gchar* name = NULL;
394394

395395
name = g_strdup_printf("benchmark-%d", i);
396-
object = j_object_new("benchmark", name);
396+
object = j_object_new(run->namespace, name);
397397
j_object_create(object, batch);
398398
j_object_delete(object, batch);
399399

0 commit comments

Comments
 (0)