use a vtable approach for generic map interface

[nbds] / runtime / lwt.c

diff --git a/runtime/lwt.c b/runtime/lwt.c
index 8f12974247136e4cd7327967cf917b2b43518417..f6bd3467d81eace074f13ef07bee64193c692772 100644 (file)
--- a/runtime/lwt.c
+++ b/runtime/lwt.c
@@ -6,7 +6,7 @@
  */
 #include <stdio.h>
 #include "common.h"
-#include "runtime_local.h"
+#include "rlocal.h"
 #include "lwt.h"
 #include "mem.h"
 
@@ -14,6 +14,8 @@
 #define LWT_BUFFER_SIZE (1 << LWT_BUFFER_SCALE)
 #define LWT_BUFFER_MASK (LWT_BUFFER_SIZE - 1)
 
+volatile int halt_ = 0;
+
 typedef struct lwt_record {
     uint64_t timestamp;
     const char *format;
@@ -27,7 +29,7 @@ typedef struct lwt_buffer {
 } lwt_buffer_t;
 
 lwt_buffer_t *lwt_buf_[MAX_NUM_THREADS] = {};
-uint64_t flag_mask_ = 0;
+char flag_state_[256] = {};
 static const char *flags_ = "";
 
 void lwt_thread_init (int thread_id)
@@ -43,9 +45,9 @@ void lwt_set_trace_level (const char *flags)
 {
     assert(strlen(flags) % 2 == 0); // a well formed <flags> should be an even number of characters long
     flags_ = flags;
-    int i;
-    for (i = 0; flags[i]; i+=2) {
-        flag_mask_ |= 1 << (flags[i] - 'A');
+    memset(flag_state_, 0, sizeof(flag_state_));
+    for (int i = 0; flags[i]; i+=2) {
+        flag_state_[(unsigned)flags[i]] = flags[i+1];
     }
 }
 
@@ -54,11 +56,10 @@ static inline void dump_record (FILE *file, int thread_id, lwt_record_t *r, uint
     // print the record if its trace category is enabled at a high enough level
     int flag  =  (size_t)r->format >> 56;
     int level = ((size_t)r->format >> 48) & 0xFF;
-    const char *f = strchr(flags_, flag);
-    if (f != NULL && level <= f[1]) {
+    if (flag_state_[(unsigned)flag] >= level) {
         char s[3] = {flag, level, '\0'};
-        fprintf(file, "%09llu %d %s ", ((uint64_t)r->timestamp - offset) >> 6, thread_id, s);
-        const char *format = (const char *)(((uint64_t)r->format << 16) >> 16); // strip out the embedded flags
+        fprintf(file, "%09llu %d %s ", ((uint64_t)r->timestamp - offset) >> 5, thread_id, s);
+        const char *format = (const char *)((size_t)r->format & MASK(48)); // strip out the embedded flags
         fprintf(file, format, r->value1, r->value2);
         fprintf(file, "\n");
     }
@@ -79,8 +80,13 @@ static void dump_buffer (FILE *file, int thread_id, uint64_t offset)
     }
 }
 
+void lwt_halt (void) {
+    halt_ = 1;
+}
+
 void lwt_dump (const char *file_name)
 {
+    halt_ = 1;
     uint64_t offset = (uint64_t)-1;
 
     for (int i = 0; i < MAX_NUM_THREADS; ++i) {
@@ -113,6 +119,7 @@ void lwt_dump (const char *file_name)
 }
 
 void lwt_trace_i (const char *format, size_t value1, size_t value2) {
+    while (halt_) {}
     LOCALIZE_THREAD_LOCAL(tid_, int);
     lwt_buffer_t *tb = lwt_buf_[tid_];
     if (tb != NULL) {