---

jamorton · jamorton · commit 4c190f554f96 · 2012-03-31T13:14:54.000-05:00
yaml --- r: 12239 b: refs/heads/master c: 9851a90 h: refs/heads/master i: 12237: 2140a44 12235: 00fb10b 12231: 6308340 12223: 09bdeb9 v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 8aee42a382eff8fc35d1341be5b307da87a25603
+refs/heads/master: 9851a906a59faee4ca13a8cf76677287793809a2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/rt/rust_scheduler.cpp b/trunk/src/rt/rust_scheduler.cpp
@@ -11,6 +11,7 @@ rust_scheduler::rust_scheduler(rust_kernel *kernel,
     live_threads(num_threads),
     live_tasks(0),
     num_threads(num_threads),
+    cur_thread(0),
     id(id)
 {
     create_task_threads();
@@ -87,9 +88,9 @@ rust_scheduler::create_task(rust_task *spawner, const char *name) {
     {
         scoped_lock with(lock);
         live_tasks++;
-        if (++cur_thread >= num_threads)
+        thread_no = cur_thread++;
+        if (cur_thread >= num_threads)
             cur_thread = 0;
-        thread_no = cur_thread;
     }
     rust_task_thread *thread = threads[thread_no];
     return thread->create_task(spawner, name);

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ rust_scheduler::rust_scheduler(rust_kernel *kernel,`
`11`	`11`	`live_threads(num_threads),`
`12`	`12`	`live_tasks(0),`
`13`	`13`	`num_threads(num_threads),`
	`14`	`+ cur_thread(0),`
`14`	`15`	`id(id)`
`15`	`16`	`{`
`16`	`17`	`create_task_threads();`
`@@ -87,9 +88,9 @@ rust_scheduler::create_task(rust_task spawner, const char name) {`
`87`	`88`	`{`
`88`	`89`	`scoped_lock with(lock);`
`89`	`90`	`live_tasks++;`
`90`		`- if (++cur_thread >= num_threads)`
	`91`	`+ thread_no = cur_thread++;`
	`92`	`+ if (cur_thread >= num_threads)`
`91`	`93`	`cur_thread = 0;`
`92`		`- thread_no = cur_thread;`
`93`	`94`	`}`
`94`	`95`	`rust_task_thread *thread = threads[thread_no];`
`95`	`96`	`return thread->create_task(spawner, name);`