Skip to content

rvvm: Restart the eventloop thread after it stops on its own #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BeastLe9enD wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

rvvm: Restart the eventloop thread after it stops on its own #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/core/rvvm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ static spinlock_t global_lock = ZERO_INIT;
static vector_t(rvvm_machine_t*) global_machines = ZERO_INIT;
static bool global_manual = false;

// Set under global_lock when the eventloop thread stops on its own; its handle still needs a join
static bool eventloop_exited = false;

static spinlock_t eventloop_lock = ZERO_INIT;
static cond_var_t* eventloop_cond = NULL;
static thread_ctx_t* eventloop_thread = NULL;
Expand Down Expand Up @@ -423,6 +426,9 @@ static void* rvvm_eventloop(void* manual)

scoped_spin_lock (&global_lock) {
running = !rvvm_eventloop_tick(!!manual);
if (!running && !manual) {
eventloop_exited = true;
}
}
}
}
Expand All @@ -443,12 +449,15 @@ static void rvvm_reconfigure_eventloop(void)
#else
bool needs_cond = false;
bool needs_thread = false;
bool exited = false;
scoped_spin_lock (&global_lock) {
needs_cond = global_manual || vector_size(global_machines);
needs_thread = !global_manual && vector_size(global_machines);
needs_cond = global_manual || vector_size(global_machines);
needs_thread = !global_manual && vector_size(global_machines);
exited = eventloop_exited;
eventloop_exited = false;
}
scoped_spin_lock (&eventloop_lock) {
if (!needs_thread && eventloop_thread) {
if ((!needs_thread || exited) && eventloop_thread) {
condvar_wake(eventloop_cond);
thread_join(eventloop_thread);
eventloop_thread = NULL;
Expand Down
Loading