qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-20 17:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qwaq] Move progs create and load into the threads

Browse source 
While this does answer the question of how I'll go about restarting the
target progs (when I get to that point), it was required just to start
full-on ruamoko progs because .ctor was getting run in the main thread
and blocking due to trace.
This commit is contained in:
Bill Currie 2020-04-02 00:11:47 +09:00
parent d9668a1185
commit 1d5058d267
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
ruamoko/qwaq/builtins/main.c
View file

@ -140,19 +140,22 @@ init_qf (void)
Cvar_Get ("pr_debug", "2", 0, 0, 0);
Cvar_Get ("pr_boundscheck", "0", 0, 0, 0);
// Normally, this is done by PR_Init, but PR_Init is not called in the main
// thread. However, PR_Opcode_Init() is idempotent.
PR_Opcode_Init ();
}
typedef void (*progsinit_f) (progs_t *pr);
static progs_t *
create_progs (progsinit_f *funcs)
create_progs (qwaq_thread_t *thread)
{
progs_t *pr = calloc (1, sizeof (*pr));
progsinit_f *funcs = thread->progsinit;
pr->load_file = load_file;
pr->allocate_progs_mem = allocate_progs_mem;
pr->free_progs_mem = free_progs_mem;
pr->no_exec_limit = 1;
pr->hashlink_freelist = &thread->hashlink_freelist;
PR_Init_Cvars ();
PR_Init (pr);
@ -185,7 +188,7 @@ load_progs (progs_t *pr, const char *name)
}
static void
spawn_progs (qwaq_thread_t *thread, progsinit_f *funcs)
spawn_progs (qwaq_thread_t *thread)
{
dfunction_t *dfunc;
const char *name = 0;
@ -194,7 +197,7 @@ spawn_progs (qwaq_thread_t *thread, progsinit_f *funcs)
progs_t *pr;
thread->main_func = 0;
pr = thread->pr = create_progs (funcs);
pr = thread->pr = create_progs (thread);
if (thread->args.size) {
name = thread->args.a[0];
}
@ -230,6 +233,9 @@ run_progs (void *data)
{
__auto_type thread = (qwaq_thread_t *) data;
spawn_progs (thread);
Sys_Printf ("starthing thread for %s\n", thread->args.a[0]);
PR_ExecuteProgram (thread->pr, thread->main_func);
PR_PopFrame (thread->pr);
if (thread->pr->debug_handler) {
@ -452,13 +458,13 @@ main (int argc, char **argv)
main_ind = i;
app_funcs = main_app;
}
spawn_progs (thread, app_funcs);
thread->progsinit = app_funcs;
}
if (main_ind >= 0) {
// threads might start new threads before the end is reached
size_t count = thread_data.size;
for (size_t i = 0; i < count; i++) {
if (thread_data.a[i]->pr && thread_data.a[i]->main_func) {
if (thread_data.a[i]->progsinit) {
start_progs_thread (thread_data.a[i]);
}
}

4
ruamoko/qwaq/qwaq.h
View file

@ -5,12 +5,16 @@
#include "QF/progs.h"
#include "QF/sys.h"
typedef void (*progsinit_f) (progs_t *pr);
typedef struct qwaq_thread_s {
pthread_t thread_id;
int return_code;
struct DARRAY_TYPE (const char *) args;
sys_printf_t sys_printf;
progsinit_f*progsinit;
progs_t *pr;
struct hashlink_s *hashlink_freelist;
func_t main_func;
void *data;
} qwaq_thread_t;