X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=runtime%2Flwt.c;h=83e8ee1a1306ef8bfa3fc6ddab5bec357bf26c2b;hp=be83e5fb1c31453463897f231d5318eb24f01cd9;hb=052506ff082f134f00834f666653819e18d9bddf;hpb=af2000653f50ce43e94bfd260ce47e4b53ab2222

diff --git a/runtime/lwt.c b/runtime/lwt.c
index be83e5f..83e8ee1 100644
--- a/runtime/lwt.c
+++ b/runtime/lwt.c
@@ -29,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)
@@ -45,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];
     }
 }
 
@@ -56,10 +56,9 @@ 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);
+        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");
@@ -81,6 +80,10 @@ 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;
@@ -116,7 +119,7 @@ void lwt_dump (const char *file_name)
 }
 
 void lwt_trace_i (const char *format, size_t value1, size_t value2) {
-    if (*(volatile int *)&halt_)
+    if (halt_)
         return;
     LOCALIZE_THREAD_LOCAL(tid_, int);
     lwt_buffer_t *tb = lwt_buf_[tid_];