---

yaml
---
r: 61356
b: refs/heads/try
c: 0a54bad
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
-refs/heads/try: cc2897d559742c5f7630557975aa72c12a0eff01
+refs/heads/try: 0a54bad3d1d306845b04f146c2c31d4a70e9ede3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libcore/rt/logging.rs

@@ -35,4 +35,34 @@ impl Logger for StdErrLogger {
         dbg.write_str("\n");
         dbg.flush();
     }
-}
+}
+
+/// Configure logging by traversing the crate map and setting the
+/// per-module global logging flags based on the logging spec
+pub fn init(crate_map: *u8) {
+    use os;
+    use str;
+    use ptr;
+    use option::{Some, None};
+    use libc::c_char;
+
+    let log_spec = os::getenv("RUST_LOG");
+    match log_spec {
+        Some(spec) => {
+            do str::as_c_str(spec) |s| {
+                unsafe {
+                    rust_update_log_settings(crate_map, s);
+                }
+            }
+        }
+        None => {
+            unsafe {
+                rust_update_log_settings(crate_map, ptr::null());
+            }
+        }
+    }
+
+    extern {
+        fn rust_update_log_settings(crate_map: *u8, settings: *c_char);
+    }
+}

branches/try/src/libcore/rt/mod.rs

@@ -62,7 +62,6 @@ Several modules in `core` are clients of `rt`:
 
 #[doc(hidden)];
 
-use libc::c_char;
 use ptr::Ptr;
 
 /// The global (exchange) heap.
@@ -138,11 +137,13 @@ pub mod tube;
 /// # Return value
 ///
 /// The return value is used as the process return code. 0 on success, 101 on error.
-pub fn start(_argc: int, _argv: **c_char, _crate_map: *u8, main: ~fn()) -> int {
+pub fn start(_argc: int, _argv: **u8, crate_map: *u8, main: ~fn()) -> int {
 
     use self::sched::{Scheduler, Task};
     use self::uv::uvio::UvEventLoop;
 
+    init(crate_map);
+
     let loop_ = ~UvEventLoop::new();
     let mut sched = ~Scheduler::new(loop_);
     let main_task = ~Task::new(&mut sched.stack_pool, main);
@@ -153,6 +154,12 @@ pub fn start(_argc: int, _argv: **c_char, _crate_map: *u8, main: ~fn()) -> int {
     return 0;
 }
 
+/// One-time runtime initialization. Currently all this does is set up logging
+/// based on the RUST_LOG environment variable.
+pub fn init(crate_map: *u8) {
+    logging::init(crate_map);
+}
+
 /// Possible contexts in which Rust code may be executing.
 /// Different runtime services are available depending on context.
 /// Mostly used for determining if we're using the new scheduler

branches/try/src/libcore/unstable/lang.rs

@@ -435,7 +435,7 @@ pub fn start(main: *u8, argc: int, argv: **c_char,
             return rust_start(main as *c_void, argc as c_int, argv,
                               crate_map as *c_void) as int;
         } else {
-            return do rt::start(argc, argv, crate_map) {
+            return do rt::start(argc, argv as **u8, crate_map) {
                 unsafe {
                     // `main` is an `fn() -> ()` that doesn't take an environment
                     // XXX: Could also call this as an `extern "Rust" fn` once they work

branches/try/src/rt/rust_log.cpp

@@ -324,6 +324,10 @@ void update_log_settings(void* crate_map, char* settings) {
     free(buffer);
 }
 
+extern "C" CDECL void
+rust_update_log_settings(void* crate_map, char* settings) {
+    update_log_settings(crate_map, settings);
+}
 
 //
 // Local Variables:

branches/try/src/rt/rustrt.def.in

@@ -238,4 +238,4 @@ rust_valgrind_stack_register
 rust_valgrind_stack_deregister
 rust_take_env_lock
 rust_drop_env_lock
-
+rust_update_log_settings