File tree 4 files changed +21
-42
lines changed
4 files changed +21
-42
lines changed Original file line number Diff line number Diff line change @@ -163,15 +163,11 @@ mod global_env {
163
163
let builder_fn = || {
164
164
let builder = task:: builder ( ) ;
165
165
task:: unsupervise ( builder) ;
166
- task:: set_opts ( builder, {
167
- sched: some ( {
168
- mode: task:: single_threaded,
169
- // FIXME (#2621): This would be a good place to use a
170
- // very small foreign stack
171
- foreign_stack_size: none
172
- } )
173
- with task:: get_opts ( builder)
174
- } ) ;
166
+
167
+ // FIXME (#2621): This would be a good place to use a very small
168
+ // foreign stack
169
+ task:: set_sched_mode ( builder, task:: single_threaded) ;
170
+
175
171
builder
176
172
} ;
177
173
unsafe {
Original file line number Diff line number Diff line change @@ -38,6 +38,7 @@ export builder;
38
38
export default_task_opts;
39
39
export get_opts;
40
40
export set_opts;
41
+ export set_sched_mode;
41
42
export add_wrapper;
42
43
export run;
43
44
@@ -237,6 +238,16 @@ fn set_opts(builder: builder, opts: task_opts) {
237
238
builder. opts = opts;
238
239
}
239
240
241
+ fn set_sched_mode ( builder : builder , mode : sched_mode ) {
242
+ set_opts ( builder, {
243
+ sched: some ( {
244
+ mode: mode,
245
+ foreign_stack_size: none
246
+ } )
247
+ with get_opts ( builder)
248
+ } ) ;
249
+ }
250
+
240
251
fn add_wrapper ( builder : builder , gen_body : fn @( +fn ~( ) ) -> fn ~( ) ) {
241
252
/*!
242
253
* Add a wrapper to the body of the spawned task.
@@ -467,13 +478,7 @@ fn spawn_sched(mode: sched_mode, +f: fn~()) {
467
478
*/
468
479
469
480
let mut builder = builder ( ) ;
470
- set_opts ( builder, {
471
- sched: some ( {
472
- mode: mode,
473
- foreign_stack_size: none
474
- } )
475
- with get_opts ( builder)
476
- } ) ;
481
+ set_sched_mode ( builder, mode) ;
477
482
run ( builder, f) ;
478
483
}
479
484
@@ -1207,14 +1212,7 @@ fn test_avoid_copying_the_body_unsupervise() {
1207
1212
#[ test]
1208
1213
fn test_osmain ( ) {
1209
1214
let buildr = builder ( ) ;
1210
- let opts = {
1211
- sched: some ( {
1212
- mode: osmain,
1213
- foreign_stack_size: none
1214
- } )
1215
- with get_opts ( buildr)
1216
- } ;
1217
- set_opts ( buildr, opts) ;
1215
+ set_sched_mode ( buildr, mode) ;
1218
1216
1219
1217
let po = comm:: port ( ) ;
1220
1218
let ch = comm:: chan ( po) ;
Original file line number Diff line number Diff line change @@ -40,14 +40,7 @@ fn get_monitor_task_gl() -> iotask unsafe {
40
40
41
41
let builder_fn = || {
42
42
let builder = task:: builder ( ) ;
43
- task:: set_opts ( builder, {
44
- supervise: false,
45
- sched: some ( {
46
- mode: task:: single_threaded,
47
- foreign_stack_size: none
48
- } )
49
- with task:: get_opts ( builder)
50
- } ) ;
43
+ task:: set_sched_mode ( builder, task:: single_threaded) ;
51
44
builder
52
45
} ;
53
46
Original file line number Diff line number Diff line change @@ -25,19 +25,11 @@ enum iotask {
25
25
26
26
fn spawn_iotask ( -builder : task:: builder ) -> iotask {
27
27
28
- import task:: { set_opts, get_opts, single_threaded, run} ;
29
-
30
- set_opts ( builder, {
31
- sched: some ( {
32
- mode: single_threaded,
33
- foreign_stack_size: none
34
- } )
35
- with get_opts ( builder)
36
- } ) ;
28
+ task:: set_sched_mode ( builder, task:: single_threaded) ;
37
29
38
30
do listen |iotask_ch| {
39
31
40
- do run ( copy ( builder) ) {
32
+ do task :: run ( copy ( builder) ) {
41
33
#debug ( "entering libuv task" ) ;
42
34
run_loop ( iotask_ch) ;
43
35
#debug ( "libuv task exiting" ) ;
You can’t perform that action at this time.
0 commit comments