haiwan
/
sledge
0
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: replace in_interrupt with bool

Browse Source
main
Sean McBride 5 years ago
parent 82f79b1ed4
commit 321e26577d
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
runtime/include/sandbox.h
Unescape View File

@ -88,7 +88,7 @@ extern __thread arch_context_t *worker_thread_next_context;
extern void worker_thread_block_current_sandbox(void); extern void worker_thread_block_current_sandbox(void);
extern void worker_thread_exit_current_sandbox(void); extern void worker_thread_exit_current_sandbox(void);
extern struct sandbox *worker_thread_get_next_sandbox(int interrupt); extern struct sandbox *worker_thread_get_next_sandbox(bool is_in_interrupt);
extern void worker_thread_process_io(void); extern void worker_thread_process_io(void);
extern void __attribute__((noreturn)) worker_thread_sandbox_switch_preempt(void); extern void __attribute__((noreturn)) worker_thread_sandbox_switch_preempt(void);
extern void worker_thread_wakeup_sandbox(sandbox_t *sandbox); extern void worker_thread_wakeup_sandbox(sandbox_t *sandbox);

13
runtime/src/runtime.c
Unescape View File

@ -210,7 +210,7 @@ worker_thread_block_current_sandbox(void)
struct sandbox *current_sandbox = current_sandbox_get(); struct sandbox *current_sandbox = current_sandbox_get();
ps_list_rem_d(current_sandbox); ps_list_rem_d(current_sandbox);
current_sandbox->state = BLOCKED; current_sandbox->state = BLOCKED;
struct sandbox *next_sandbox = worker_thread_get_next_sandbox(0); struct sandbox *next_sandbox = worker_thread_get_next_sandbox(false);
debuglog("[%p: %next_sandbox, %p: %next_sandbox]\n", current_sandbox, current_sandbox->module->name, debuglog("[%p: %next_sandbox, %p: %next_sandbox]\n", current_sandbox, current_sandbox->module->name,
next_sandbox, next_sandbox ? next_sandbox->module->name : ""); next_sandbox, next_sandbox ? next_sandbox->module->name : "");
software_interrupt_enable(); software_interrupt_enable();
@ -299,13 +299,12 @@ worker_thread_execute_libuv_event_loop(void)
* @return the sandbox to execute or NULL if none are available * @return the sandbox to execute or NULL if none are available
**/ **/
struct sandbox * struct sandbox *
worker_thread_get_next_sandbox(int in_interrupt) worker_thread_get_next_sandbox(bool is_in_interrupt)
{ {
// If the thread local runqueue is empty and we're not running in the context of an interupt, // If the thread local runqueue is empty and we're not running in the context of an interupt,
// pull a fresh batch of sandbox requests from the global queue // pull a fresh batch of sandbox requests from the global queue
if (sandbox_run_queue_is_empty()) { if (sandbox_run_queue_is_empty()) {
// this is in an interrupt context, don't steal work here! if (is_in_interrupt) return NULL;
if (in_interrupt) return NULL;
if (worker_thread_pull_and_process_sandbox_requests() == 0) { if (worker_thread_pull_and_process_sandbox_requests() == 0) {
// debuglog("[null: null]\n"); // debuglog("[null: null]\n");
return NULL; return NULL;
@ -361,14 +360,14 @@ worker_thread_main(void *return_code)
while (true) { while (true) {
worker_thread_execute_runtime_maintenance(); worker_thread_execute_runtime_maintenance();
software_interrupt_disable(); software_interrupt_disable();
struct sandbox *sandbox = worker_thread_get_next_sandbox(0); struct sandbox *sandbox = worker_thread_get_next_sandbox(false);
software_interrupt_enable(); software_interrupt_enable();
assert(sandbox == NULL || sandbox->state == RUNNABLE); assert(sandbox == NULL || sandbox->state == RUNNABLE);
while (sandbox) { while (sandbox) {
worker_thread_switch_to_sandbox(sandbox); worker_thread_switch_to_sandbox(sandbox);
worker_thread_execute_runtime_maintenance(); worker_thread_execute_runtime_maintenance();
software_interrupt_disable(); software_interrupt_disable();
sandbox = worker_thread_get_next_sandbox(0); sandbox = worker_thread_get_next_sandbox(false);
software_interrupt_enable(); software_interrupt_enable();
assert(sandbox == NULL || sandbox->state == RUNNABLE); assert(sandbox == NULL || sandbox->state == RUNNABLE);
} }
@ -393,7 +392,7 @@ worker_thread_exit_current_sandbox(void)
sandbox_run_queue_remove(current_sandbox); sandbox_run_queue_remove(current_sandbox);
current_sandbox->state = RETURNED; current_sandbox->state = RETURNED;
struct sandbox *next_sandbox = worker_thread_get_next_sandbox(0); struct sandbox *next_sandbox = worker_thread_get_next_sandbox(true);
assert(next_sandbox != current_sandbox); assert(next_sandbox != current_sandbox);
software_interrupt_enable(); software_interrupt_enable();
// free resources from "main function execution", as stack still in use. // free resources from "main function execution", as stack still in use.

2
runtime/src/software_interrupt.c
Unescape View File

@ -126,7 +126,7 @@ software_interrupt_schedule_alarm(void *user_context_raw)
if (curr == NULL) goto done; if (curr == NULL) goto done;
// find a next sandbox to run.. // find a next sandbox to run..
struct sandbox *next = worker_thread_get_next_sandbox(1); struct sandbox *next = worker_thread_get_next_sandbox(true);
if (next == NULL) goto done; if (next == NULL) goto done;
if (next == curr) goto done; // only this sandbox to schedule.. return to it! if (next == curr) goto done; // only this sandbox to schedule.. return to it!
// save the current sandbox, state from user_context! // save the current sandbox, state from user_context!

Write Preview
Loading…
Cancel
Save