about summary refs log tree commit diff
path: root/src/libstd/task
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2013-07-09 17:44:28 -0700
committerBrian Anderson <banderson@mozilla.com>2013-07-09 17:45:06 -0700
commit1dbcc8b188a88fe594da5157b9b61e6d9b3d0881 (patch)
tree5f984dc5d4feb01dea14b3825909ad4dec4026ea /src/libstd/task
parent413d51e32debf0c3f7dda2434b64d73585df21ef (diff)
downloadrust-1dbcc8b188a88fe594da5157b9b61e6d9b3d0881.tar.gz
rust-1dbcc8b188a88fe594da5157b9b61e6d9b3d0881.zip
std: Remove ThreadPerCore spawn mode. Unused
Diffstat (limited to 'src/libstd/task')
-rw-r--r--src/libstd/task/mod.rs18
-rw-r--r--src/libstd/task/rt.rs1
-rw-r--r--src/libstd/task/spawn.rs3
3 files changed, 1 insertions, 21 deletions
diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs
index 5a3ff10ae83..caf28fb9b83 100644
--- a/src/libstd/task/mod.rs
+++ b/src/libstd/task/mod.rs
@@ -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),
@@ -1144,22 +1142,6 @@ fn test_child_doesnt_ref_parent() {
 }
 
 #[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();
 
diff --git a/src/libstd/task/rt.rs b/src/libstd/task/rt.rs
index 4860ab36f77..714daae1752 100644
--- a/src/libstd/task/rt.rs
+++ b/src/libstd/task/rt.rs
@@ -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]
diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs
index bcb7e06bf1f..2c2e7e9bc82 100644
--- a/src/libstd/task/spawn.rs
+++ b/src/libstd/task/spawn.rs
@@ -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;
@@ -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")
             }