Skip to content

Commit a8e3715

Browse files
committed
---
yaml --- r: 15254 b: refs/heads/try c: a17097a h: refs/heads/master v: v3
1 parent 1eee53e commit a8e3715

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 2d8ef7387e737ce1d8ea6f6b9a75626529fff234
5+
refs/heads/try: a17097a57b7563ee94e090b0d428332bb28ef424
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rt/rust_sched_launcher.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,3 @@ rust_sched_launcher::rust_sched_launcher(rust_scheduler *sched,
1010
sched_loop(sched, srv, id),
1111
driver(&sched_loop) {
1212
}
13-
14-
void
15-
rust_sched_launcher::run() {
16-
driver.start_main_loop();
17-
}

branches/try/src/rt/rust_sched_launcher.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class rust_sched_launcher
99
: public kernel_owned<rust_sched_launcher>,
10-
public rust_thread {
10+
private rust_thread {
1111
public:
1212
rust_kernel *kernel;
1313

@@ -18,7 +18,9 @@ class rust_sched_launcher
1818
public:
1919
rust_sched_launcher(rust_scheduler *sched, rust_srv *srv, int id);
2020

21-
virtual void run();
21+
void start() { rust_thread::start(); }
22+
void run() { driver.start_main_loop(); }
23+
void join() { rust_thread::join(); }
2224
rust_sched_loop *get_loop() { return &sched_loop; }
2325
};
2426

branches/try/src/rt/sync/rust_thread.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ class rust_thread {
2020

2121
void start();
2222

23-
virtual void run() {
24-
return;
25-
}
23+
virtual void run() = 0;
2624

2725
void join();
2826
void detach();

0 commit comments

Comments
 (0)