qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make pr_parse thread safe 

Or at least, conversion to property list is thread safe.
This commit is contained in:
Bill Currie 2020-02-26 01:55:56 +09:00
parent 35c9d6ee38
commit 4c1b6ce76c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/gamecode/pr_parse.c
View File

@ -68,15 +68,11 @@
Easier to parse than PR_ValueString Easier to parse than PR_ValueString
*/ */
static const char * static const char *
PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val) PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val, dstring_t *line)
{ {
static dstring_t *line = 0;
pr_def_t *def; pr_def_t *def;
dfunction_t *f; dfunction_t *f;
if (!line)
line = dstring_new ();
type &= ~DEF_SAVEGLOBAL; type &= ~DEF_SAVEGLOBAL;
switch (type) { switch (type) {
@ -121,6 +117,7 @@ PR_UglyValueString (progs_t *pr, etype_t type, pr_type_t *val)
VISIBLE plitem_t * VISIBLE plitem_t *
ED_EntityDict (progs_t *pr, edict_t *ed) ED_EntityDict (progs_t *pr, edict_t *ed)
{ {
dstring_t *dstr = dstring_newstr ();
plitem_t *entity = PL_NewDictionary (); plitem_t *entity = PL_NewDictionary ();
pr_uint_t i; pr_uint_t i;
int j; int j;
@ -149,10 +146,11 @@ ED_EntityDict (progs_t *pr, edict_t *ed)
if (j == pr_type_size[type]) if (j == pr_type_size[type])
continue; continue;
value = PR_UglyValueString (pr, type, v); value = PR_UglyValueString (pr, type, v, dstr);
PL_D_AddObject (entity, name, PL_NewString (value)); PL_D_AddObject (entity, name, PL_NewString (value));
} }
} }
dstring_delete (dstr);
return entity; return entity;
} }
@ -165,6 +163,7 @@ ED_EntityDict (progs_t *pr, edict_t *ed)
VISIBLE plitem_t * VISIBLE plitem_t *
ED_GlobalsDict (progs_t *pr) ED_GlobalsDict (progs_t *pr)
{ {
dstring_t *dstr = dstring_newstr ();
plitem_t *globals = PL_NewDictionary (); plitem_t *globals = PL_NewDictionary ();
pr_uint_t i; pr_uint_t i;
const char *name; const char *name;
@ -183,9 +182,10 @@ ED_GlobalsDict (progs_t *pr)
continue; continue;
name = PR_GetString (pr, def->name); name = PR_GetString (pr, def->name);
value = PR_UglyValueString (pr, type, &pr->pr_globals[def->ofs]); value = PR_UglyValueString (pr, type, &pr->pr_globals[def->ofs], dstr);
PL_D_AddObject (globals, name, PL_NewString (value)); PL_D_AddObject (globals, name, PL_NewString (value));
} }
dstring_delete (dstr);
return globals; return globals;
} }