Improves logging system

1 files changed, 31 insertions, 21 deletions

diff --git a/bench.j2.c b/bench.j2.c
index a776892..e78861f 100644
--- a/bench.j2.c
+++ b/bench.j2.c
@@ -4,38 +4,48 @@
 // Simple benchmark test helps measure simulation speed.
 // Steps the simulation N times and prints part of the simulator's state.
 
+void log_impl(const char *format, ...) {
+    va_list args;
+    va_start(args, format);
+    vprintf(format, args);
+    va_end(args);
+}
+
 int main() {
-    printf("Salis Benchmark Test\n\n");
+    g_info = log_impl;
+    g_warn = log_impl;
+
+    g_info("Salis Benchmark Test\n\n");
 
     salis_init();
     salis_step({{ args.steps }});
 
-    printf("seed        => %#lx\n", {{ args.seed }});
-    printf("g_steps     => %#lx\n", g_steps);
-    printf("g_syncs     => %#lx\n", g_syncs);
+    g_info("seed        => %#lx\n", {{ args.seed }});
+    g_info("g_steps     => %#lx\n", g_steps);
+    g_info("g_syncs     => %#lx\n", g_syncs);
 
     for (int i = 0; i < {{ args.cores }}; ++i) {
-        putchar('\n');
-        printf("core %d mall => %#lx\n", i, g_cores[i].mall);
-        printf("core %d mut0 => %#lx\n", i, g_cores[i].muta[0]);
-        printf("core %d mut1 => %#lx\n", i, g_cores[i].muta[1]);
-        printf("core %d mut2 => %#lx\n", i, g_cores[i].muta[2]);
-        printf("core %d mut3 => %#lx\n", i, g_cores[i].muta[3]);
-        printf("core %d pnum => %#lx\n", i, g_cores[i].pnum);
-        printf("core %d pcap => %#lx\n", i, g_cores[i].pcap);
-        printf("core %d pfst => %#lx\n", i, g_cores[i].pfst);
-        printf("core %d plst => %#lx\n", i, g_cores[i].plst);
-        printf("core %d pcur => %#lx\n", i, g_cores[i].pcur);
-        printf("core %d psli => %#lx\n", i, g_cores[i].psli);
-        printf("core %d cycl => %#lx\n", i, g_cores[i].cycl);
-        printf("core %d ivpt => %#lx\n", i, g_cores[i].ivpt);
-        putchar('\n');
+        g_info("\n");
+        g_info("core %d mall => %#lx\n", i, g_cores[i].mall);
+        g_info("core %d mut0 => %#lx\n", i, g_cores[i].muta[0]);
+        g_info("core %d mut1 => %#lx\n", i, g_cores[i].muta[1]);
+        g_info("core %d mut2 => %#lx\n", i, g_cores[i].muta[2]);
+        g_info("core %d mut3 => %#lx\n", i, g_cores[i].muta[3]);
+        g_info("core %d pnum => %#lx\n", i, g_cores[i].pnum);
+        g_info("core %d pcap => %#lx\n", i, g_cores[i].pcap);
+        g_info("core %d pfst => %#lx\n", i, g_cores[i].pfst);
+        g_info("core %d plst => %#lx\n", i, g_cores[i].plst);
+        g_info("core %d pcur => %#lx\n", i, g_cores[i].pcur);
+        g_info("core %d psli => %#lx\n", i, g_cores[i].psli);
+        g_info("core %d cycl => %#lx\n", i, g_cores[i].cycl);
+        g_info("core %d ivpt => %#lx\n", i, g_cores[i].ivpt);
+        g_info("\n");
 
         for (int j = 0; j < 32; ++j) {
-            printf("%02x ", g_cores[i].mvec[j]);
+            g_info("%02x ", g_cores[i].mvec[j]);
         }
 
-        putchar('\n');
+        g_info("\n");
     }
 
     salis_free();