---

yaml
---
r: 13227
b: refs/heads/master
c: dad3007
h: refs/heads/master
i:
  13225: 62debd7
  13223: 574db1e
v: v3

Author: arkaitzj

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9826541c0e5c1df9000bd9811215857249cd0376
+refs/heads/master: dad300758486b59ac1356d55dbc2accd8e8d9720
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rt/rust_log.cpp

@@ -89,6 +89,22 @@ append_string(char *buffer, const char *format, ...) {
     return buffer;
 }
 
+void
+rust_log::log(rust_task* task, uint32_t level, char const *fmt, ...) {
+    char buf[BUF_BYTES];
+    va_list args;
+    va_start(args, fmt);
+    int formattedbytes = vsnprintf(buf, sizeof(buf), fmt, args);
+    if( formattedbytes and (unsigned)formattedbytes > BUF_BYTES ){
+        const char truncatedstr[] = "[...]";
+        memcpy( &buf[BUF_BYTES-sizeof(truncatedstr)],
+                truncatedstr,
+                sizeof(truncatedstr));
+    }
+    trace_ln(task, level, buf);
+    va_end(args);
+}
+
 void
 rust_log::trace_ln(char *prefix, char *message) {
     char buffer[BUF_BYTES] = "";
@@ -302,6 +318,7 @@ void update_log_settings(void* crate_map, char* settings) {
     free(buffer);
 }
 
+
 //
 // Local Variables:
 // mode: C++

trunk/src/rt/rust_log.h

@@ -23,7 +23,7 @@ const uint32_t log_debug = 3;
     do {                                                        \
         rust_sched_loop* _d_ = sched_loop;                      \
         if (log_rt_##field >= lvl && _d_->log_lvl >= lvl) {     \
-            _d_->log(task, lvl, __VA_ARGS__);                   \
+            _d_->get_log().log(task, lvl, __VA_ARGS__);         \
         }                                                       \
     } while (0)
 
@@ -45,6 +45,7 @@ class rust_log {
     rust_log(rust_sched_loop *sched_loop);
     virtual ~rust_log();
 
+    void log(rust_task* task, uint32_t level, char const *fmt, ...);
     void trace_ln(rust_task *task, uint32_t level, char *message);
     void trace_ln(char *prefix, char *message);
     bool is_tracing(uint32_t type_bits);

trunk/src/rt/rust_sched_loop.cpp

@@ -49,26 +49,10 @@ rust_sched_loop::activate(rust_task *task) {
     DLOG(this, task, "task has returned");
 }
 
-// FIXME #2495: This logging code doesn't belong in the scheduler
-void
-rust_sched_loop::log(rust_task* task, uint32_t level, char const *fmt, ...) {
-    char buf[BUF_BYTES];
-    va_list args;
-    va_start(args, fmt);
-    int formattedbytes = vsnprintf(buf, sizeof(buf), fmt, args);
-    if( formattedbytes and (unsigned)formattedbytes > BUF_BYTES ){
-        const char truncatedstr[] = "[...]";
-        memcpy( &buf[BUF_BYTES-sizeof(truncatedstr)],
-                truncatedstr,
-                sizeof(truncatedstr));
-    }
-    _log.trace_ln(task, level, buf);
-    va_end(args);
-}
 
 void
 rust_sched_loop::fail() {
-    log(NULL, log_err, "domain %s @0x%" PRIxPTR " root task failed",
+    _log.log(NULL, log_err, "domain %s @0x%" PRIxPTR " root task failed",
         name, this);
     kernel->fail();
 }
@@ -168,18 +152,18 @@ rust_sched_loop::log_state() {
     if (log_rt_task < log_debug) return;
 
     if (!running_tasks.is_empty()) {
-        log(NULL, log_debug, "running tasks:");
+        _log.log(NULL, log_debug, "running tasks:");
         for (size_t i = 0; i < running_tasks.length(); i++) {
-            log(NULL, log_debug, "\t task: %s @0x%" PRIxPTR,
+            _log.log(NULL, log_debug, "\t task: %s @0x%" PRIxPTR,
                 running_tasks[i]->name,
                 running_tasks[i]);
         }
     }
 
     if (!blocked_tasks.is_empty()) {
-        log(NULL, log_debug, "blocked tasks:");
+        _log.log(NULL, log_debug, "blocked tasks:");
         for (size_t i = 0; i < blocked_tasks.length(); i++) {
-            log(NULL, log_debug, "\t task: %s @0x%" PRIxPTR
+            _log.log(NULL, log_debug, "\t task: %s @0x%" PRIxPTR
                 ", blocked on: 0x%" PRIxPTR " '%s'",
                 blocked_tasks[i]->name, blocked_tasks[i],
                 blocked_tasks[i]->get_cond(),

trunk/src/rt/rust_sched_loop.h

@@ -96,7 +96,6 @@ struct rust_sched_loop
     // domain.
     rust_sched_loop(rust_scheduler *sched, int id);
     void activate(rust_task *task);
-    void log(rust_task *task, uint32_t level, char const *fmt, ...);
     rust_log & get_log();
     void fail();
 

trunk/src/rt/rust_shape.cpp

@@ -624,6 +624,6 @@ shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
 
     log.walk();
 
-    task->sched_loop->log(task, level, "%s", ss.str().c_str());
+    task->sched_loop->get_log().log(task, level, "%s", ss.str().c_str());
 }
 

trunk/src/test/bench/shootout-mandelbrot.rs

@@ -141,20 +141,19 @@ fn writer(path: str, writech: comm::chan<comm::chan<line>>, size: uint)
 }
 
 fn main(args: [str]) {
+    let path = if vec::len(args) < 4_u { "" }
+    else { args[3] };
+
     let args = if os::getenv("RUST_BENCH").is_some() {
         ["", "4000", "10"]
+    } else if args.len() <= 1u {
+        ["", "80", "10"]
     } else {
         args
     };
 
-    let path = if vec::len(args) < 4_u { "" }
-    else { args[3] };
-
-    let yieldevery = if vec::len(args) < 3_u { 10_u }
-    else { uint::from_str(args[2]).get() };
-
-    let size = if vec::len(args) < 2_u { 80_u }
-    else { uint::from_str(args[1]).get() };
+    let size = uint::from_str(args[1]).get();
+    let yieldevery = uint::from_str(args[2]).get();
 
     let writep = comm::port();
     let writech = comm::chan(writep);