From 33df9fc1d04c224a0c7ecb8d91b75feed75b412c Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Mon, 29 Jul 2013 13:11:05 -0700 Subject: [PATCH] std: Remove foreign_stack_size spawn option. Irrelevant to future FFI changes --- src/libstd/task/mod.rs | 9 --------- src/libstd/task/spawn.rs | 10 +++------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/libstd/task/mod.rs b/src/libstd/task/mod.rs index 5673e100625..895de843061 100644 --- a/src/libstd/task/mod.rs +++ b/src/libstd/task/mod.rs @@ -90,17 +90,9 @@ pub enum SchedMode { * * * sched_mode - The operating mode of the scheduler * - * * foreign_stack_size - The size of the foreign stack, in bytes - * - * Rust code runs on Rust-specific stacks. When Rust code calls foreign - * code (via functions in foreign modules) it switches to a typical, large - * stack appropriate for running code written in languages like C. By - * default these foreign stacks have unspecified size, but with this - * option their size can be precisely specified. */ pub struct SchedOpts { mode: SchedMode, - foreign_stack_size: Option, } /** @@ -418,7 +410,6 @@ pub fn default_task_opts() -> TaskOpts { notify_chan: None, sched: SchedOpts { mode: DefaultScheduler, - foreign_stack_size: None } } } diff --git a/src/libstd/task/spawn.rs b/src/libstd/task/spawn.rs index 1d183e7dabb..a698f1342f0 100644 --- a/src/libstd/task/spawn.rs +++ b/src/libstd/task/spawn.rs @@ -84,7 +84,7 @@ use local_data; use task::local_data_priv::{local_get, local_set, OldHandle}; use task::rt::rust_task; use task::rt; -use task::{Failure, SchedOpts}; +use task::{Failure}; use task::{Success, TaskOpts, TaskResult}; use task::unkillable; use to_bytes::IterBytes; @@ -741,7 +741,7 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) { // Create child task. let new_task = match opts.sched.mode { DefaultScheduler => rt::new_task(), - _ => new_task_in_sched(opts.sched) + _ => new_task_in_sched() }; assert!(!new_task.is_null()); // Getting killed after here would leak the task. @@ -799,11 +799,7 @@ fn spawn_raw_oldsched(mut opts: TaskOpts, f: ~fn()) { return result; } - fn new_task_in_sched(opts: SchedOpts) -> *rust_task { - if opts.foreign_stack_size != None { - fail!("foreign_stack_size scheduler option unimplemented"); - } - + fn new_task_in_sched() -> *rust_task { unsafe { let sched_id = rt::rust_new_sched(1); rt::rust_new_task_in_sched(sched_id)