about summary refs log tree commit diff
path: root/src/rt/rust_log.cpp
diff options
context:
space:
mode:
authorMichael Bebenita <mbebenita@mozilla.com>2010-08-27 18:26:36 -0700
committerMichael Bebenita <mbebenita@mozilla.com>2010-09-07 18:41:07 -0700
commitf8ff013e3cc737b92b5a140dfd0ddcc5ab6773d9 (patch)
tree84daaf59d1eb899021e681927e1103cf08b91dd5 /src/rt/rust_log.cpp
parentffdb5fc8582c77eef7b3a30859eaa216872525a4 (diff)
downloadrust-f8ff013e3cc737b92b5a140dfd0ddcc5ab6773d9.tar.gz
rust-f8ff013e3cc737b92b5a140dfd0ddcc5ab6773d9.zip
Added a few utility classes, cleaned up the include order of .h files, and started to make the Rust kernel own domain message queues rather than the Rust domains themselves.
Diffstat (limited to 'src/rt/rust_log.cpp')
-rw-r--r--src/rt/rust_log.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rt/rust_log.cpp b/src/rt/rust_log.cpp
index e72a62faa30..fab5098d85a 100644
--- a/src/rt/rust_log.cpp
+++ b/src/rt/rust_log.cpp
@@ -28,6 +28,7 @@ read_type_bit_mask() {
         bits |= strstr(env_str, "gc") ? rust_log::GC : 0;
         bits |= strstr(env_str, "stdlib") ? rust_log::STDLIB : 0;
         bits |= strstr(env_str, "special") ? rust_log::SPECIAL : 0;
+        bits |= strstr(env_str, "kern") ? rust_log::KERN : 0;
         bits |= strstr(env_str, "all") ? rust_log::ALL : 0;
         bits = strstr(env_str, "none") ? 0 : bits;
     }
@@ -150,7 +151,7 @@ rust_log::trace_ln(rust_task *task, char *message) {
     uint32_t thread_id = hash((uint32_t) pthread_self());
 #endif
     char prefix[1024] = "";
-    if (_dom->name) {
+    if (_dom && _dom->name) {
         append_string(prefix, "%04" PRIxPTR ":%.10s:",
                       thread_id, _dom->name);
     } else {