From 1972ae23e528edf26dfad2090c08fbd47fa9bece Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Tue, 10 Jul 2012 08:45:08 -0700
Subject: [PATCH] libcore: add a task::set_sched_mode fn

---
 src/libcore/os.rs            | 14 +++++---------
 src/libcore/task.rs          | 28 +++++++++++++---------------
 src/libstd/uv_global_loop.rs |  9 +--------
 src/libstd/uv_iotask.rs      | 12 ++----------
 4 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/src/libcore/os.rs b/src/libcore/os.rs
index 808552fca6c02..c1b7574c9cc33 100644
--- a/src/libcore/os.rs
+++ b/src/libcore/os.rs
@@ -163,15 +163,11 @@ mod global_env {
         let builder_fn = || {
             let builder = task::builder();
             task::unsupervise(builder);
-            task::set_opts(builder, {
-                sched:  some({
-                    mode: task::single_threaded,
-                    // FIXME (#2621): This would be a good place to use a
-                    // very small foreign stack
-                    foreign_stack_size: none
-                })
-                with task::get_opts(builder)
-            });
+
+            // FIXME (#2621): This would be a good place to use a very small
+            // foreign stack
+            task::set_sched_mode(builder, task::single_threaded);
+
             builder
         };
         unsafe {
diff --git a/src/libcore/task.rs b/src/libcore/task.rs
index 9b75fb07a9efa..608f4d449c296 100644
--- a/src/libcore/task.rs
+++ b/src/libcore/task.rs
@@ -38,6 +38,7 @@ export builder;
 export default_task_opts;
 export get_opts;
 export set_opts;
+export set_sched_mode;
 export add_wrapper;
 export run;
 
@@ -237,6 +238,16 @@ fn set_opts(builder: builder, opts: task_opts) {
     builder.opts = opts;
 }
 
+fn set_sched_mode(builder: builder, mode: sched_mode) {
+    set_opts(builder, { 
+        sched: some({
+            mode: mode,
+            foreign_stack_size: none
+        })
+        with get_opts(builder)
+    });
+}
+
 fn add_wrapper(builder: builder, gen_body: fn@(+fn~()) -> fn~()) {
     /*!
      * Add a wrapper to the body of the spawned task.
@@ -467,13 +478,7 @@ fn spawn_sched(mode: sched_mode, +f: fn~()) {
      */
 
     let mut builder = builder();
-    set_opts(builder, {
-        sched: some({
-            mode: mode,
-            foreign_stack_size: none
-        })
-        with get_opts(builder)
-    });
+    set_sched_mode(builder, mode);
     run(builder, f);
 }
 
@@ -1207,14 +1212,7 @@ fn test_avoid_copying_the_body_unsupervise() {
 #[test]
 fn test_osmain() {
     let buildr = builder();
-    let opts = {
-        sched: some({
-            mode: osmain,
-            foreign_stack_size: none
-        })
-        with get_opts(buildr)
-    };
-    set_opts(buildr, opts);
+    set_sched_mode(buildr, mode);
 
     let po = comm::port();
     let ch = comm::chan(po);
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index a099d4f8b187e..8b00e4ad3e8a3 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -40,14 +40,7 @@ fn get_monitor_task_gl() -> iotask unsafe {
 
     let builder_fn = || {
         let builder = task::builder();
-        task::set_opts(builder, {
-            supervise: false,
-            sched: some({
-                mode: task::single_threaded,
-                foreign_stack_size: none
-            })
-            with task::get_opts(builder)
-        });
+        task::set_sched_mode(builder, task::single_threaded);
         builder
     };
 
diff --git a/src/libstd/uv_iotask.rs b/src/libstd/uv_iotask.rs
index 35e4446f8d833..e38fae0fa72fa 100644
--- a/src/libstd/uv_iotask.rs
+++ b/src/libstd/uv_iotask.rs
@@ -25,19 +25,11 @@ enum iotask {
 
 fn spawn_iotask(-builder: task::builder) -> iotask {
 
-    import task::{set_opts, get_opts, single_threaded, run};
-
-    set_opts(builder, {
-        sched: some({
-            mode: single_threaded,
-            foreign_stack_size: none
-        })
-        with get_opts(builder)
-    });
+    task::set_sched_mode(builder, task::single_threaded);
 
     do listen |iotask_ch| {
 
-        do run(copy(builder)) {
+        do task::run(copy(builder)) {
             #debug("entering libuv task");
             run_loop(iotask_ch);
             #debug("libuv task exiting");