OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rt: Rename rust_task_thread to rust_sched_loop

Browse Source 
This class no longer represents a thread; it just schedules tasks.
This commit is contained in:
Brian Anderson 2012-03-29 16:31:30 -07:00
parent 6bf8d19712
commit 243790836a
17 changed files with 190 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/rt.mk
View File

@ -50,7 +50,7 @@ RUNTIME_CS_$(1) := \
rt/rust_builtin.cpp \ rt/rust_builtin.cpp \
rt/rust_run_program.cpp \ rt/rust_run_program.cpp \
rt/rust_env.cpp \ rt/rust_env.cpp \
rt/rust_task_thread.cpp \ rt/rust_sched_loop.cpp \
rt/rust_sched_launcher.cpp \ rt/rust_sched_launcher.cpp \
rt/rust_scheduler.cpp \ rt/rust_scheduler.cpp \
rt/rust_task.cpp \ rt/rust_task.cpp \

5
src/rt/rust.cpp
View File

@ -80,15 +80,14 @@ rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
rust_sched_id sched_id = kernel->create_scheduler(env->num_sched_threads); rust_sched_id sched_id = kernel->create_scheduler(env->num_sched_threads);
rust_scheduler *sched = kernel->get_scheduler_by_id(sched_id); rust_scheduler *sched = kernel->get_scheduler_by_id(sched_id);
rust_task *root_task = sched->create_task(NULL, "main"); rust_task *root_task = sched->create_task(NULL, "main");
rust_task_thread *thread = root_task->thread;
command_line_args *args command_line_args *args
= new (kernel, "main command line args") = new (kernel, "main command line args")
command_line_args(root_task, argc, argv); command_line_args(root_task, argc, argv);
DLOG(thread, dom, "startup: %d args in 0x%" PRIxPTR, LOG(root_task, dom, "startup: %d args in 0x%" PRIxPTR,
args->argc, (uintptr_t)args->args); args->argc, (uintptr_t)args->args);
for (int i = 0; i < args->argc; i++) { for (int i = 0; i < args->argc; i++) {
DLOG(thread, dom, "startup: arg[%d] = '%s'", i, args->argv[i]); LOG(root_task, dom, "startup: arg[%d] = '%s'", i, args->argv[i]);
} }
root_task->start((spawn_fn)main_fn, NULL, args->args); root_task->start((spawn_fn)main_fn, NULL, args->args);

94
src/rt/rust_builtin.cpp
View File

