Fixed gendata tool and cleaned up some stuff

3 files changed, 21 insertions, 8 deletions

diff --git a/tools/01_gendata_h48/benchmark_gendata_h48.c b/tools/gendata_h48/gendata_h48.c
index efb6f6f..c8a6d12 100644
--- a/tools/01_gendata_h48/benchmark_gendata_h48.c
+++ b/tools/gendata_h48/gendata_h48.c
@@ -1,10 +1,10 @@
 #include "../timerun.h"
 #include "../../src/cube.h"
 
-#define MAXDEPTH 10
-#define HVALUE 2
-#define OPTIONS "2;10"
-#define LONGOPTIONS "h = 2, max depth = 10"
+#define MAXDEPTH 20
+#define HVALUE 0
+#define OPTIONS "0;20"
+#define LONGOPTIONS "h = 0, max depth = 20"
 
 #define COCSEPSIZE 1119792
 #define ETABLESIZE(h) (((3393 * 495 * 70) >> 1) << (size_t)(h))
@@ -16,7 +16,7 @@ void run(void) {
         int i;
         int64_t s;
 
-        s = nissy_gendata("H48", OPTIONS, buf);
+        s = nissy_gendata("h48", OPTIONS, buf);
 
         if (s == -1) {
                 printf("Error generating table\n");
@@ -28,10 +28,12 @@ void run(void) {
         }
 }
 
-int main() {
+int main(void) {
         int64_t size;
 
-        size = nissy_datasize("H48", OPTIONS);
+        nissy_setlogger(log_stderr);
+
+        size = nissy_datasize("h48", OPTIONS);
         if (size == -1) {
                 printf("gendata_h48 benchmark: error in datasize\n");
                 return 1;
diff --git a/tools/02_stats_tables_h48/stats_tables_h48.c b/tools/stats_tables_h48/stats_tables_h48.c
index 7c6bc3c..7118992 100644
--- a/tools/02_stats_tables_h48/stats_tables_h48.c
+++ b/tools/stats_tables_h48/stats_tables_h48.c
@@ -1,5 +1,4 @@
 #include <pthread.h>
-#include <stdarg.h>
 #include <time.h>
 #include "../timerun.h"
 #include "../../src/cube.h"
diff --git a/tools/timerun.h b/tools/timerun.h
index dabfde0..58a8e7a 100644
--- a/tools/timerun.h
+++ b/tools/timerun.h
@@ -1,9 +1,21 @@
+#include <stdarg.h>
 #include <stdbool.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 
+void
+log_stderr(const char *str, ...)
+{
+        va_list args;
+
+        va_start(args, str);
+        vfprintf(stderr, str, args);
+        va_end(args);
+}
+
+
 double
 timerun(void (*run)(void), char *name)
 {