Skip to content

Commit

Permalink
std: Remove ThreadPerCore spawn mode. Unused
Browse files Browse the repository at this point in the history
  • Loading branch information
brson committed Jul 10, 2013
1 parent 413d51e commit 1dbcc8b
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 28 deletions.
18 changes: 0 additions & 18 deletions src/libstd/task/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ pub enum SchedMode {
/// All tasks run in the same OS thread
SingleThreaded,
/// Tasks are distributed among available CPUs
ThreadPerCore,
/// Each task runs in its own OS thread
ThreadPerTask,
/// Tasks are distributed among a fixed number of OS threads
ManualThreads(uint),
Expand Down Expand Up @@ -1143,22 +1141,6 @@ fn test_child_doesnt_ref_parent() {
task::spawn(child_no(0));
}

#[test]
fn test_sched_thread_per_core() {
let (port, chan) = comm::stream();

do spawn_sched(ThreadPerCore) || {
unsafe {
let cores = rt::rust_num_threads();
let reported_threads = rt::rust_sched_threads();
assert_eq!(cores as uint, reported_threads as uint);
chan.send(());
}
}

port.recv();
}

#[test]
fn test_spawn_thread_on_demand() {
let (port, chan) = comm::stream();
Expand Down
1 change: 0 additions & 1 deletion src/libstd/task/rt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ pub extern {
fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id;
fn rust_sched_threads() -> libc::size_t;
fn rust_sched_current_nonlazy_threads() -> libc::size_t;
fn rust_num_threads() -> libc::uintptr_t;

fn get_task_id() -> task_id;
#[rust_stack]
Expand Down
3 changes: 1 addition & 2 deletions src/libstd/task/spawn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ use task::local_data_priv::{local_get, local_set, OldHandle};
use task::rt::rust_task;
use task::rt;
use task::{Failure, ManualThreads, PlatformThread, SchedOpts, SingleThreaded};
use task::{Success, TaskOpts, TaskResult, ThreadPerCore, ThreadPerTask};
use task::{Success, TaskOpts, TaskResult, ThreadPerTask};
use task::{ExistingScheduler, SchedulerHandle};
use task::unkillable;
use uint;
Expand Down Expand Up @@ -745,7 +745,6 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
| ExistingScheduler(*)
| PlatformThread => 0u, /* Won't be used */
SingleThreaded => 1u,
ThreadPerCore => unsafe { rt::rust_num_threads() },
ThreadPerTask => {
fail!("ThreadPerTask scheduling mode unimplemented")
}
Expand Down
6 changes: 0 additions & 6 deletions src/rt/rust_builtin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -476,12 +476,6 @@ rust_get_sched_id() {
return task->sched->get_id();
}

extern "C" CDECL uintptr_t
rust_num_threads() {
rust_task *task = rust_get_current_task();
return task->kernel->env->num_sched_threads;
}

extern "C" CDECL int
rust_get_argc() {
rust_task *task = rust_get_current_task();
Expand Down
1 change: 0 additions & 1 deletion src/rt/rustrt.def.in
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ rust_get_argc
rust_get_argv
rust_new_sched
rust_new_task_in_sched
rust_num_threads
rust_path_is_dir
rust_path_exists
rust_get_stdin
Expand Down

1 comment on commit 1dbcc8b

@pcwalton
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+

Please sign in to comment.