Added a message passing system based on lock free queues for inter-thread communication. Channels now buffer on the sending side, and no longer require blocking when sending. Lots of other refactoring and bug fixes.

1 files changed, 128 insertions, 49 deletions

diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp
index 5cdf315c7c6..b67876ebe6a 100644
--- a/src/rt/rust_log.cpp
+++ b/src/rt/rust_log.cpp
@@ -4,9 +4,13 @@
  */
 
 #include "rust_internal.h"
+#include "sync/spin_lock.h"
+#include "util/array_list.h"
+#include <stdarg.h>
 
-static uint32_t read_type_bit_mask() {
-    uint32_t bits = rust_log::ULOG | rust_log::ERR;
+static uint32_t
+read_type_bit_mask() {
+    uint32_t bits = rust_log::ULOG | rust_log::ERR | rust_log::ALL;
     char *env_str = getenv("RUST_LOG");
     if (env_str) {
         bits = 0;
@@ -27,92 +31,167 @@ static uint32_t read_type_bit_mask() {
     return bits;
 }
 
-rust_log::ansi_color rust_log::get_type_color(log_type type) {
-    switch (type) {
-    case ERR:
-        return rust_log::RED;
-    case UPCALL:
-        return rust_log::GREEN;
-    case COMM:
-        return rust_log::MAGENTA;
-    case DOM:
-    case TASK:
-        return rust_log::LIGHTTEAL;
-    case MEM:
-        return rust_log::YELLOW;
-    default:
-        return rust_log::WHITE;
-    }
+rust_log::ansi_color
+get_type_color(rust_log::log_type type) {
+    rust_log::ansi_color color = rust_log::WHITE;
+    if (type & rust_log::ERR)
+        color = rust_log::RED;
+    if (type & rust_log::MEM)
+        color = rust_log::YELLOW;
+    if (type & rust_log::UPCALL)
+        color = rust_log::GREEN;
+    if (type & rust_log::COMM)
+        color = rust_log::MAGENTA;
+    if (type & rust_log::DOM)
+        color = rust_log::LIGHTTEAL;
+    if (type & rust_log::TASK)
+        color = rust_log::LIGHTTEAL;
+    return color;
 }
 
-static const char * _foreground_colors[] = { "[30m", "[1;30m", "[37m",
-                                             "[31m", "[1;31m", "[32m",
-                                             "[1;32m", "[33m", "[33m",
-                                             "[34m", "[1;34m", "[35m",
-                                             "[1;35m", "[36m", "[1;36m" };
+static const char * _foreground_colors[] = { "[37m",
+                                             "[31m", "[1;31m",
+                                             "[32m", "[1;32m",
+                                             "[33m", "[1;33m",
+                                             "[31m", "[1;31m",
+                                             "[35m", "[1;35m",
+                                             "[36m", "[1;36m" };
+
+/**
+ * Synchronizes access to the underlying logging mechanism.
+ */
+static spin_lock _log_lock;
+
 rust_log::rust_log(rust_srv *srv, rust_dom *dom) :
-    _srv(srv), _dom(dom), _type_bit_mask(read_type_bit_mask()),
-            _use_colors(getenv("RUST_COLOR_LOG")), _indent(0) {
+    _srv(srv),
+    _dom(dom),
+    _type_bit_mask(read_type_bit_mask()),
+    _use_colors(getenv("RUST_COLOR_LOG")),
+    _indent(0) {
 }
 
 rust_log::~rust_log() {
 
 }
 
-void rust_log::trace_ln(char *message) {
-    char buffer[512];
-    if (_use_colors) {
-        snprintf(buffer, sizeof(buffer), "\x1b%s0x%08" PRIxPTR "\x1b[0m: ",
-                 _foreground_colors[1 + ((uintptr_t) _dom % 2687 % (LIGHTTEAL
-                         - 1))], (uintptr_t) _dom);
-    } else {
-        snprintf(buffer, sizeof(buffer), "0x%08" PRIxPTR ": ",
-                 (uintptr_t) _dom);
+const uint16_t
+hash(uintptr_t ptr) {
+    // Robert Jenkins' 32 bit integer hash function
+    ptr = (ptr + 0x7ed55d16) + (ptr << 12);
+    ptr = (ptr ^ 0xc761c23c) ^ (ptr >> 19);
+    ptr = (ptr + 0x165667b1) + (ptr << 5);
+    ptr = (ptr + 0xd3a2646c) ^ (ptr << 9);
+    ptr = (ptr + 0xfd7046c5) + (ptr << 3);
+    ptr = (ptr ^ 0xb55a4f09) ^ (ptr >> 16);
+    return (uint16_t) ptr;
+}
+
+const char *
+get_color(uintptr_t ptr) {
+    return _foreground_colors[hash(ptr) % rust_log::LIGHTTEAL];
+}
+
+char *
+copy_string(char *dst, const char *src, size_t length) {
+    return strncpy(dst, src, length) + length;
+}
+
+char *
+append_string(char *buffer, const char *format, ...) {
+    if (buffer != NULL && format) {
+        va_list args;
+        va_start(args, format);
+        vsprintf(buffer + strlen(buffer), format, args);
+        va_end(args);
     }
+    return buffer;
+}
 
+char *
+append_string(char *buffer, rust_log::ansi_color color,
+              const char *format, ...) {
+    if (buffer != NULL && format) {
+        append_string(buffer, "\x1b%s", _foreground_colors[color]);
+        va_list args;
+        va_start(args, format);
+        vsprintf(buffer + strlen(buffer), format, args);
+        va_end(args);
+        append_string(buffer, "\x1b[0m");
+    }
+    return buffer;
+}
+
+void
+rust_log::trace_ln(char *prefix, char *message) {
+    char buffer[1024] = "";
+    _log_lock.lock();
+    append_string(buffer, "%-34s", prefix);
     for (uint32_t i = 0; i < _indent; i++) {
-        strncat(buffer, "\t", sizeof(buffer) - strlen(buffer) - 1);
+        append_string(buffer, "    ");
     }
-    strncat(buffer, message, sizeof(buffer) - strlen(buffer) - 1);
+    append_string(buffer, "%s", message);
     _srv->log(buffer);
+    _log_lock.unlock();
+}
+
+void
+rust_log::trace_ln(rust_task *task, char *message) {
+#if defined(__WIN32__)
+    uint32_t thread_id = 0;
+#else
+    uint32_t thread_id = (uint32_t) pthread_self();
+#endif
+    char prefix[1024] = "";
+    append_string(prefix, "0x%08" PRIxPTR ":0x%08" PRIxPTR ":",
+                  thread_id, (uintptr_t) _dom);
+    if (task) {
+        append_string(prefix, "0x%08" PRIxPTR ":", (uintptr_t) task);
+    }
+    trace_ln(prefix, message);
 }
 
 /**
  * Traces a log message if the specified logging type is not filtered.
  */
-void rust_log::trace_ln(uint32_t type_bits, char *message) {
-    trace_ln(get_type_color((rust_log::log_type) type_bits), type_bits,
-             message);
+void
+rust_log::trace_ln(rust_task *task, uint32_t type_bits, char *message) {
+    trace_ln(task, get_type_color((rust_log::log_type) type_bits),
+             type_bits, message);
 }
 
 /**
  * Traces a log message using the specified ANSI color code.
  */
-void rust_log::trace_ln(ansi_color color, uint32_t type_bits, char *message) {
+void
+rust_log::trace_ln(rust_task *task, ansi_color color,
+                   uint32_t type_bits, char *message) {
     if (is_tracing(type_bits)) {
         if (_use_colors) {
-            char buffer[512];
-            snprintf(buffer, sizeof(buffer), "\x1b%s%s\x1b[0m",
-                     _foreground_colors[color], message);
-            trace_ln(buffer);
+            char buffer[512] = "";
+            append_string(buffer, color, "%s", message);
+            trace_ln(task, buffer);
         } else {
-            trace_ln(message);
+            trace_ln(task, message);
         }
     }
 }
 
-bool rust_log::is_tracing(uint32_t type_bits) {
+bool
+rust_log::is_tracing(uint32_t type_bits) {
     return type_bits & _type_bit_mask;
 }
 
-void rust_log::indent() {
+void
+rust_log::indent() {
     _indent++;
 }
 
-void rust_log::outdent() {
+void
+rust_log::outdent() {
     _indent--;
 }
 
-void rust_log::reset_indent(uint32_t indent) {
+void
+rust_log::reset_indent(uint32_t indent) {
     _indent = indent;
 }