@ -1,7 +1,7 @@
/* Native builtins. */ /* Native builtins. */
#include "rust_internal.h" #include "rust_internal.h"
#include "rust_task_thread.h" #include "rust_sched_loop.h"
#include "rust_task.h" #include "rust_task.h"
#include "rust_util.h" #include "rust_util.h"
#include "rust_scheduler.h" #include "rust_scheduler.h"
@ -22,7 +22,7 @@ extern char **environ;
extern "C" CDECL rust_str* extern "C" CDECL rust_str*
last_os_error() { last_os_error() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, task, "last_os_error()"); LOG(task, task, "last_os_error()");
@ -65,7 +65,7 @@ last_os_error() {
extern "C" CDECL rust_str * extern "C" CDECL rust_str *
rust_getcwd() { rust_getcwd() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, task, "rust_getcwd()"); LOG(task, task, "rust_getcwd()");
char cbuf[BUF_BYTES]; char cbuf[BUF_BYTES];
@ -85,7 +85,7 @@ rust_getcwd() {
#if defined(__WIN32__) #if defined(__WIN32__)
extern "C" CDECL rust_vec * extern "C" CDECL rust_vec *
rust_env_pairs() { rust_env_pairs() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
size_t envc = 0; size_t envc = 0;
LPTCH ch = GetEnvironmentStringsA(); LPTCH ch = GetEnvironmentStringsA();
LPTCH c; LPTCH c;
@ -111,7 +111,7 @@ rust_env_pairs() {
#else #else
extern "C" CDECL rust_vec * extern "C" CDECL rust_vec *
rust_env_pairs() { rust_env_pairs() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
#ifdef __APPLE__ #ifdef __APPLE__
char **environ = *_NSGetEnviron(); char **environ = *_NSGetEnviron();
#endif #endif
@ -133,21 +133,21 @@ refcount(intptr_t *v) {
extern "C" CDECL void extern "C" CDECL void
unsupervise() { unsupervise() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
task->unsupervise(); task->unsupervise();
} }
extern "C" CDECL void extern "C" CDECL void
vec_reserve_shared(type_desc* ty, rust_vec** vp, vec_reserve_shared(type_desc* ty, rust_vec** vp,
size_t n_elts) { size_t n_elts) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
reserve_vec_exact(task, vp, n_elts * ty->size); reserve_vec_exact(task, vp, n_elts * ty->size);
} }
extern "C" CDECL void extern "C" CDECL void
str_reserve_shared(rust_vec** sp, str_reserve_shared(rust_vec** sp,
size_t n_elts) { size_t n_elts) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
reserve_vec_exact(task, sp, n_elts + 1); reserve_vec_exact(task, sp, n_elts + 1);
} }
@ -157,7 +157,7 @@ str_reserve_shared(rust_vec** sp,
*/ */
extern "C" CDECL rust_vec* extern "C" CDECL rust_vec*
vec_from_buf_shared(type_desc *ty, void *ptr, size_t count) { vec_from_buf_shared(type_desc *ty, void *ptr, size_t count) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
size_t fill = ty->size * count; size_t fill = ty->size * count;
rust_vec* v = (rust_vec*)task->kernel->malloc(fill + sizeof(rust_vec), rust_vec* v = (rust_vec*)task->kernel->malloc(fill + sizeof(rust_vec),
"vec_from_buf"); "vec_from_buf");
@ -168,7 +168,7 @@ vec_from_buf_shared(type_desc *ty, void *ptr, size_t count) {
extern "C" CDECL void extern "C" CDECL void
rust_str_push(rust_vec** sp, uint8_t byte) { rust_str_push(rust_vec** sp, uint8_t byte) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
size_t fill = (*sp)->fill; size_t fill = (*sp)->fill;
reserve_vec(task, sp, fill + 1); reserve_vec(task, sp, fill + 1);
(*sp)->data[fill-1] = byte; (*sp)->data[fill-1] = byte;
@ -178,8 +178,8 @@ rust_str_push(rust_vec** sp, uint8_t byte) {
extern "C" CDECL void * extern "C" CDECL void *
rand_new() { rand_new() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
rust_task_thread *thread = task->thread; rust_sched_loop *thread = task->sched_loop;
randctx *rctx = (randctx *) task->malloc(sizeof(randctx), "randctx"); randctx *rctx = (randctx *) task->malloc(sizeof(randctx), "randctx");
if (!rctx) { if (!rctx) {
task->fail(); task->fail();
@ -196,7 +196,7 @@ rand_next(randctx *rctx) {
extern "C" CDECL void extern "C" CDECL void
rand_free(randctx *rctx) { rand_free(randctx *rctx) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
task->free(rctx); task->free(rctx);
} }
@ -242,7 +242,7 @@ debug_abi_2(floats f) {
static void static void
debug_tydesc_helper(type_desc *t) debug_tydesc_helper(type_desc *t)
{ {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, stdlib, " size %" PRIdPTR ", align %" PRIdPTR LOG(task, stdlib, " size %" PRIdPTR ", align %" PRIdPTR
", first_param 0x%" PRIxPTR, ", first_param 0x%" PRIxPTR,
t->size, t->align, t->first_param); t->size, t->align, t->first_param);
@ -250,14 +250,14 @@ debug_tydesc_helper(type_desc *t)
extern "C" CDECL void extern "C" CDECL void
debug_tydesc(type_desc *t) { debug_tydesc(type_desc *t) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, stdlib, "debug_tydesc"); LOG(task, stdlib, "debug_tydesc");
debug_tydesc_helper(t); debug_tydesc_helper(t);
} }
extern "C" CDECL void extern "C" CDECL void
debug_opaque(type_desc *t, uint8_t *front) { debug_opaque(type_desc *t, uint8_t *front) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, stdlib, "debug_opaque"); LOG(task, stdlib, "debug_opaque");
debug_tydesc_helper(t); debug_tydesc_helper(t);
// FIXME may want to actually account for alignment. `front` may not // FIXME may want to actually account for alignment. `front` may not
@ -277,7 +277,7 @@ struct rust_box {
extern "C" CDECL void extern "C" CDECL void
debug_box(type_desc *t, rust_box *box) { debug_box(type_desc *t, rust_box *box) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, stdlib, "debug_box(0x%" PRIxPTR ")", box); LOG(task, stdlib, "debug_box(0x%" PRIxPTR ")", box);
debug_tydesc_helper(t); debug_tydesc_helper(t);
LOG(task, stdlib, " refcount %" PRIdPTR, LOG(task, stdlib, " refcount %" PRIdPTR,
@ -294,7 +294,7 @@ struct rust_tag {
extern "C" CDECL void extern "C" CDECL void
debug_tag(type_desc *t, rust_tag *tag) { debug_tag(type_desc *t, rust_tag *tag) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, stdlib, "debug_tag"); LOG(task, stdlib, "debug_tag");
debug_tydesc_helper(t); debug_tydesc_helper(t);
@ -312,7 +312,7 @@ struct rust_fn {
extern "C" CDECL void extern "C" CDECL void
debug_fn(type_desc *t, rust_fn *fn) { debug_fn(type_desc *t, rust_fn *fn) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, stdlib, "debug_fn"); LOG(task, stdlib, "debug_fn");
debug_tydesc_helper(t); debug_tydesc_helper(t);
LOG(task, stdlib, " thunk at 0x%" PRIxPTR, fn->thunk); LOG(task, stdlib, " thunk at 0x%" PRIxPTR, fn->thunk);
@ -326,7 +326,7 @@ extern "C" CDECL void *
debug_ptrcast(type_desc *from_ty, debug_ptrcast(type_desc *from_ty,
type_desc *to_ty, type_desc *to_ty,
void *ptr) { void *ptr) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, stdlib, "debug_ptrcast from"); LOG(task, stdlib, "debug_ptrcast from");
debug_tydesc_helper(from_ty); debug_tydesc_helper(from_ty);
LOG(task, stdlib, "to"); LOG(task, stdlib, "to");
@ -336,13 +336,13 @@ debug_ptrcast(type_desc *from_ty,
extern "C" CDECL void * extern "C" CDECL void *
debug_get_stk_seg() { debug_get_stk_seg() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
return task->stk; return task->stk;
} }
extern "C" CDECL rust_vec* extern "C" CDECL rust_vec*
rust_list_files(rust_str *path) { rust_list_files(rust_str *path) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
array_list<rust_str*> strings; array_list<rust_str*> strings;
#if defined(__WIN32__) #if defined(__WIN32__)
WIN32_FIND_DATA FindFileData; WIN32_FIND_DATA FindFileData;
@ -443,21 +443,21 @@ precise_time_ns(uint64_t *ns) {
extern "C" CDECL rust_sched_id extern "C" CDECL rust_sched_id
rust_get_sched_id() { rust_get_sched_id() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
return task->sched->get_id(); return task->sched->get_id();
} }
extern "C" CDECL rust_sched_id extern "C" CDECL rust_sched_id
rust_new_sched(uintptr_t threads) { rust_new_sched(uintptr_t threads) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
A(task->thread, threads > 0, A(task->sched_loop, threads > 0,
"Can't create a scheduler with no threads, silly!"); "Can't create a scheduler with no threads, silly!");
return task->kernel->create_scheduler(threads); return task->kernel->create_scheduler(threads);
} }
extern "C" CDECL rust_task_id extern "C" CDECL rust_task_id
get_task_id() { get_task_id() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
return task->id; return task->id;
} }
@ -468,13 +468,13 @@ new_task_common(rust_scheduler *sched, rust_task *parent) {
extern "C" CDECL rust_task* extern "C" CDECL rust_task*
new_task() { new_task() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
return new_task_common(task->sched, task); return new_task_common(task->sched, task);
} }
extern "C" CDECL rust_task* extern "C" CDECL rust_task*
rust_new_task_in_sched(rust_sched_id id) { rust_new_task_in_sched(rust_sched_id id) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
rust_scheduler *sched = task->kernel->get_scheduler_by_id(id); rust_scheduler *sched = task->kernel->get_scheduler_by_id(id);
// FIXME: What if we didn't get the scheduler? // FIXME: What if we didn't get the scheduler?
return new_task_common(sched, task); return new_task_common(sched, task);
@ -487,7 +487,7 @@ rust_task_config_notify(rust_task *target, rust_port_id *port) {
extern "C" rust_task * extern "C" rust_task *
rust_get_task() { rust_get_task() {
return rust_task_thread::get_task(); return rust_sched_loop::get_task();
} }
extern "C" CDECL void extern "C" CDECL void
@ -497,13 +497,13 @@ start_task(rust_task *target, fn_env_pair *f) {
extern "C" CDECL int extern "C" CDECL int
sched_threads() { sched_threads() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
return task->sched->number_of_threads(); return task->sched->number_of_threads();
} }
extern "C" CDECL rust_port* extern "C" CDECL rust_port*
new_port(size_t unit_sz) { new_port(size_t unit_sz) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, comm, "new_port(task=0x%" PRIxPTR " (%s), unit_sz=%d)", LOG(task, comm, "new_port(task=0x%" PRIxPTR " (%s), unit_sz=%d)",
(uintptr_t) task, task->name, unit_sz); (uintptr_t) task, task->name, unit_sz);
// port starts with refcount == 1 // port starts with refcount == 1
@ -512,7 +512,7 @@ new_port(size_t unit_sz) {
extern "C" CDECL void extern "C" CDECL void
rust_port_begin_detach(rust_port *port, uintptr_t *yield) { rust_port_begin_detach(rust_port *port, uintptr_t *yield) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, comm, "rust_port_detach(0x%" PRIxPTR ")", (uintptr_t) port); LOG(task, comm, "rust_port_detach(0x%" PRIxPTR ")", (uintptr_t) port);
port->begin_detach(yield); port->begin_detach(yield);
} }
@ -524,7 +524,7 @@ rust_port_end_detach(rust_port *port) {
extern "C" CDECL void extern "C" CDECL void
del_port(rust_port *port) { del_port(rust_port *port) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, comm, "del_port(0x%" PRIxPTR ")", (uintptr_t) port); LOG(task, comm, "del_port(0x%" PRIxPTR ")", (uintptr_t) port);
delete port; delete port;
} }
@ -542,7 +542,7 @@ get_port_id(rust_port *port) {
extern "C" CDECL uintptr_t extern "C" CDECL uintptr_t
rust_port_id_send(type_desc *t, rust_port_id target_port_id, void *sptr) { rust_port_id_send(type_desc *t, rust_port_id target_port_id, void *sptr) {
bool sent = false; bool sent = false;
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG(task, comm, "rust_port_id*_send port: 0x%" PRIxPTR, LOG(task, comm, "rust_port_id*_send port: 0x%" PRIxPTR,
(uintptr_t) target_port_id); (uintptr_t) target_port_id);
@ -573,14 +573,14 @@ port_recv(uintptr_t *dptr, rust_port *port, uintptr_t *yield) {
extern "C" CDECL void extern "C" CDECL void
rust_port_select(rust_port **dptr, rust_port **ports, rust_port_select(rust_port **dptr, rust_port **ports,
size_t n_ports, uintptr_t *yield) { size_t n_ports, uintptr_t *yield) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
rust_port_selector *selector = task->get_port_selector(); rust_port_selector *selector = task->get_port_selector();
selector->select(task, dptr, ports, n_ports, yield); selector->select(task, dptr, ports, n_ports, yield);
} }
extern "C" CDECL void extern "C" CDECL void
rust_set_exit_status(intptr_t code) { rust_set_exit_status(intptr_t code) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
task->kernel->set_exit_status((int)code); task->kernel->set_exit_status((int)code);
} }
@ -595,7 +595,7 @@ extern void log_console_off(rust_env *env);
extern "C" CDECL void extern "C" CDECL void
rust_log_console_off() { rust_log_console_off() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
log_console_off(task->kernel->env); log_console_off(task->kernel->env);
} }
@ -606,36 +606,36 @@ rust_dbg_lock_create() {
extern "C" CDECL void extern "C" CDECL void
rust_dbg_lock_destroy(lock_and_signal *lock) { rust_dbg_lock_destroy(lock_and_signal *lock) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
I(task->thread, lock); I(task->sched_loop, lock);
delete lock; delete lock;
} }
extern "C" CDECL void extern "C" CDECL void
rust_dbg_lock_lock(lock_and_signal *lock) { rust_dbg_lock_lock(lock_and_signal *lock) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
I(task->thread, lock); I(task->sched_loop, lock);
lock->lock(); lock->lock();
} }
extern "C" CDECL void extern "C" CDECL void
rust_dbg_lock_unlock(lock_and_signal *lock) { rust_dbg_lock_unlock(lock_and_signal *lock) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
I(task->thread, lock); I(task->sched_loop, lock);
lock->unlock(); lock->unlock();
} }
extern "C" CDECL void extern "C" CDECL void
rust_dbg_lock_wait(lock_and_signal *lock) { rust_dbg_lock_wait(lock_and_signal *lock) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
I(task->thread, lock); I(task->sched_loop, lock);
lock->wait(); lock->wait();
} }
extern "C" CDECL void extern "C" CDECL void
rust_dbg_lock_signal(lock_and_signal *lock) { rust_dbg_lock_signal(lock_and_signal *lock) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
I(task->thread, lock); I(task->sched_loop, lock);
lock->signal(); lock->signal();
} }

4
src/rt/rust_internal.h
View File

@ -10,7 +10,7 @@
#include "sync/lock_and_signal.h" #include "sync/lock_and_signal.h"
#include "sync/lock_free_queue.h" #include "sync/lock_free_queue.h"
struct rust_task_thread; struct rust_sched_loop;
struct rust_task; struct rust_task;
class rust_log; class rust_log;
class rust_port; class rust_port;
@ -110,7 +110,7 @@ struct rust_cond { };
#include "rust_srv.h" #include "rust_srv.h"
#include "rust_log.h" #include "rust_log.h"
#include "rust_kernel.h" #include "rust_kernel.h"
#include "rust_task_thread.h" #include "rust_sched_loop.h"
typedef void CDECL (glue_fn)(void *, void *, typedef void CDECL (glue_fn)(void *, void *,
const type_desc **, void *); const type_desc **, void *);

10
src/rt/rust_log.cpp
View File

@ -40,9 +40,9 @@ log_console_off(rust_env *env) {
} }
} }
rust_log::rust_log(rust_srv *srv, rust_task_thread *thread) : rust_log::rust_log(rust_srv *srv, rust_sched_loop *sched_loop) :
_srv(srv), _srv(srv),
_thread(thread) { _sched_loop(sched_loop) {
} }
rust_log::~rust_log() { rust_log::~rust_log() {
@ -122,12 +122,12 @@ rust_log::trace_ln(rust_task *task, uint32_t level, char *message) {
#endif #endif
char prefix[BUF_BYTES] = ""; char prefix[BUF_BYTES] = "";
if (_thread && _thread->name) { if (_sched_loop && _sched_loop-.name) {
append_string(prefix, "%04" PRIxPTR ":%.10s:", append_string(prefix, "%04" PRIxPTR ":%.10s:",
thread_id, _thread->name); thread_id, _sched_loop->name);
} else { } else {
append_string(prefix, "%04" PRIxPTR ":0x%08" PRIxPTR ":", append_string(prefix, "%04" PRIxPTR ":0x%08" PRIxPTR ":",
thread_id, (uintptr_t) _thread); thread_id, (uintptr_t) _sched_loop);
} }
if (task) { if (task) {
if (task->name) { if (task->name) {

26
src/rt/rust_log.h
View File

@ -8,18 +8,18 @@ const uint32_t log_info = 2;
const uint32_t log_debug = 3; const uint32_t log_debug = 3;
#define LOG(task, field, ...) \ #define LOG(task, field, ...) \
DLOG_LVL(log_debug, task, task->thread, field, __VA_ARGS__) DLOG_LVL(log_debug, task, task->sched_loop, field, __VA_ARGS__)
#define LOG_ERR(task, field, ...) \ #define LOG_ERR(task, field, ...) \
DLOG_LVL(log_err, task, task->thread, field, __VA_ARGS__) DLOG_LVL(log_err, task, task->sched_loop, field, __VA_ARGS__)
#define DLOG(thread, field, ...) \ #define DLOG(sched_loop, field, ...) \
DLOG_LVL(log_debug, NULL, thread, field, __VA_ARGS__) DLOG_LVL(log_debug, NULL, sched_loop, field, __VA_ARGS__)
#define DLOG_ERR(thread, field, ...) \ #define DLOG_ERR(sched_loop, field, ...) \
DLOG_LVL(log_err, NULL, thread, field, __VA_ARGS__) DLOG_LVL(log_err, NULL, sched_loop, field, __VA_ARGS__)
#define LOGPTR(thread, msg, ptrval) \ #define LOGPTR(sched_loop, msg, ptrval) \
DLOG_LVL(log_debug, NULL, thread, mem, "%s 0x%" PRIxPTR, msg, ptrval) DLOG_LVL(log_debug, NULL, sched_loop, mem, "%s 0x%" PRIxPTR, msg, ptrval)
#define DLOG_LVL(lvl, task, thread, field, ...) \ #define DLOG_LVL(lvl, task, sched_loop, field, ...) \
do { \ do { \
rust_task_thread* _d_ = thread; \ rust_sched_loop* _d_ = sched_loop; \
if (log_rt_##field >= lvl && _d_->log_lvl >= lvl) { \ if (log_rt_##field >= lvl && _d_->log_lvl >= lvl) { \
_d_->log(task, lvl, __VA_ARGS__); \ _d_->log(task, lvl, __VA_ARGS__); \
} \ } \
@ -34,13 +34,13 @@ const uint32_t log_debug = 3;
} \ } \
} while (0) } while (0)
struct rust_task_thread; struct rust_sched_loop;
struct rust_task; struct rust_task;
class rust_log { class rust_log {
public: public:
rust_log(rust_srv *srv, rust_task_thread *thread); rust_log(rust_srv *srv, rust_sched_loop *sched_loop);
virtual ~rust_log(); virtual ~rust_log();
void trace_ln(rust_task *task, uint32_t level, char *message); void trace_ln(rust_task *task, uint32_t level, char *message);
@ -49,7 +49,7 @@ public:
private: private:
rust_srv *_srv; rust_srv *_srv;
rust_task_thread *_thread; rust_sched_loop *_sched_loop;
bool _use_labels; bool _use_labels;
void trace_ln(rust_task *task, char *message); void trace_ln(rust_task *task, char *message);
}; };

2
src/rt/rust_port.cpp
View File

@ -51,7 +51,7 @@ void rust_port::end_detach() {
// Just take the lock to make sure that the thread that signaled // Just take the lock to make sure that the thread that signaled
// the detach_cond isn't still holding it // the detach_cond isn't still holding it
scoped_lock with(ref_lock); scoped_lock with(ref_lock);
I(task->thread, ref_count == 0); I(task->sched_loop, ref_count == 0);
} }
void rust_port::send(void *sptr) { void rust_port::send(void *sptr) {

18
src/rt/rust_port_selector.cpp
View File

@ -10,12 +10,12 @@ rust_port_selector::select(rust_task *task, rust_port **dptr,
rust_port **ports, rust_port **ports,
size_t n_ports, uintptr_t *yield) { size_t n_ports, uintptr_t *yield) {
I(task->thread, this->ports == NULL); I(task->sched_loop, this->ports == NULL);
I(task->thread, this->n_ports == 0); I(task->sched_loop, this->n_ports == 0);
I(task->thread, dptr != NULL); I(task->sched_loop, dptr != NULL);
I(task->thread, ports != NULL); I(task->sched_loop, ports != NULL);
I(task->thread, n_ports != 0); I(task->sched_loop, n_ports != 0);
I(task->thread, yield != NULL); I(task->sched_loop, yield != NULL);
*yield = false; *yield = false;
size_t locks_taken = 0; size_t locks_taken = 0;
@ -27,11 +27,11 @@ rust_port_selector::select(rust_task *task, rust_port **dptr,
// message. // message.
// Start looking for ports from a different index each time. // Start looking for ports from a different index each time.
size_t j = isaac_rand(&task->thread->rctx); size_t j = isaac_rand(&task->sched_loop->rctx);
for (size_t i = 0; i < n_ports; i++) { for (size_t i = 0; i < n_ports; i++) {
size_t k = (i + j) % n_ports; size_t k = (i + j) % n_ports;
rust_port *port = ports[k]; rust_port *port = ports[k];
I(task->thread, port != NULL); I(task->sched_loop, port != NULL);
port->lock.lock(); port->lock.lock();
locks_taken++; locks_taken++;
@ -46,7 +46,7 @@ rust_port_selector::select(rust_task *task, rust_port **dptr,
if (!found_msg) { if (!found_msg) {
this->ports = ports; this->ports = ports;
this->n_ports = n_ports; this->n_ports = n_ports;
I(task->thread, task->rendezvous_ptr == NULL); I(task->sched_loop, task->rendezvous_ptr == NULL);
task->rendezvous_ptr = (uintptr_t*)dptr; task->rendezvous_ptr = (uintptr_t*)dptr;
task->block(this, "waiting for select rendezvous"); task->block(this, "waiting for select rendezvous");

4
src/rt/rust_sched_launcher.cpp
View File

@ -7,10 +7,10 @@ rust_sched_launcher::rust_sched_launcher(rust_scheduler *sched,
rust_srv *srv, int id) rust_srv *srv, int id)
: rust_thread(SCHED_STACK_SIZE), : rust_thread(SCHED_STACK_SIZE),
kernel(sched->kernel), kernel(sched->kernel),
thread(sched, srv, id) { sched_loop(sched, srv, id) {
} }
void void
rust_sched_launcher::run() { rust_sched_launcher::run() {
thread.start_main_loop(); sched_loop.start_main_loop();
} }

4
src/rt/rust_sched_launcher.h
View File

@ -17,13 +17,13 @@ public:
rust_kernel *kernel; rust_kernel *kernel;
private: private:
rust_task_thread thread; rust_sched_loop sched_loop;
public: public:
rust_sched_launcher(rust_scheduler *sched, rust_srv *srv, int id); rust_sched_launcher(rust_scheduler *sched, rust_srv *srv, int id);
virtual void run(); virtual void run();
rust_task_thread *get_loop() { return &thread; } rust_sched_loop *get_loop() { return &sched_loop; }
}; };
#endif // RUST_SCHED_LAUNCHER_H #endif // RUST_SCHED_LAUNCHER_H

50
src/rt/rust_task_thread.cpp → src/rt/rust_sched_loop.cpp
View File

@ -8,16 +8,16 @@
#include "rust_scheduler.h" #include "rust_scheduler.h"
#ifndef _WIN32 #ifndef _WIN32
pthread_key_t rust_task_thread::task_key; pthread_key_t rust_sched_loop::task_key;
#else #else
DWORD rust_task_thread::task_key; DWORD rust_sched_loop::task_key;
#endif #endif
const size_t C_STACK_SIZE = 1024*1024; const size_t C_STACK_SIZE = 1024*1024;
bool rust_task_thread::tls_initialized = false; bool rust_sched_loop::tls_initialized = false;
rust_task_thread::rust_task_thread(rust_scheduler *sched, rust_sched_loop::rust_sched_loop(rust_scheduler *sched,
rust_srv *srv, rust_srv *srv,
int id) : int id) :
_log(srv, this), _log(srv, this),
@ -42,7 +42,7 @@ rust_task_thread::rust_task_thread(rust_scheduler *sched,
} }
void void
rust_task_thread::activate(rust_task *task) { rust_sched_loop::activate(rust_task *task) {
task->ctx.next = &c_context; task->ctx.next = &c_context;
DLOG(this, task, "descheduling..."); DLOG(this, task, "descheduling...");
lock.unlock(); lock.unlock();
@ -55,7 +55,7 @@ rust_task_thread::activate(rust_task *task) {
} }
void void
rust_task_thread::log(rust_task* task, uint32_t level, char const *fmt, ...) { rust_sched_loop::log(rust_task* task, uint32_t level, char const *fmt, ...) {
char buf[BUF_BYTES]; char buf[BUF_BYTES];
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
@ -65,14 +65,14 @@ rust_task_thread::log(rust_task* task, uint32_t level, char const *fmt, ...) {
} }
void void
rust_task_thread::fail() { rust_sched_loop::fail() {
log(NULL, log_err, "domain %s @0x%" PRIxPTR " root task failed", log(NULL, log_err, "domain %s @0x%" PRIxPTR " root task failed",
name, this); name, this);
kernel->fail(); kernel->fail();
} }
void void
rust_task_thread::kill_all_tasks() { rust_sched_loop::kill_all_tasks() {
std::vector<rust_task*> all_tasks; std::vector<rust_task*> all_tasks;
{ {
@ -98,7 +98,7 @@ rust_task_thread::kill_all_tasks() {
} }
size_t size_t
rust_task_thread::number_of_live_tasks() { rust_sched_loop::number_of_live_tasks() {
return running_tasks.length() + blocked_tasks.length(); return running_tasks.length() + blocked_tasks.length();
} }
@ -106,7 +106,7 @@ rust_task_thread::number_of_live_tasks() {
* Delete any dead tasks. * Delete any dead tasks.
*/ */
void void
rust_task_thread::reap_dead_tasks() { rust_sched_loop::reap_dead_tasks() {
if (dead_task == NULL) { if (dead_task == NULL) {
return; return;
} }
@ -124,7 +124,7 @@ rust_task_thread::reap_dead_tasks() {
} }
void void
rust_task_thread::release_task(rust_task *task) { rust_sched_loop::release_task(rust_task *task) {
// Nobody should have a ref to the task at this point // Nobody should have a ref to the task at this point
I(this, task->get_ref_count() == 0); I(this, task->get_ref_count() == 0);
// Now delete the task, which will require using this thread's // Now delete the task, which will require using this thread's
@ -143,7 +143,7 @@ rust_task_thread::release_task(rust_task *task) {
* Returns NULL if no tasks can be scheduled. * Returns NULL if no tasks can be scheduled.
*/ */
rust_task * rust_task *
rust_task_thread::schedule_task() { rust_sched_loop::schedule_task() {
I(this, this); I(this, this);
// FIXME: in the face of failing tasks, this is not always right. // FIXME: in the face of failing tasks, this is not always right.
// I(this, n_live_tasks() > 0); // I(this, n_live_tasks() > 0);
@ -159,7 +159,7 @@ rust_task_thread::schedule_task() {
} }
void void
rust_task_thread::log_state() { rust_sched_loop::log_state() {
if (log_rt_task < log_debug) return; if (log_rt_task < log_debug) return;
if (!running_tasks.is_empty()) { if (!running_tasks.is_empty()) {
@ -190,7 +190,7 @@ rust_task_thread::log_state() {
* drop to zero. * drop to zero.
*/ */
void void
rust_task_thread::start_main_loop() { rust_sched_loop::start_main_loop() {
lock.lock(); lock.lock();
DLOG(this, dom, "started domain loop %d", id); DLOG(this, dom, "started domain loop %d", id);
@ -259,7 +259,7 @@ rust_task_thread::start_main_loop() {
} }
rust_task * rust_task *
rust_task_thread::create_task(rust_task *spawner, const char *name) { rust_sched_loop::create_task(rust_task *spawner, const char *name) {
rust_task *task = rust_task *task =
new (this->kernel, "rust_task") new (this->kernel, "rust_task")
rust_task (this, task_state_newborn, rust_task (this, task_state_newborn,
@ -272,7 +272,7 @@ rust_task_thread::create_task(rust_task *spawner, const char *name) {
} }
rust_task_list * rust_task_list *
rust_task_thread::state_list(rust_task_state state) { rust_sched_loop::state_list(rust_task_state state) {
switch (state) { switch (state) {
case task_state_running: case task_state_running:
return &running_tasks; return &running_tasks;
@ -284,7 +284,7 @@ rust_task_thread::state_list(rust_task_state state) {
} }
const char * const char *
rust_task_thread::state_name(rust_task_state state) { rust_sched_loop::state_name(rust_task_state state) {
switch (state) { switch (state) {
case task_state_newborn: case task_state_newborn:
return "newborn"; return "newborn";
@ -301,7 +301,7 @@ rust_task_thread::state_name(rust_task_state state) {
} }
void void
rust_task_thread::transition(rust_task *task, rust_sched_loop::transition(rust_task *task,
rust_task_state src, rust_task_state dst, rust_task_state src, rust_task_state dst,
rust_cond *cond, const char* cond_name) { rust_cond *cond, const char* cond_name) {
scoped_lock with(lock); scoped_lock with(lock);
@ -329,28 +329,28 @@ rust_task_thread::transition(rust_task *task,
#ifndef _WIN32 #ifndef _WIN32
void void
rust_task_thread::init_tls() { rust_sched_loop::init_tls() {
int result = pthread_key_create(&task_key, NULL); int result = pthread_key_create(&task_key, NULL);
assert(!result && "Couldn't create the TLS key!"); assert(!result && "Couldn't create the TLS key!");
tls_initialized = true; tls_initialized = true;
} }
void void
rust_task_thread::place_task_in_tls(rust_task *task) { rust_sched_loop::place_task_in_tls(rust_task *task) {
int result = pthread_setspecific(task_key, task); int result = pthread_setspecific(task_key, task);
assert(!result && "Couldn't place the task in TLS!"); assert(!result && "Couldn't place the task in TLS!");
task->record_stack_limit(); task->record_stack_limit();
} }
#else #else
void void
rust_task_thread::init_tls() { rust_sched_loop::init_tls() {
task_key = TlsAlloc(); task_key = TlsAlloc();
assert(task_key != TLS_OUT_OF_INDEXES && "Couldn't create the TLS key!"); assert(task_key != TLS_OUT_OF_INDEXES && "Couldn't create the TLS key!");
tls_initialized = true; tls_initialized = true;
} }
void void
rust_task_thread::place_task_in_tls(rust_task *task) { rust_sched_loop::place_task_in_tls(rust_task *task) {
BOOL result = TlsSetValue(task_key, task); BOOL result = TlsSetValue(task_key, task);
assert(result && "Couldn't place the task in TLS!"); assert(result && "Couldn't place the task in TLS!");
task->record_stack_limit(); task->record_stack_limit();
@ -358,7 +358,7 @@ rust_task_thread::place_task_in_tls(rust_task *task) {
#endif #endif
void void
rust_task_thread::exit() { rust_sched_loop::exit() {
scoped_lock with(lock); scoped_lock with(lock);
should_exit = true; should_exit = true;
lock.signal(); lock.signal();
@ -369,7 +369,7 @@ rust_task_thread::exit() {
// stack), because once we're on the Rust stack we won't have enough // stack), because once we're on the Rust stack we won't have enough
// room to do the allocation // room to do the allocation
void void
rust_task_thread::prepare_c_stack(rust_task *task) { rust_sched_loop::prepare_c_stack(rust_task *task) {
I(this, !extra_c_stack); I(this, !extra_c_stack);
if (!cached_c_stack && !task->have_c_stack()) { if (!cached_c_stack && !task->have_c_stack()) {
cached_c_stack = create_stack(kernel->region(), C_STACK_SIZE); cached_c_stack = create_stack(kernel->region(), C_STACK_SIZE);
@ -377,7 +377,7 @@ rust_task_thread::prepare_c_stack(rust_task *task) {
} }
void void
rust_task_thread::unprepare_c_stack() { rust_sched_loop::unprepare_c_stack() {
if (extra_c_stack) { if (extra_c_stack) {
destroy_stack(kernel->region(), extra_c_stack); destroy_stack(kernel->region(), extra_c_stack);
extra_c_stack = NULL; extra_c_stack = NULL;

20
src/rt/rust_task_thread.h → src/rt/rust_sched_loop.h
View File

@ -1,5 +1,5 @@
#ifndef RUST_TASK_THREAD_H #ifndef RUST_SCHED_LOOP_H
#define RUST_TASK_THREAD_H #define RUST_SCHED_LOOP_H
#include "rust_internal.h" #include "rust_internal.h"
#include "rust_stack.h" #include "rust_stack.h"
@ -14,7 +14,7 @@ enum rust_task_state {
typedef indexed_list<rust_task> rust_task_list; typedef indexed_list<rust_task> rust_task_list;
struct rust_task_thread struct rust_sched_loop
{ {
private: private:
@ -73,7 +73,7 @@ public:
// Only a pointer to 'name' is kept, so it must live as long as this // Only a pointer to 'name' is kept, so it must live as long as this
// domain. // domain.
rust_task_thread(rust_scheduler *sched, rust_srv *srv, int id); rust_sched_loop(rust_scheduler *sched, rust_srv *srv, int id);
void activate(rust_task *task); void activate(rust_task *task);
void log(rust_task *task, uint32_t level, char const *fmt, ...); void log(rust_task *task, uint32_t level, char const *fmt, ...);
rust_log & get_log(); rust_log & get_log();
@ -113,7 +113,7 @@ public:
}; };
inline rust_log & inline rust_log &
rust_task_thread::get_log() { rust_sched_loop::get_log() {
return _log; return _log;
} }
@ -122,7 +122,7 @@ rust_task_thread::get_log() {
#ifndef __WIN32__ #ifndef __WIN32__
inline rust_task * inline rust_task *
rust_task_thread::get_task() { rust_sched_loop::get_task() {
if (!tls_initialized) if (!tls_initialized)
return NULL; return NULL;
rust_task *task = reinterpret_cast<rust_task *> rust_task *task = reinterpret_cast<rust_task *>
@ -134,7 +134,7 @@ rust_task_thread::get_task() {
#else #else
inline rust_task * inline rust_task *
rust_task_thread::get_task() { rust_sched_loop::get_task() {
if (!tls_initialized) if (!tls_initialized)
return NULL; return NULL;
rust_task *task = reinterpret_cast<rust_task *>(TlsGetValue(task_key)); rust_task *task = reinterpret_cast<rust_task *>(TlsGetValue(task_key));
@ -146,7 +146,7 @@ rust_task_thread::get_task() {
// NB: Runs on the Rust stack // NB: Runs on the Rust stack
inline stk_seg * inline stk_seg *
rust_task_thread::borrow_c_stack() { rust_sched_loop::borrow_c_stack() {
I(this, cached_c_stack); I(this, cached_c_stack);
stk_seg *your_stack; stk_seg *your_stack;
if (extra_c_stack) { if (extra_c_stack) {
@ -161,7 +161,7 @@ rust_task_thread::borrow_c_stack() {
// NB: Runs on the Rust stack // NB: Runs on the Rust stack
inline void inline void
rust_task_thread::return_c_stack(stk_seg *stack) { rust_sched_loop::return_c_stack(stk_seg *stack) {
I(this, !extra_c_stack); I(this, !extra_c_stack);
if (!cached_c_stack) { if (!cached_c_stack) {
cached_c_stack = stack; cached_c_stack = stack;
@ -182,4 +182,4 @@ rust_task_thread::return_c_stack(stk_seg *stack) {
// End: // End:
// //
#endif /* RUST_TASK_THREAD_H */ #endif /* RUST_SCHED_LOOP_H */

8
src/rt/rust_shape.cpp
View File

@ -550,7 +550,7 @@ extern "C" void
shape_cmp_type(int8_t *result, const type_desc *tydesc, shape_cmp_type(int8_t *result, const type_desc *tydesc,
const type_desc **subtydescs, uint8_t *data_0, const type_desc **subtydescs, uint8_t *data_0,
uint8_t *data_1, uint8_t cmp_type) { uint8_t *data_1, uint8_t cmp_type) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
shape::arena arena; shape::arena arena;
// FIXME: This may well be broken when comparing two closures or objects // FIXME: This may well be broken when comparing two closures or objects
@ -571,7 +571,7 @@ shape_cmp_type(int8_t *result, const type_desc *tydesc,
extern "C" rust_str * extern "C" rust_str *
shape_log_str(const type_desc *tydesc, uint8_t *data) { shape_log_str(const type_desc *tydesc, uint8_t *data) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
shape::arena arena; shape::arena arena;
shape::type_param *params = shape::type_param *params =
@ -589,7 +589,7 @@ shape_log_str(const type_desc *tydesc, uint8_t *data) {
extern "C" void extern "C" void
shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) { shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
shape::arena arena; shape::arena arena;
shape::type_param *params = shape::type_param *params =
@ -601,6 +601,6 @@ shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
log.walk(); log.walk();
task->thread->log(task, level, "%s", ss.str().c_str()); task->sched_loop->log(task, level, "%s", ss.str().c_str());
} }

71
src/rt/rust_task.cpp
View File

@ -13,7 +13,7 @@
#include "rust_upcall.h" #include "rust_upcall.h"
// Tasks // Tasks
rust_task::rust_task(rust_task_thread *thread, rust_task_state state, rust_task::rust_task(rust_sched_loop *sched_loop, rust_task_state state,
rust_task *spawner, const char *name, rust_task *spawner, const char *name,
size_t init_stack_sz) : size_t init_stack_sz) :
ref_count(1), ref_count(1),
@ -21,13 +21,13 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_state state,
notify_enabled(false), notify_enabled(false),
stk(NULL), stk(NULL),
runtime_sp(0), runtime_sp(0),
sched(thread->sched), sched(sched_loop->sched),
thread(thread), sched_loop(sched_loop),
kernel(thread->kernel), kernel(sched_loop->kernel),
name(name), name(name),
list_index(-1), list_index(-1),
rendezvous_ptr(0), rendezvous_ptr(0),
local_region(&thread->srv->local_region), local_region(&sched_loop->srv->local_region),
boxed(&local_region), boxed(&local_region),
unwinding(false), unwinding(false),
propagate_failure(true), propagate_failure(true),
@ -43,8 +43,9 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_state state,
next_rust_sp(0), next_rust_sp(0),
supervisor(spawner) supervisor(spawner)
{ {
LOGPTR(thread, "new task", (uintptr_t)this); LOGPTR(sched_loop, "new task", (uintptr_t)this);
DLOG(thread, task, "sizeof(task) = %d (0x%x)", sizeof *this, sizeof *this); DLOG(sched_loop, task, "sizeof(task) = %d (0x%x)",
sizeof *this, sizeof *this);
new_stack(init_stack_sz); new_stack(init_stack_sz);
if (supervisor) { if (supervisor) {
@ -56,7 +57,7 @@ rust_task::rust_task(rust_task_thread *thread, rust_task_state state,
void void
rust_task::delete_this() rust_task::delete_this()
{ {
DLOG(thread, task, "~rust_task %s @0x%" PRIxPTR ", refcnt=%d", DLOG(sched_loop, task, "~rust_task %s @0x%" PRIxPTR ", refcnt=%d",
name, (uintptr_t)this, ref_count); name, (uintptr_t)this, ref_count);
// FIXME: We should do this when the task exits, not in the destructor // FIXME: We should do this when the task exits, not in the destructor
@ -69,10 +70,10 @@ rust_task::delete_this()
/* FIXME: tighten this up, there are some more /* FIXME: tighten this up, there are some more
assertions that hold at task-lifecycle events. */ assertions that hold at task-lifecycle events. */
I(thread, ref_count == 0); // || I(sched_loop, ref_count == 0); // ||
// (ref_count == 1 && this == sched->root_task)); // (ref_count == 1 && this == sched->root_task));
thread->release_task(this); sched_loop->release_task(this);
} }
struct spawn_args { struct spawn_args {
@ -124,7 +125,7 @@ cleanup_task(cleanup_args *args) {
#ifndef __WIN32__ #ifndef __WIN32__
task->conclude_failure(); task->conclude_failure();
#else #else
A(task->thread, false, "Shouldn't happen"); A(task->sched_loop, false, "Shouldn't happen");
#endif #endif
} }
} }
@ -140,7 +141,7 @@ void task_start_wrapper(spawn_args *a)
// must have void return type, we can safely pass 0. // must have void return type, we can safely pass 0.
a->f(0, a->envptr, a->argptr); a->f(0, a->envptr, a->argptr);
} catch (rust_task *ex) { } catch (rust_task *ex) {
A(task->thread, ex == task, A(task->sched_loop, ex == task,
"Expected this task to be thrown for unwinding"); "Expected this task to be thrown for unwinding");
threw_exception = true; threw_exception = true;
@ -154,7 +155,7 @@ void task_start_wrapper(spawn_args *a)
} }
// We should have returned any C stack by now // We should have returned any C stack by now
I(task->thread, task->c_stack == NULL); I(task->sched_loop, task->c_stack == NULL);
rust_opaque_box* env = a->envptr; rust_opaque_box* env = a->envptr;
if(env) { if(env) {
@ -180,7 +181,7 @@ rust_task::start(spawn_fn spawnee_fn,
" with env 0x%" PRIxPTR " and arg 0x%" PRIxPTR, " with env 0x%" PRIxPTR " and arg 0x%" PRIxPTR,
spawnee_fn, envptr, argptr); spawnee_fn, envptr, argptr);
I(thread, stk->data != NULL); I(sched_loop, stk->data != NULL);
char *sp = (char *)stk->end; char *sp = (char *)stk->end;
@ -218,7 +219,7 @@ rust_task::must_fail_from_being_killed_unlocked() {
void void
rust_task::yield(bool *killed) { rust_task::yield(bool *killed) {
if (must_fail_from_being_killed()) { if (must_fail_from_being_killed()) {
I(thread, !blocked()); I(sched_loop, !blocked());
*killed = true; *killed = true;
} }
@ -262,7 +263,7 @@ bool rust_task_is_unwinding(rust_task *rt) {
void void
rust_task::fail() { rust_task::fail() {
// See note in ::kill() regarding who should call this. // See note in ::kill() regarding who should call this.
DLOG(thread, task, "task %s @0x%" PRIxPTR " failing", name, this); DLOG(sched_loop, task, "task %s @0x%" PRIxPTR " failing", name, this);
backtrace(); backtrace();
unwinding = true; unwinding = true;
#ifndef __WIN32__ #ifndef __WIN32__
@ -271,7 +272,7 @@ rust_task::fail() {
die(); die();
conclude_failure(); conclude_failure();
// FIXME: Need unwinding on windows. This will end up aborting // FIXME: Need unwinding on windows. This will end up aborting
thread->fail(); sched_loop->fail();
#endif #endif
} }
@ -284,14 +285,14 @@ void
rust_task::fail_parent() { rust_task::fail_parent() {
scoped_lock with(supervisor_lock); scoped_lock with(supervisor_lock);
if (supervisor) { if (supervisor) {
DLOG(thread, task, DLOG(sched_loop, task,
"task %s @0x%" PRIxPTR "task %s @0x%" PRIxPTR
" propagating failure to supervisor %s @0x%" PRIxPTR, " propagating failure to supervisor %s @0x%" PRIxPTR,
name, this, supervisor->name, supervisor); name, this, supervisor->name, supervisor);
supervisor->kill(); supervisor->kill();
} }
if (NULL == supervisor && propagate_failure) if (NULL == supervisor && propagate_failure)
thread->fail(); sched_loop->fail();
} }
void void
@ -299,7 +300,7 @@ rust_task::unsupervise()
{ {
scoped_lock with(supervisor_lock); scoped_lock with(supervisor_lock);
if (supervisor) { if (supervisor) {
DLOG(thread, task, DLOG(sched_loop, task,
"task %s @0x%" PRIxPTR "task %s @0x%" PRIxPTR
" disconnecting from supervisor %s @0x%" PRIxPTR, " disconnecting from supervisor %s @0x%" PRIxPTR,
name, this, supervisor->name, supervisor); name, this, supervisor->name, supervisor);
@ -364,7 +365,7 @@ rust_task::free(void *p)
void void
rust_task::transition(rust_task_state src, rust_task_state dst, rust_task::transition(rust_task_state src, rust_task_state dst,
rust_cond *cond, const char* cond_name) { rust_cond *cond, const char* cond_name) {
thread->transition(this, src, dst, cond, cond_name); sched_loop->transition(this, src, dst, cond, cond_name);
} }
void void
@ -387,8 +388,8 @@ rust_task::block(rust_cond *on, const char* name) {
LOG(this, task, "Blocking on 0x%" PRIxPTR ", cond: 0x%" PRIxPTR, LOG(this, task, "Blocking on 0x%" PRIxPTR ", cond: 0x%" PRIxPTR,
(uintptr_t) on, (uintptr_t) cond); (uintptr_t) on, (uintptr_t) cond);
A(thread, cond == NULL, "Cannot block an already blocked task."); A(sched_loop, cond == NULL, "Cannot block an already blocked task.");
A(thread, on != NULL, "Cannot block on a NULL object."); A(sched_loop, on != NULL, "Cannot block on a NULL object.");
transition(task_state_running, task_state_blocked, on, name); transition(task_state_running, task_state_blocked, on, name);
@ -397,10 +398,10 @@ rust_task::block(rust_cond *on, const char* name) {
void void
rust_task::wakeup(rust_cond *from) { rust_task::wakeup(rust_cond *from) {
A(thread, cond != NULL, "Cannot wake up unblocked task."); A(sched_loop, cond != NULL, "Cannot wake up unblocked task.");
LOG(this, task, "Blocked on 0x%" PRIxPTR " woken up on 0x%" PRIxPTR, LOG(this, task, "Blocked on 0x%" PRIxPTR " woken up on 0x%" PRIxPTR,
(uintptr_t) cond, (uintptr_t) from); (uintptr_t) cond, (uintptr_t) from);
A(thread, cond == from, "Cannot wake up blocked task on wrong condition."); A(sched_loop, cond == from, "Cannot wake up blocked task on wrong condition.");
transition(task_state_blocked, task_state_running, NULL, "none"); transition(task_state_blocked, task_state_running, NULL, "none");
} }
@ -459,13 +460,13 @@ rust_task::get_next_stack_size(size_t min, size_t current, size_t requested) {
sz = std::max(sz, next); sz = std::max(sz, next);
LOG(this, mem, "next stack size: %" PRIdPTR, sz); LOG(this, mem, "next stack size: %" PRIdPTR, sz);
I(thread, requested <= sz); I(sched_loop, requested <= sz);
return sz; return sz;
} }
void void
rust_task::free_stack(stk_seg *stk) { rust_task::free_stack(stk_seg *stk) {
LOGPTR(thread, "freeing stk segment", (uintptr_t)stk); LOGPTR(sched_loop, "freeing stk segment", (uintptr_t)stk);
total_stack_sz -= user_stack_size(stk); total_stack_sz -= user_stack_size(stk);
destroy_stack(&local_region, stk); destroy_stack(&local_region, stk);
} }
@ -483,7 +484,7 @@ rust_task::new_stack(size_t requested_sz) {
} }
// The minimum stack size, in bytes, of a Rust stack, excluding red zone // The minimum stack size, in bytes, of a Rust stack, excluding red zone
size_t min_sz = thread->min_stack_size; size_t min_sz = sched_loop->min_stack_size;
// Try to reuse an existing stack segment // Try to reuse an existing stack segment
while (stk != NULL && stk->next != NULL) { while (stk != NULL && stk->next != NULL) {
@ -512,21 +513,21 @@ rust_task::new_stack(size_t requested_sz) {
size_t rust_stk_sz = get_next_stack_size(min_sz, size_t rust_stk_sz = get_next_stack_size(min_sz,
current_sz, requested_sz); current_sz, requested_sz);
if (total_stack_sz + rust_stk_sz > thread->env->max_stack_size) { if (total_stack_sz + rust_stk_sz > sched_loop->env->max_stack_size) {
LOG_ERR(this, task, "task %" PRIxPTR " ran out of stack", this); LOG_ERR(this, task, "task %" PRIxPTR " ran out of stack", this);
fail(); fail();
} }
size_t sz = rust_stk_sz + RED_ZONE_SIZE; size_t sz = rust_stk_sz + RED_ZONE_SIZE;
stk_seg *new_stk = create_stack(&local_region, sz); stk_seg *new_stk = create_stack(&local_region, sz);
LOGPTR(thread, "new stk", (uintptr_t)new_stk); LOGPTR(sched_loop, "new stk", (uintptr_t)new_stk);
new_stk->task = this; new_stk->task = this;
new_stk->next = NULL; new_stk->next = NULL;
new_stk->prev = stk; new_stk->prev = stk;
if (stk) { if (stk) {
stk->next = new_stk; stk->next = new_stk;
} }
LOGPTR(thread, "stk end", new_stk->end); LOGPTR(sched_loop, "stk end", new_stk->end);
stk = new_stk; stk = new_stk;
total_stack_sz += user_stack_size(new_stk); total_stack_sz += user_stack_size(new_stk);
@ -536,7 +537,7 @@ void
rust_task::cleanup_after_turn() { rust_task::cleanup_after_turn() {
// Delete any spare stack segments that were left // Delete any spare stack segments that were left
// behind by calls to prev_stack // behind by calls to prev_stack
I(thread, stk); I(sched_loop, stk);
while (stk->next) { while (stk->next) {
stk_seg *new_next = stk->next->next; stk_seg *new_next = stk->next->next;
free_stack(stk->next); free_stack(stk->next);
@ -566,7 +567,7 @@ reset_stack_limit_on_c_stack(reset_args *args) {
uintptr_t sp = args->sp; uintptr_t sp = args->sp;
while (!sp_in_stk_seg(sp, task->stk)) { while (!sp_in_stk_seg(sp, task->stk)) {
task->stk = task->stk->prev; task->stk = task->stk->prev;
A(task->thread, task->stk != NULL, A(task->sched_loop, task->stk != NULL,
"Failed to find the current stack"); "Failed to find the current stack");
} }
task->record_stack_limit(); task->record_stack_limit();
@ -595,10 +596,10 @@ rust_task::check_stack_canary() {
void void
rust_task::delete_all_stacks() { rust_task::delete_all_stacks() {
I(thread, !on_rust_stack()); I(sched_loop, !on_rust_stack());
// Delete all the stacks. There may be more than one if the task failed // Delete all the stacks. There may be more than one if the task failed
// and no landing pads stopped to clean up. // and no landing pads stopped to clean up.
I(thread, stk->next == NULL); I(sched_loop, stk->next == NULL);
while (stk != NULL) { while (stk != NULL) {
stk_seg *prev = stk->prev; stk_seg *prev = stk->prev;
free_stack(stk); free_stack(stk);

22
src/rt/rust_task.h
View File

@ -112,7 +112,7 @@ rust_task : public kernel_owned<rust_task>, rust_cond
stk_seg *stk; stk_seg *stk;
uintptr_t runtime_sp; // Runtime sp while task running. uintptr_t runtime_sp; // Runtime sp while task running.
rust_scheduler *sched; rust_scheduler *sched;
rust_task_thread *thread; rust_sched_loop *sched_loop;
// Fields known only to the runtime. // Fields known only to the runtime.
rust_kernel *kernel; rust_kernel *kernel;
@ -191,7 +191,7 @@ private:
public: public:
// Only a pointer to 'name' is kept, so it must live as long as this task. // Only a pointer to 'name' is kept, so it must live as long as this task.
rust_task(rust_task_thread *thread, rust_task(rust_sched_loop *sched_loop,
rust_task_state state, rust_task_state state,
rust_task *spawner, rust_task *spawner,
const char *name, const char *name,
@ -312,7 +312,7 @@ rust_task::call_on_c_stack(void *args, void *fn_ptr) {
bool borrowed_a_c_stack = false; bool borrowed_a_c_stack = false;
uintptr_t sp; uintptr_t sp;
if (c_stack == NULL) { if (c_stack == NULL) {
c_stack = thread->borrow_c_stack(); c_stack = sched_loop->borrow_c_stack();
next_c_sp = align_down(c_stack->end); next_c_sp = align_down(c_stack->end);
sp = next_c_sp; sp = next_c_sp;
borrowed_a_c_stack = true; borrowed_a_c_stack = true;
@ -335,8 +335,8 @@ inline void
rust_task::call_on_rust_stack(void *args, void *fn_ptr) { rust_task::call_on_rust_stack(void *args, void *fn_ptr) {
// Too expensive to check // Too expensive to check
// I(thread, !on_rust_stack()); // I(thread, !on_rust_stack());
A(thread, get_sp_limit() != 0, "Stack must be configured"); A(sched_loop, get_sp_limit() != 0, "Stack must be configured");
I(thread, next_rust_sp); I(sched_loop, next_rust_sp);
bool had_reentered_rust_stack = reentered_rust_stack; bool had_reentered_rust_stack = reentered_rust_stack;
reentered_rust_stack = true; reentered_rust_stack = true;
@ -358,8 +358,8 @@ inline void
rust_task::return_c_stack() { rust_task::return_c_stack() {
// Too expensive to check // Too expensive to check
// I(thread, on_rust_stack()); // I(thread, on_rust_stack());
I(thread, c_stack != NULL); I(sched_loop, c_stack != NULL);
thread->return_c_stack(c_stack); sched_loop->return_c_stack(c_stack);
c_stack = NULL; c_stack = NULL;
next_c_sp = 0; next_c_sp = 0;
} }
@ -368,7 +368,7 @@ rust_task::return_c_stack() {
inline void * inline void *
rust_task::next_stack(size_t stk_sz, void *args_addr, size_t args_sz) { rust_task::next_stack(size_t stk_sz, void *args_addr, size_t args_sz) {
new_stack_fast(stk_sz + args_sz); new_stack_fast(stk_sz + args_sz);
A(thread, stk->end - (uintptr_t)stk->data >= stk_sz + args_sz, A(sched_loop, stk->end - (uintptr_t)stk->data >= stk_sz + args_sz,
"Did not receive enough stack"); "Did not receive enough stack");
uint8_t *new_sp = (uint8_t*)stk->end; uint8_t *new_sp = (uint8_t*)stk->end;
// Push the function arguments to the new stack // Push the function arguments to the new stack
@ -407,7 +407,7 @@ new_stack_slow(new_stack_args *args);
inline void inline void
rust_task::new_stack_fast(size_t requested_sz) { rust_task::new_stack_fast(size_t requested_sz) {
// The minimum stack size, in bytes, of a Rust stack, excluding red zone // The minimum stack size, in bytes, of a Rust stack, excluding red zone
size_t min_sz = thread->min_stack_size; size_t min_sz = sched_loop->min_stack_size;
// Try to reuse an existing stack segment // Try to reuse an existing stack segment
if (stk != NULL && stk->next != NULL) { if (stk != NULL && stk->next != NULL) {
@ -438,8 +438,8 @@ record_sp_limit(void *limit);
inline void inline void
rust_task::record_stack_limit() { rust_task::record_stack_limit() {
I(thread, stk); I(sched_loop, stk);
A(thread, A(sched_loop,
(uintptr_t)stk->end - RED_ZONE_SIZE (uintptr_t)stk->end - RED_ZONE_SIZE
- (uintptr_t)stk->data >= LIMIT_OFFSET, - (uintptr_t)stk->data >= LIMIT_OFFSET,
"Stack size must be greater than LIMIT_OFFSET"); "Stack size must be greater than LIMIT_OFFSET");

36
src/rt/rust_upcall.cpp
View File

@ -8,7 +8,7 @@
#include "rust_cc.h" #include "rust_cc.h"
#include "rust_internal.h" #include "rust_internal.h"
#include "rust_task_thread.h" #include "rust_sched_loop.h"
#include "rust_unwind.h" #include "rust_unwind.h"
#include "rust_upcall.h" #include "rust_upcall.h"
#include "rust_util.h" #include "rust_util.h"
@ -47,7 +47,7 @@ static void check_stack_alignment() { }
inline void inline void
call_upcall_on_c_stack(void *args, void *fn_ptr) { call_upcall_on_c_stack(void *args, void *fn_ptr) {
check_stack_alignment(); check_stack_alignment();
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
task->call_on_c_stack(args, fn_ptr); task->call_on_c_stack(args, fn_ptr);
} }
@ -62,7 +62,7 @@ extern "C" void record_sp_limit(void *limit);
*/ */
extern "C" CDECL void extern "C" CDECL void
upcall_call_shim_on_c_stack(void *args, void *fn_ptr) { upcall_call_shim_on_c_stack(void *args, void *fn_ptr) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
// FIXME (1226) - The shim functions generated by rustc contain the // FIXME (1226) - The shim functions generated by rustc contain the
// morestack prologue, so we need to let them know they have enough // morestack prologue, so we need to let them know they have enough
@ -85,7 +85,7 @@ upcall_call_shim_on_c_stack(void *args, void *fn_ptr) {
*/ */
extern "C" CDECL void extern "C" CDECL void
upcall_call_shim_on_rust_stack(void *args, void *fn_ptr) { upcall_call_shim_on_rust_stack(void *args, void *fn_ptr) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
// FIXME: Because of the hack in the other function that disables the // FIXME: Because of the hack in the other function that disables the
// stack limit when entering the C stack, here we restore the stack limit // stack limit when entering the C stack, here we restore the stack limit
@ -116,7 +116,7 @@ struct s_fail_args {
extern "C" CDECL void extern "C" CDECL void
upcall_s_fail(s_fail_args *args) { upcall_s_fail(s_fail_args *args) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR, LOG_ERR(task, upcall, "upcall fail '%s', %s:%" PRIdPTR,
args->expr, args->file, args->line); args->expr, args->file, args->line);
@ -142,7 +142,7 @@ struct s_malloc_args {
extern "C" CDECL void extern "C" CDECL void
upcall_s_malloc(s_malloc_args *args) { upcall_s_malloc(s_malloc_args *args) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
LOG(task, mem, "upcall malloc(0x%" PRIxPTR ")", args->td); LOG(task, mem, "upcall malloc(0x%" PRIxPTR ")", args->td);
@ -179,11 +179,11 @@ struct s_free_args {
extern "C" CDECL void extern "C" CDECL void
upcall_s_free(s_free_args *args) { upcall_s_free(s_free_args *args) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
rust_task_thread *thread = task->thread; rust_sched_loop *sched_loop = task->sched_loop;
DLOG(thread, mem, DLOG(sched_loop, mem,
"upcall free(0x%" PRIxPTR ", is_gc=%" PRIdPTR ")", "upcall free(0x%" PRIxPTR ", is_gc=%" PRIdPTR ")",
(uintptr_t)args->ptr); (uintptr_t)args->ptr);
@ -225,7 +225,7 @@ struct s_shared_malloc_args {
extern "C" CDECL void extern "C" CDECL void
upcall_s_shared_malloc(s_shared_malloc_args *args) { upcall_s_shared_malloc(s_shared_malloc_args *args) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
LOG(task, mem, "upcall shared_malloc(%" PRIdPTR ")", args->nbytes); LOG(task, mem, "upcall shared_malloc(%" PRIdPTR ")", args->nbytes);
@ -253,11 +253,11 @@ struct s_shared_free_args {
extern "C" CDECL void extern "C" CDECL void
upcall_s_shared_free(s_shared_free_args *args) { upcall_s_shared_free(s_shared_free_args *args) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
rust_task_thread *thread = task->thread; rust_sched_loop *sched_loop = task->sched_loop;
DLOG(thread, mem, DLOG(sched_loop, mem,
"upcall shared_free(0x%" PRIxPTR")", "upcall shared_free(0x%" PRIxPTR")",
(uintptr_t)args->ptr); (uintptr_t)args->ptr);
task->kernel->free(args->ptr); task->kernel->free(args->ptr);
@ -277,7 +277,7 @@ struct s_shared_realloc_args {
extern "C" CDECL void extern "C" CDECL void
upcall_s_shared_realloc(s_shared_realloc_args *args) { upcall_s_shared_realloc(s_shared_realloc_args *args) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
args->retval = task->kernel->realloc(args->ptr, args->size); args->retval = task->kernel->realloc(args->ptr, args->size);
} }
@ -298,7 +298,7 @@ struct s_vec_grow_args {
extern "C" CDECL void extern "C" CDECL void
upcall_s_vec_grow(s_vec_grow_args *args) { upcall_s_vec_grow(s_vec_grow_args *args) {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
LOG_UPCALL_ENTRY(task); LOG_UPCALL_ENTRY(task);
reserve_vec(task, args->vp, args->new_sz); reserve_vec(task, args->vp, args->new_sz);
(*args->vp)->fill = args->new_sz; (*args->vp)->fill = args->new_sz;
@ -320,7 +320,7 @@ extern "C" CDECL void
upcall_s_str_concat(s_str_concat_args *args) { upcall_s_str_concat(s_str_concat_args *args) {
rust_vec *lhs = args->lhs; rust_vec *lhs = args->lhs;
rust_vec *rhs = args->rhs; rust_vec *rhs = args->rhs;
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
size_t fill = lhs->fill + rhs->fill - 1; size_t fill = lhs->fill + rhs->fill - 1;
rust_vec* v = (rust_vec*)task->kernel->malloc(fill + sizeof(rust_vec), rust_vec* v = (rust_vec*)task->kernel->malloc(fill + sizeof(rust_vec),
"str_concat"); "str_concat");
@ -377,7 +377,7 @@ upcall_rust_personality(int version,
s_rust_personality_args args = {(_Unwind_Reason_Code)0, s_rust_personality_args args = {(_Unwind_Reason_Code)0,
version, actions, exception_class, version, actions, exception_class,
ue_header, context}; ue_header, context};
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
// The personality function is run on the stack of the // The personality function is run on the stack of the
// last function that threw or landed, which is going // last function that threw or landed, which is going
@ -462,7 +462,7 @@ upcall_del_stack() {
// needs to acquire the value of the stack pointer // needs to acquire the value of the stack pointer
extern "C" CDECL void extern "C" CDECL void
upcall_reset_stack_limit() { upcall_reset_stack_limit() {
rust_task *task = rust_task_thread::get_task(); rust_task *task = rust_sched_loop::get_task();
task->reset_stack_limit(); task->reset_stack_limit();
} }

4
src/rt/rust_uv.cpp
View File

@ -20,13 +20,13 @@ struct handle_data {
// helpers // helpers
static void* static void*
current_kernel_malloc(size_t size, const char* tag) { current_kernel_malloc(size_t size, const char* tag) {
void* ptr = rust_task_thread::get_task()->kernel->malloc(size, tag); void* ptr = rust_sched_loop::get_task()->kernel->malloc(size, tag);
return ptr; return ptr;
} }
static void static void
current_kernel_free(void* ptr) { current_kernel_free(void* ptr) {
rust_task_thread::get_task()->kernel->free(ptr); rust_sched_loop::get_task()->kernel->free(ptr);
} }
static handle_data* static handle_data*