work in progress

[nbds] / include / lwt.h

diff --git a/include/lwt.h b/include/lwt.h
index db862921e2a27881d2c2bc1322dc4648e8aa4a56..085f6dd4031c88f67f9eb0fd8f8d65cb8d86b1bd 100644 (file)
--- a/include/lwt.h
+++ b/include/lwt.h
@@ -13,6 +13,12 @@
 #define TRACE(flag, format, v1, v2) lwt_trace(flag, format, (size_t)(v1), (size_t)(v2))
 #endif
 
+#ifndef NDEBUG
+#define ASSERT(x) do { if (!(x)) { lwt_halt(); assert(!#x); } } while (0)
+#else
+#define ASSERT(x) do { } while (0)
+#endif
+
 // Dump trace records to <file_name>. The file should be post-processed with "sort" before viewing.
 void lwt_dump (const char *file_name) __attribute__ ((externally_visible));
 
@@ -28,13 +34,15 @@ void lwt_set_trace_level (const char *flags);
 // the dump. It is only included when its specified category is enabled at a trace level greater than or equal to
 // the one in <flag>. Categories are case sensitive. 
 static inline void lwt_trace (const char *flag, const char *format, size_t value1, size_t value2) {
-    extern uint64_t flag_mask_;
-    if (EXPECT_FALSE(flag_mask_ & (1 << (flag[0] - 'A')))) {
+    extern char TraceLevel[256];
+    if (EXPECT_FALSE(TraceLevel[(unsigned)flag[0]] >= flag[1])) {
         // embed <flags> in <format> so we don't have to make the lwt_record_t any bigger than it already is
-        format = (const char *)((size_t)format | ((uint64_t)flag[0] << 56) | ((uint64_t)flag[1] << 48));
-        extern void lwt_trace_i (const char *format, size_t value1, size_t value2);
-        lwt_trace_i(format, value1, value2);
+        uint64_t f = ((uint64_t)(size_t)format | ((uint64_t)flag[0] << 56) | ((uint64_t)flag[1] << 48));
+        extern void lwt_trace_i (uint64_t format, size_t value1, size_t value2);
+        lwt_trace_i(f, value1, value2);
     }
 }
 
+void lwt_halt (void);
+
 #endif//LWT_H