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

[qwaq] Rename thread_args to thread_data

Browse source
This commit is contained in:
Bill Currie 2020-03-20 21:16:56 +09:00
parent 93886d6cd7
commit f14f2f518a
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ruamoko/qwaq/main.c
View file

@ -80,7 +80,7 @@ typedef struct qwaq_thread_s {
func_t main_func; func_t main_func;
} qwaq_thread_t; } qwaq_thread_t;
struct DARRAY_TYPE(qwaq_thread_t) thread_args; struct DARRAY_TYPE(qwaq_thread_t) thread_data;
static QFile * static QFile *
open_file (const char *path, int *len) open_file (const char *path, int *len)
@ -257,8 +257,8 @@ parse_argset (int argc, char **argv)
if (optind < argc) { if (optind < argc) {
optind++; optind++;
} }
DARRAY_APPEND (&thread_args, thread); DARRAY_APPEND (&thread_data, thread);
return thread_args.size - 1; return thread_data.size - 1;
} }
static int static int
@ -279,7 +279,7 @@ parse_args (int argc, char **argv)
case OPT_QARGS: case OPT_QARGS:
if (qargs_ind < 0) { if (qargs_ind < 0) {
qargs_ind = parse_argset (argc, argv); qargs_ind = parse_argset (argc, argv);
thread_args.a[qargs_ind].args.a[0] = "--qargs"; thread_data.a[qargs_ind].args.a[0] = "--qargs";
goto done; goto done;
} else { } else {
printf ("more than one set of qargs given"); printf ("more than one set of qargs given");
@ -292,8 +292,8 @@ parse_args (int argc, char **argv)
} }
done: done:
free (thread_args.a[0].args.a); free (thread_data.a[0].args.a);
thread_args.a[0] = main_thread; thread_data.a[0] = main_thread;
while (optind < argc) { while (optind < argc) {
parse_argset (argc, argv); parse_argset (argc, argv);
@ -311,12 +311,12 @@ main (int argc, char **argv)
this_program = argv[0]; this_program = argv[0];
DARRAY_INIT (&thread_args, 4); DARRAY_INIT (&thread_data, 4);
for (optind = 1; optind < argc; ) { for (optind = 1; optind < argc; ) {
parse_argset (argc, argv); parse_argset (argc, argv);
} }
if (thread_args.size) { if (thread_data.size) {
qwaq_thread_t *thread = &thread_args.a[0]; qwaq_thread_t *thread = &thread_data.a[0];
// the first arg is initialized to null, but this is for getopt, so // the first arg is initialized to null, but this is for getopt, so
// set to main program name // set to main program name
thread->args.a[0] = this_program; thread->args.a[0] = this_program;
@ -326,11 +326,11 @@ main (int argc, char **argv)
// create a blank main thread set // create a blank main thread set
qwaq_thread_t thread = {}; qwaq_thread_t thread = {};
DARRAY_INIT (&thread.args, 4); DARRAY_INIT (&thread.args, 4);
DARRAY_APPEND (&thread_args, thread); DARRAY_APPEND (&thread_data, thread);
} }
if (qargs_ind >= 0) { if (qargs_ind >= 0) {
qwaq_thread_t *qargs = &thread_args.a[qargs_ind]; qwaq_thread_t *qargs = &thread_data.a[qargs_ind];
// the first arg is initialized to --qargs, so // the first arg is initialized to --qargs, so
// set to main program name for now // set to main program name for now
qargs->args.a[0] = this_program; qargs->args.a[0] = this_program;
@ -345,26 +345,26 @@ main (int argc, char **argv)
init_qf (); init_qf ();
if (thread_args.a[0].args.size < 1) { if (thread_data.a[0].args.size < 1) {
DARRAY_APPEND (&thread_args.a[0].args, "qwaq-app.dat"); DARRAY_APPEND (&thread_data.a[0].args, "qwaq-app.dat");
} }
while (thread_args.size < thread_args.a[0].args.size + num_sys) { while (thread_data.size < thread_data.a[0].args.size + num_sys) {
qwaq_thread_t thread = {}; qwaq_thread_t thread = {};
DARRAY_INIT (&thread.args, 4); DARRAY_INIT (&thread.args, 4);
DARRAY_APPEND (&thread.args, 0); DARRAY_APPEND (&thread.args, 0);
DARRAY_APPEND (&thread_args, thread); DARRAY_APPEND (&thread_data, thread);
} }
for (size_t i = 1, thread_ind = 0; i < thread_args.size; i++) { for (size_t i = 1, thread_ind = 0; i < thread_data.size; i++) {
qwaq_thread_t *thread = &thread_args.a[i]; qwaq_thread_t *thread = &thread_data.a[i];
if (thread->args.size && thread->args.a[0] if (thread->args.size && thread->args.a[0]
&& strcmp (thread->args.a[0], "--qargs")) { && strcmp (thread->args.a[0], "--qargs")) {
// skip the args set that's passed to qargs // skip the args set that's passed to qargs
continue; continue;
} }
if (thread_ind < thread_args.a[0].args.size) { if (thread_ind < thread_data.a[0].args.size) {
thread->args.a[0] = thread_args.a[0].args.a[thread_ind++]; thread->args.a[0] = thread_data.a[0].args.a[thread_ind++];
} else { } else {
printf ("ignoring extra arg sets\n"); printf ("ignoring extra arg sets\n");
break; break;
@ -375,7 +375,7 @@ main (int argc, char **argv)
spawn_progs (thread); spawn_progs (thread);
} }
if (main_ind >= 0) { if (main_ind >= 0) {
ret = run_progs (&thread_args.a[main_ind]); ret = run_progs (&thread_data.a[main_ind]);
} }
Sys_Shutdown (); Sys_Shutdown ();
return ret; return ret;