Skip to content

Commit c40eb7b

Browse files
committed
---
yaml --- r: 8062 b: refs/heads/snap-stage3 c: 3d0e7a7 h: refs/heads/master v: v3
1 parent 3eaf2b4 commit c40eb7b

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 8d881967a2be96a38df3b4d70337568c3f3562b7
4+
refs/heads/snap-stage3: 3d0e7a7af3eeee433dd942bca01e085d7d5866a7
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/rt/rust_builtin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ start_task(rust_task_id id, fn_env_pair *f) {
417417
extern "C" CDECL int
418418
sched_threads() {
419419
rust_task *task = rust_task_thread::get_task();
420-
return task->thread->sched->number_of_threads();
420+
return task->sched->number_of_threads();
421421
}
422422

423423
extern "C" CDECL rust_port*

branches/snap-stage3/src/rt/rust_task.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_list *state,
233233
ref_count(1),
234234
stk(NULL),
235235
runtime_sp(0),
236+
sched(thread->sched),
236237
thread(thread),
237238
cache(NULL),
238239
kernel(thread->kernel),

branches/snap-stage3/src/rt/rust_task.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,10 @@ rust_task : public kernel_owned<rust_task>, rust_cond
7272

7373
RUST_ATOMIC_REFCOUNT();
7474

75-
// Fields known to the compiler.
7675
context ctx;
7776
stk_seg *stk;
7877
uintptr_t runtime_sp; // Runtime sp while task running.
78+
rust_scheduler *sched;
7979
rust_task_thread *thread;
8080
rust_crate_cache *cache;
8181

0 commit comments

Comments
 (0)