qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-04-25 02:52:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

[gamecode] Move file_hash into debug resources

Browse source 
I don't remember why I didn't do this earlier when I thread-safed progs.
This commit is contained in:
Bill Currie 2020-04-03 22:39:27 +09:00
parent fbbe144399
commit 7bcfd2f2be
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libs/gamecode/pr_debug.c
View file

@ -85,6 +85,7 @@ typedef struct prdeb_resources_s {
pr_def_t *type_encodings_def; pr_def_t *type_encodings_def;
qfot_type_t void_type; qfot_type_t void_type;
qfot_type_t *type_encodings[ev_type_count]; qfot_type_t *type_encodings[ev_type_count];
hashtab_t *file_hash;
} prdeb_resources_t; } prdeb_resources_t;
typedef struct { typedef struct {
@ -94,7 +95,6 @@ typedef struct {
cvar_t *pr_debug; cvar_t *pr_debug;
cvar_t *pr_source_path; cvar_t *pr_source_path;
static hashtab_t *file_hash;
static char *source_path_string; static char *source_path_string;
static char **source_paths; static char **source_paths;
@ -345,6 +345,9 @@ pr_debug_clear (progs_t *pr, void *data)
if (res->debug) if (res->debug)
pr->free_progs_mem (pr, res->debug); pr->free_progs_mem (pr, res->debug);
if (res->file_hash) {
Hash_FlushTable (res->file_hash);
}
res->debug = 0; res->debug = 0;
res->auxfunctions = 0; res->auxfunctions = 0;
if (res->auxfunction_map) if (res->auxfunction_map)
@ -368,7 +371,7 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
{ {
prdeb_resources_t *res = pr->pr_debug_resources; prdeb_resources_t *res = pr->pr_debug_resources;
char *l, *p, **dir; char *l, *p, **dir;
file_t *f = Hash_Find (file_hash, fname); file_t *f = Hash_Find (res->file_hash, fname);
if (f) if (f)
return f; return f;
@ -415,7 +418,7 @@ PR_Load_Source_File (progs_t *pr, const char *fname)
f->num_lines++; f->num_lines++;
} }
f->pr = pr; f->pr = pr;
Hash_Add (file_hash, f); Hash_Add (res->file_hash, f);
return f; return f;
} }
@ -441,7 +444,6 @@ PR_LoadDebug (progs_t *pr)
if (def) if (def)
str = &pr->pr_globals[def->ofs]; str = &pr->pr_globals[def->ofs];
Hash_FlushTable (file_hash);
if (!str) if (!str)
return 1; return 1;
res->debugfile = PR_GetString (pr, str->string_var); res->debugfile = PR_GetString (pr, str->string_var);
@ -1613,12 +1615,10 @@ PR_Debug_Init (progs_t *pr)
for (int i = 0; i < ev_type_count; i++ ) { for (int i = 0; i < ev_type_count; i++ ) {
res->type_encodings[i] = &res->void_type; res->type_encodings[i] = &res->void_type;
} }
res->file_hash = Hash_NewTable (1024, file_get_key, file_free, 0,
pr->hashlink_freelist);
PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear); PR_Resources_Register (pr, "PR_Debug", res, pr_debug_clear);
if (!file_hash) {
file_hash = Hash_NewTable (1024, file_get_key, file_free, 0,
pr->hashlink_freelist);
}
PR_AddLoadFunc (pr, PR_LoadDebug); PR_AddLoadFunc (pr, PR_LoadDebug);
} }