Skip to content

Commit 1dbcc8b

Browse files
committed
std: Remove ThreadPerCore spawn mode. Unused
1 parent 413d51e commit 1dbcc8b

File tree

5 files changed

+1
-28
lines changed

5 files changed

+1
-28
lines changed

src/libstd/task/mod.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ pub enum SchedMode {
106106
/// All tasks run in the same OS thread
107107
SingleThreaded,
108108
/// Tasks are distributed among available CPUs
109-
ThreadPerCore,
110-
/// Each task runs in its own OS thread
111109
ThreadPerTask,
112110
/// Tasks are distributed among a fixed number of OS threads
113111
ManualThreads(uint),
@@ -1143,22 +1141,6 @@ fn test_child_doesnt_ref_parent() {
11431141
task::spawn(child_no(0));
11441142
}
11451143

1146-
#[test]
1147-
fn test_sched_thread_per_core() {
1148-
let (port, chan) = comm::stream();
1149-
1150-
do spawn_sched(ThreadPerCore) || {
1151-
unsafe {
1152-
let cores = rt::rust_num_threads();
1153-
let reported_threads = rt::rust_sched_threads();
1154-
assert_eq!(cores as uint, reported_threads as uint);
1155-
chan.send(());
1156-
}
1157-
}
1158-
1159-
port.recv();
1160-
}
1161-
11621144
#[test]
11631145
fn test_spawn_thread_on_demand() {
11641146
let (port, chan) = comm::stream();

src/libstd/task/rt.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ pub extern {
3838
fn rust_new_sched(num_threads: libc::uintptr_t) -> sched_id;
3939
fn rust_sched_threads() -> libc::size_t;
4040
fn rust_sched_current_nonlazy_threads() -> libc::size_t;
41-
fn rust_num_threads() -> libc::uintptr_t;
4241

4342
fn get_task_id() -> task_id;
4443
#[rust_stack]

src/libstd/task/spawn.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ use task::local_data_priv::{local_get, local_set, OldHandle};
8484
use task::rt::rust_task;
8585
use task::rt;
8686
use task::{Failure, ManualThreads, PlatformThread, SchedOpts, SingleThreaded};
87-
use task::{Success, TaskOpts, TaskResult, ThreadPerCore, ThreadPerTask};
87+
use task::{Success, TaskOpts, TaskResult, ThreadPerTask};
8888
use task::{ExistingScheduler, SchedulerHandle};
8989
use task::unkillable;
9090
use uint;
@@ -745,7 +745,6 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) {
745745
| ExistingScheduler(*)
746746
| PlatformThread => 0u, /* Won't be used */
747747
SingleThreaded => 1u,
748-
ThreadPerCore => unsafe { rt::rust_num_threads() },
749748
ThreadPerTask => {
750749
fail!("ThreadPerTask scheduling mode unimplemented")
751750
}

src/rt/rust_builtin.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -476,12 +476,6 @@ rust_get_sched_id() {
476476
return task->sched->get_id();
477477
}
478478

479-
extern "C" CDECL uintptr_t
480-
rust_num_threads() {
481-
rust_task *task = rust_get_current_task();
482-
return task->kernel->env->num_sched_threads;
483-
}
484-
485479
extern "C" CDECL int
486480
rust_get_argc() {
487481
rust_task *task = rust_get_current_task();

src/rt/rustrt.def.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ rust_get_argc
2828
rust_get_argv
2929
rust_new_sched
3030
rust_new_task_in_sched
31-
rust_num_threads
3231
rust_path_is_dir
3332
rust_path_exists
3433
rust_get_stdin

0 commit comments

Comments
 (0)