]> git.lizzy.rs Git - rust.git/commitdiff
(cleanup) Fix unimplemented message for kill_all in newsched.
authorBen Blum <bblum@andrew.cmu.edu>
Tue, 23 Jul 2013 00:12:59 +0000 (20:12 -0400)
committerBen Blum <bblum@andrew.cmu.edu>
Tue, 30 Jul 2013 17:19:25 +0000 (13:19 -0400)
src/libstd/task/spawn.rs

index 61dcc33c629268ca53f93bdc7446d0faf01d6339..baebda496dce92cbce9d4f5e67f7ef18ec4aac54 100644 (file)
@@ -512,7 +512,9 @@ unsafe fn kill_task(task: TaskHandle) {
     unsafe fn kill_all_tasks(task: &TaskHandle) {
         match *task {
             OldTask(ptr) => rt::rust_task_kill_all(ptr),
-            NewTask(ref _handle) => rtabort!("unimplemented"), // FIXME(#7544)
+            // FIXME(#7544): Remove the kill_all feature entirely once the
+            // oldsched goes away.
+            NewTask(ref _handle) => rtabort!("can't kill_all in newsched"),
         }
     }
 
@@ -573,7 +575,10 @@ fn with_my_taskgroup<U>(blk: &fn(&Taskgroup) -> U) -> U {
                             members: members,
                             descendants: TaskSet::new(),
                         }));
-                        let group = Taskgroup(tasks, AncestorList(None), true, None);
+                        // FIXME(#7544): Remove the is_main flag entirely once
+                        // the newsched goes away. The main taskgroup has no special
+                        // behaviour.
+                        let group = Taskgroup(tasks, AncestorList(None), false, None);
                         (*me).taskgroup = Some(group);
                         (*me).taskgroup.get_ref()
                     }