Skip to content

Commit

Permalink
auto merge of #10406 : alexcrichton/rust/issue-10405, r=huonw
Browse files Browse the repository at this point in the history
The logging macros all use libuv-based I/O, and there was one stray debug
statement in task::spawn which was executing before the I/O context was ready.
Remove it and add a test to make sure that we can continue to debug this sort of
code.

Closes #10405
  • Loading branch information
bors committed Nov 11, 2013
2 parents 95b46a1 + b71d629 commit 63cfc99
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/libstd/task/spawn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,6 @@ pub fn spawn_raw(mut opts: TaskOpts, f: ~fn()) {
};
new_sched.bootstrap(bootstrap_task);

debug!("enqueing join_task");
// Now tell the original scheduler to join with this thread
// by scheduling a thread-joining task on the original scheduler
orig_sched_handle.send(TaskFromFriend(join_task));
Expand Down
22 changes: 22 additions & 0 deletions src/test/run-pass/spawning-with-debug.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// exec-env:RUST_LOG=debug
// xfail-fast

// regression test for issue #10405, make sure we don't call debug! too soon.

use std::task;

fn main() {
let mut t = task::task();
t.sched_mode(task::SingleThreaded);
t.spawn(|| ());
}

0 comments on commit 63cfc99

Please sign in to comment.