qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make pr_obcode.c mostly thread safe

Browse source 
Its public data is all read-only, and once set up, its private data is
too (just don't call init in multiple threads).
This commit is contained in:
Bill Currie 2020-02-26 01:20:28 +09:00
parent f185e07ad2
commit 35c9d6ee38
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/QF/pr_comp.h
View file

@ -50,8 +50,8 @@ typedef enum {
ev_type_count // not a type, gives number of types
} etype_t;
extern pr_ushort_t pr_type_size[ev_type_count];
extern const char *pr_type_name[ev_type_count];
extern const pr_ushort_t pr_type_size[ev_type_count];
extern const char * const pr_type_name[ev_type_count];
#define OFS_NULL 0
#define OFS_RETURN 1
@ -407,7 +407,7 @@ typedef struct opcode_s {
const char *fmt;
} opcode_t;
extern opcode_t pr_opcodes[];
extern const opcode_t pr_opcodes[];
opcode_t *PR_Opcode (pr_short_t opcode);
void PR_Opcode_Init (void); // idempotent

12
libs/gamecode/pr_opcode.c
View file

@ -46,9 +46,9 @@
#include "compat.h"
hashtab_t *opcode_table;
static hashtab_t *opcode_table;
VISIBLE pr_ushort_t pr_type_size[ev_type_count] = {
VISIBLE const pr_ushort_t pr_type_size[ev_type_count] = {
1, // ev_void
1, // ev_string
1, // ev_float
@ -65,7 +65,7 @@ VISIBLE pr_ushort_t pr_type_size[ev_type_count] = {
0, // ev_invalid not a valid/simple type
};
VISIBLE const char *pr_type_name[ev_type_count] = {
VISIBLE const char * const pr_type_name[ev_type_count] = {
"void",
"string",
"float",
@ -98,7 +98,7 @@ VISIBLE const char *pr_type_name[ev_type_count] = {
// c operand c
// x place holder for P (padding)
// 0-7 parameter index (for P)
VISIBLE opcode_t pr_opcodes[] = {
VISIBLE const opcode_t pr_opcodes[] = {
{"<DONE>", "done", OP_DONE, false, // OP_DONE is actually the same as
ev_entity, ev_field, ev_void, // OP_RETURN, the types are bogus
PROG_ID_VERSION,
@ -1492,7 +1492,7 @@ PR_Opcode (pr_short_t opcode)
VISIBLE void
PR_Opcode_Init (void)
{
opcode_t *op;
const opcode_t *op;
if (opcode_table) {
// already initialized
@ -1502,7 +1502,7 @@ PR_Opcode_Init (void)
Hash_SetHashCompare (opcode_table, opcode_get_hash, opcode_compare);
for (op = pr_opcodes; op->name; op++) {
Hash_AddElement (opcode_table, op);
Hash_AddElement (opcode_table, (void *) op);
}
}

3
tools/qfcc/source/opcodes.c
View file

@ -131,7 +131,8 @@ opcode_free (void *_op, void *unused)
void
opcode_init (void)
{
opcode_t *op, *mop;
const opcode_t *op;
opcode_t *mop;
if (opcode_type_table) {
Hash_FlushTable (opcode_void_table);