From 8659994fa9408014559f17d2fa7f4d7aa5cdb906 Mon Sep 17 00:00:00 2001
From: Snaipe <franklinmathieu@gmail.com>
Date: Tue, 3 Nov 2015 10:03:05 +0100
Subject: [PATCH] Added auto-initializing output registration, to allow output
 provider registration before criterion_initialize()

---
 include/criterion/output.h |  2 --
 src/core/runner.c          |  1 -
 src/log/output.c           | 34 +++++++++++++++++++++-------------
 src/log/output.h           |  1 +
 4 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/include/criterion/output.h b/include/criterion/output.h
index baeeaba..a5a0c66 100644
--- a/include/criterion/output.h
+++ b/include/criterion/output.h
@@ -28,9 +28,7 @@
 
 typedef void criterion_reporter(FILE *stream, struct criterion_global_stats *);
 
-void criterion_init_output(void);
 int criterion_register_output_provider(const char *name, criterion_reporter *reporter);
 int criterion_add_output(const char *provider, const char *path);
-void criterion_free_output(void);
 
 #endif /* !CRITERION_OUTPUT_H_ */
diff --git a/src/core/runner.c b/src/core/runner.c
index 1aae935..7a87b81 100644
--- a/src/core/runner.c
+++ b/src/core/runner.c
@@ -348,7 +348,6 @@ struct criterion_test_set *criterion_initialize(void) {
     if (resume_child()) // (windows only) resume from the fork
         exit(0);
 
-    criterion_init_output();
     criterion_register_output_provider("tap", tap_report);
     criterion_register_output_provider("xml", xml_report);
 
diff --git a/src/log/output.c b/src/log/output.c
index b5ce1fb..25831e4 100644
--- a/src/log/output.c
+++ b/src/log/output.c
@@ -12,12 +12,10 @@ KHASH_MAP_INIT_STR(ht_path, str_vec*)
 static khash_t(ht_str) *reporters;
 static khash_t(ht_path) *outputs;
 
-void criterion_init_output(void) {
-    reporters = kh_init(ht_str);
-    outputs = kh_init(ht_path);
-}
-
 int criterion_register_output_provider(const char *name, criterion_reporter *reporter) {
+    if (!reporters)
+        reporters = kh_init(ht_str);
+
     int absent;
     khint_t k = kh_put(ht_str, reporters, name, &absent);
     kh_value(reporters, k) = reporter;
@@ -25,6 +23,9 @@ int criterion_register_output_provider(const char *name, criterion_reporter *rep
 }
 
 int criterion_add_output(const char *provider, const char *path) {
+    if (!outputs)
+        outputs = kh_init(ht_path);
+
     khint_t k = kh_get(ht_path, outputs, provider);
 
     if (k == kh_end(outputs)) {
@@ -44,18 +45,25 @@ int criterion_add_output(const char *provider, const char *path) {
 }
 
 void criterion_free_output(void) {
-    for (khint_t k = kh_begin(outputs); k != kh_end(outputs); ++k) {
-        if (!kh_exist(outputs, k))
-            continue;
-        str_vec *vec = kh_value(outputs, k);
-        kv_destroy(*vec);
-        free(vec);
+    if (reporters)
+        kh_destroy(ht_str, reporters);
+
+    if (outputs) {
+        for (khint_t k = kh_begin(outputs); k != kh_end(outputs); ++k) {
+            if (!kh_exist(outputs, k))
+                continue;
+            str_vec *vec = kh_value(outputs, k);
+            kv_destroy(*vec);
+            free(vec);
+        }
+        kh_destroy(ht_path, outputs);
     }
-    kh_destroy(ht_str, reporters);
-    kh_destroy(ht_path, outputs);
 }
 
 void process_all_output(struct criterion_global_stats *stats) {
+    if (!outputs || !reporters)
+        return;
+
     for (khint_t k = kh_begin(reporters); k != kh_end(reporters); ++k) {
         if (!kh_exist(reporters, k))
             continue;
diff --git a/src/log/output.h b/src/log/output.h
index e332289..576ac34 100644
--- a/src/log/output.h
+++ b/src/log/output.h
@@ -27,6 +27,7 @@
 # include "criterion/output.h"
 
 void process_all_output(struct criterion_global_stats *stats);
+void criterion_free_output(void);
 
 void tap_report(FILE *f, struct criterion_global_stats *stats);
 void xml_report(FILE *f, struct criterion_global_stats *stats);