qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 07:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
quakeforge/libs/ruamoko/rua_hash.c

427 lines
10 KiB
C
Raw Permalink Normal View History

add hash table api
2003-04-07 16:38:34 +00:00
/*
bi_hash.c
QuakeC hash table api
copyright date fixes
2003-04-10 16:54:12 +00:00
Copyright (C) 2003 Bill Currie
add hash table api
2003-04-07 16:38:34 +00:00
Author: Bill Currie <bill@taniwha.org>
Date: 2003/4/7
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <stdlib.h>
#include "QF/hash.h"
#include "QF/progs.h"
more rua cleanups: now just one init function to call (it calls the rest)
2004-01-16 07:03:58 +00:00
#include "rua_internal.h"
add hash table api
2003-04-07 16:38:34 +00:00
typedef struct bi_hashtab_s {
struct bi_hashtab_s *next;
struct bi_hashtab_s **prev;
progs_t *pr;
hashtab_t *tab;
[gamecode] Rename func_t to pr_func_t Even more consistency.
2022-01-18 06:32:43 +00:00
pr_func_t gk;
pr_func_t gh;
pr_func_t cmp;
pr_func_t f;
[gamecode] Clean up string_t and pointer_t They are both gone, and pr_pointer_t is now pr_ptr_t (pointer may be a little clearer than ptr, but ptr is consistent with things like intptr, and keeps the type name short).
2022-01-18 03:11:14 +00:00
pr_ptr_t ud;
add hash table api
2003-04-07 16:38:34 +00:00
} bi_hashtab_t;
typedef struct {
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
PR_RESMAP (bi_hashtab_t) table_map;
add hash table api
2003-04-07 16:38:34 +00:00
bi_hashtab_t *tabs;
} hash_resources_t;
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
static bi_hashtab_t *
table_new (hash_resources_t *res)
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
return PR_RESNEW (res->table_map);
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
}
static void
table_free (hash_resources_t *res, bi_hashtab_t *table)
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
PR_RESFREE (res->table_map, table);
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
}
static void
table_reset (hash_resources_t *res)
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
PR_RESRESET (res->table_map);
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
}
static inline bi_hashtab_t *
table_get (hash_resources_t *res, int index)
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
return PR_RESGET(res->table_map, index);
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
}
[build] Fix a pile of gcc 10 issues gcc got stricter about array accesses, complicating progs macros, and much better at detecting buffer overflows.
2020-12-20 17:12:51 +00:00
static inline int __attribute__((pure))
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
table_index (hash_resources_t *res, bi_hashtab_t *table)
{
[gamecode] Make PR_RESMAP macros more function-like I never liked that some of the macros needed the type as a parameter (yay typeof and __auto_type) or those that returned a value hid the return statement so they couldn't be used in assignments.
2021-03-21 12:26:36 +00:00
return PR_RESINDEX(res->table_map, table);
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
}
add hash table api
2003-04-07 16:38:34 +00:00
static const char *
Make hash tables more const correct. And clean up the resulting mess :/
2012-07-18 13:34:37 +00:00
bi_get_key (const void *key, void *_ht)
add hash table api
2003-04-07 16:38:34 +00:00
{
bi_hashtab_t *ht = (bi_hashtab_t *)_ht;
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
PR_PushFrame (ht->pr);
implement Raven's calling convention (rcall: first 2 params in opb and opc). should give a general speedup to most progs.
2005-06-12 09:54:01 +00:00
PR_RESET_PARAMS (ht->pr);
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
P_INT (ht->pr, 0) = (intptr_t) (key);
add hash table api
2003-04-07 16:38:34 +00:00
P_INT (ht->pr, 1) = ht->ud;
Improve handling of pr_argc It is now set to 0 when progs are loaded and every time PR_ExecuteProgram() returns. This takes care of the default case, but when setting parameters, pr_argc needs to be set correctly in case a vararg function is called.
2020-02-25 08:28:32 +00:00
ht->pr->pr_argc = 2;
add hash table api
2003-04-07 16:38:34 +00:00
PR_ExecuteProgram (ht->pr, ht->gk);
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
pr_string_t string = R_STRING (ht->pr);
PR_PopFrame (ht->pr);
return PR_GetString (ht->pr, string);
add hash table api
2003-04-07 16:38:34 +00:00
}
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
static uintptr_t
Make hash tables more const correct. And clean up the resulting mess :/
2012-07-18 13:34:37 +00:00
bi_get_hash (const void *key, void *_ht)
add hash table api
2003-04-07 16:38:34 +00:00
{
bi_hashtab_t *ht = (bi_hashtab_t *)_ht;
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
PR_PushFrame (ht->pr);
implement Raven's calling convention (rcall: first 2 params in opb and opc). should give a general speedup to most progs.
2005-06-12 09:54:01 +00:00
PR_RESET_PARAMS (ht->pr);
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
P_INT (ht->pr, 0) = (intptr_t) (key);
add hash table api
2003-04-07 16:38:34 +00:00
P_INT (ht->pr, 1) = ht->ud;
Improve handling of pr_argc It is now set to 0 when progs are loaded and every time PR_ExecuteProgram() returns. This takes care of the default case, but when setting parameters, pr_argc needs to be set correctly in case a vararg function is called.
2020-02-25 08:28:32 +00:00
ht->pr->pr_argc = 2;
add hash table api
2003-04-07 16:38:34 +00:00
PR_ExecuteProgram (ht->pr, ht->gh);
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
int hash = R_INT (ht->pr);
PR_PopFrame (ht->pr);
return hash;
add hash table api
2003-04-07 16:38:34 +00:00
}
static int
Make hash tables more const correct. And clean up the resulting mess :/
2012-07-18 13:34:37 +00:00
bi_compare (const void *key1, const void *key2, void *_ht)
add hash table api
2003-04-07 16:38:34 +00:00
{
bi_hashtab_t *ht = (bi_hashtab_t *)_ht;
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
PR_PushFrame (ht->pr);
implement Raven's calling convention (rcall: first 2 params in opb and opc). should give a general speedup to most progs.
2005-06-12 09:54:01 +00:00
PR_RESET_PARAMS (ht->pr);
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
P_INT (ht->pr, 0) = (intptr_t) (key1);
P_INT (ht->pr, 1) = (intptr_t) (key2);
add hash table api
2003-04-07 16:38:34 +00:00
P_INT (ht->pr, 2) = ht->ud;
Improve handling of pr_argc It is now set to 0 when progs are loaded and every time PR_ExecuteProgram() returns. This takes care of the default case, but when setting parameters, pr_argc needs to be set correctly in case a vararg function is called.
2020-02-25 08:28:32 +00:00
ht->pr->pr_argc = 3;
add hash table api
2003-04-07 16:38:34 +00:00
PR_ExecuteProgram (ht->pr, ht->cmp);
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
int cmp = R_INT (ht->pr);
PR_PopFrame (ht->pr);
return cmp;
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
bi_free (void *key, void *_ht)
{
bi_hashtab_t *ht = (bi_hashtab_t *)_ht;
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
PR_PushFrame (ht->pr);
implement Raven's calling convention (rcall: first 2 params in opb and opc). should give a general speedup to most progs.
2005-06-12 09:54:01 +00:00
PR_RESET_PARAMS (ht->pr);
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
P_INT (ht->pr, 0) = (intptr_t) (key);
add hash table api
2003-04-07 16:38:34 +00:00
P_INT (ht->pr, 1) = ht->ud;
Improve handling of pr_argc It is now set to 0 when progs are loaded and every time PR_ExecuteProgram() returns. This takes care of the default case, but when setting parameters, pr_argc needs to be set correctly in case a vararg function is called.
2020-02-25 08:28:32 +00:00
ht->pr->pr_argc = 2;
add hash table api
2003-04-07 16:38:34 +00:00
PR_ExecuteProgram (ht->pr, ht->f);
[ruamoko] Wrap hash table callbacks with push/pop frame Builtins that call progs with parameters now must always wrap the call to PR_ExecuteProgram so that the data stack is properly preserved across the call. I need to do an audit of all the calls to PR_ExecuteProgram.
2022-01-31 14:45:29 +00:00
PR_PopFrame (ht->pr);
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_NewTable (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
add hash table api
2003-04-07 16:38:34 +00:00
int tsize = P_INT (pr, 0);
Make hash tables more const correct. And clean up the resulting mess :/
2012-07-18 13:34:37 +00:00
const char *(*gk)(const void*,void*);
add hash table api
2003-04-07 16:38:34 +00:00
void (*f)(void*,void*);
bi_hashtab_t *ht;
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
ht = table_new (res);
add hash table api
2003-04-07 16:38:34 +00:00
ht->pr = pr;
ht->gk = P_FUNCTION (pr, 1);
ht->f = P_FUNCTION (pr, 2);
ht->ud = P_INT (pr, 3); // don't convert pointer for speed reasons
ht->next = res->tabs;
ht->prev = &res->tabs;
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
if (res->tabs)
res->tabs->prev = &ht->next;
res->tabs = ht;
add hash table api
2003-04-07 16:38:34 +00:00
gk = ht->gk ? bi_get_key : 0;
f = ht->f ? bi_free : 0;
[hash] Rename the publicly visible hashlink_t to hashctx_t I think my biggest problem with the hashlink freelist parameter was how much implementation it exposed in just the name.
2022-05-12 08:54:23 +00:00
ht->tab = Hash_NewTable (tsize, gk, f, ht, pr->hashctx);
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
R_INT (pr) = table_index (res, ht);
}
[gamecode] Pass gcc's purity test again I guess maybe that change might make a bigger difference than I thought, gcc wasn't happy with it.
2022-02-14 10:30:50 +00:00
static bi_hashtab_t * __attribute__((pure))
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
get_table (progs_t *pr, hash_resources_t *res, const char *name, int index)
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
{
bi_hashtab_t *ht = table_get (res, index);
if (!ht)
PR_RunError (pr, "invalid hash table index passed to %s", name + 3);
return ht;
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_SetHashCompare (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
Make hash tables more const correct. And clean up the resulting mess :/
2012-07-18 13:34:37 +00:00
uintptr_t (*gh)(const void*,void*);
int (*cmp)(const void*,const void*,void*);
add hash table api
2003-04-07 16:38:34 +00:00
ht->gh = P_FUNCTION (pr, 1);
ht->cmp = P_FUNCTION (pr, 2);
gh = ht->gh ? bi_get_hash : 0;
cmp = ht->cmp ? bi_compare : 0;
Hash_SetHashCompare (ht->tab, gh, cmp);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_DelTable (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
Hash_DelTable (ht->tab);
*ht->prev = ht->next;
Fix some bugs found while hacking inputlines.
2011-07-09 00:42:11 +00:00
if (ht->next)
ht->next->prev = ht->prev;
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
table_free (res, ht);
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_FlushTable (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
Hash_FlushTable (ht->tab);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_Add (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
R_INT (pr) = Hash_Add (ht->tab, (void *) (intptr_t) P_INT (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_AddElement (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
R_INT (pr) = Hash_AddElement (ht->tab, (void *) (intptr_t) P_INT (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_Find (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
R_INT (pr) = (intptr_t) Hash_Find (ht->tab, P_GSTRING (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_FindElement (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
R_INT (pr) = (intptr_t) Hash_FindElement (ht->tab,
(void *) (intptr_t) P_INT (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_FindList (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
void **list, **l;
pr_type_t *pr_list;
int count;
remove all references to OFS_* from the C code. only the macros in progs.h use them now
2003-04-22 18:20:15 +00:00
list = Hash_FindList (ht->tab, P_GSTRING (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
for (count = 1, l = list; *l; l++)
count++;
pr_list = PR_Zone_Malloc (pr, count * sizeof (pr_type_t));
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
// the hash tables stores progs pointers...
add hash table api
2003-04-07 16:38:34 +00:00
for (count = 0, l = list; *l; l++)
[gamecode] Clean up progs data access pr_type_t now contains only the one "value" field, and all the access macros now use their PACKED variant for base access, making access to larger types more consistent with the smaller types.
2022-04-26 06:10:00 +00:00
PR_PTR (ptr, &pr_list[count++]) = (intptr_t) *l;
add hash table api
2003-04-07 16:38:34 +00:00
free (list);
RETURN_POINTER (pr, pr_list);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_FindElementList (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
void **list, **l;
pr_type_t *pr_list;
int count;
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
list = Hash_FindElementList (ht->tab, (void *) (intptr_t) P_INT (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
for (count = 1, l = list; *l; l++)
count++;
pr_list = PR_Zone_Malloc (pr, count * sizeof (pr_type_t));
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
// the hash tables stores progs pointers...
add hash table api
2003-04-07 16:38:34 +00:00
for (count = 0, l = list; *l; l++)
[gamecode] Clean up progs data access pr_type_t now contains only the one "value" field, and all the access macros now use their PACKED variant for base access, making access to larger types more consistent with the smaller types.
2022-04-26 06:10:00 +00:00
PR_PTR (ptr, &pr_list[count++]) = (intptr_t) *l;
add hash table api
2003-04-07 16:38:34 +00:00
free (list);
RETURN_POINTER (pr, pr_list);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_Del (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
R_INT (pr) = (intptr_t) Hash_Del (ht->tab, P_GSTRING (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_DelElement (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
R_INT (pr) = (intptr_t) Hash_DelElement (ht->tab,
(void *) (intptr_t) P_INT (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_Free (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
64bit windows patch from phrosty
2007-04-04 07:48:14 +00:00
Hash_Free (ht->tab, (void *) (intptr_t) P_INT (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_String (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
remove all references to OFS_* from the C code. only the macros in progs.h use them now
2003-04-22 18:20:15 +00:00
R_INT (pr) = Hash_String (P_GSTRING (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_Buffer (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
remove all references to OFS_* from the C code. only the macros in progs.h use them now
2003-04-22 18:20:15 +00:00
R_INT (pr) = Hash_Buffer (P_GPOINTER (pr, 0), P_INT (pr, 1));
add hash table api
2003-04-07 16:38:34 +00:00
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_GetList (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
void **list, **l;
pr_type_t *pr_list;
int count;
list = Hash_GetList (ht->tab);
for (count = 1, l = list; *l; l++)
count++;
pr_list = PR_Zone_Malloc (pr, count * sizeof (pr_type_t));
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
// the hash tables stores progs pointers...
add hash table api
2003-04-07 16:38:34 +00:00
for (count = 0, l = list; *l; l++)
[gamecode] Clean up progs data access pr_type_t now contains only the one "value" field, and all the access macros now use their PACKED variant for base access, making access to larger types more consistent with the smaller types.
2022-04-26 06:10:00 +00:00
PR_PTR(ptr, &pr_list[count++]) = (intptr_t) *l;
add hash table api
2003-04-07 16:38:34 +00:00
free (list);
RETURN_POINTER (pr, pr_list);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_Hash_Stats (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
__auto_type res = (hash_resources_t *) _res;
bi_hashtab_t *ht = get_table (pr, res, __FUNCTION__, P_INT (pr, 0));
add hash table api
2003-04-07 16:38:34 +00:00
Hash_Stats (ht->tab);
}
static void
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
bi_hash_clear (progs_t *pr, void *_res)
add hash table api
2003-04-07 16:38:34 +00:00
{
[gamecode] Pass registered data pointer to builtins This is the bulk of the work for recording the resource pointer with with builtin data. I don't know how much of a difference it makes for most things, but it's probably pretty big for qwaq-curses due to the very high number of calls to the curses builtins. Closes #26
2022-02-14 03:28:38 +00:00
hash_resources_t *res = (hash_resources_t *) _res;
add hash table api
2003-04-07 16:38:34 +00:00
bi_hashtab_t *ht;
for (ht = res->tabs; ht; ht = ht->next)
Hash_DelTable (ht->tab);
res->tabs = 0;
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
table_reset (res);
add hash table api
2003-04-07 16:38:34 +00:00
}
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
static void
bi_hash_destroy (progs_t *pr, void *_res)
{
[gamecode] Clean up a pile of memory leaks Usually doesn't matter, but it makes it easier to evaluate valgrind's output.
2023-03-03 13:07:27 +00:00
hash_resources_t *res = _res;
PR_RESDELMAP (res->table_map);
free (res);
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
}
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
#define bi(x,np,params...) {#x, bi_##x, -1, np, {params}}
#define p(type) PR_PARAM(type)
move to using a hash table for builtin number -> builtin lookup so sparse ranges can be used efficiently. move the auto-allocated builtins to 0x10000000-0x7fffffff. should be more than enough :) use static builtin tables ("nul" terminated) instead of a series of function calls to add builtins to a vm. should be more memory efficient.
2004-01-06 05:51:09 +00:00
static builtin_t builtins[] = {
[gamecode] Provide builtins with information about their parameters This will make it possible for the engine to set up their parameter pointers when running Ruamoko progs. At this stage, it doesn't matter *too* much, except for varargs functions, because no builtin yet takes anything larger than a float quaternion, but it will be critical when double or long vec3 and vec4 values are passed.
2022-01-23 12:54:03 +00:00
bi(Hash_NewTable, 4, p(int), p(func), p(func), p(ptr)),
bi(Hash_SetHashCompare, 3, p(ptr), p(func), p(func)),
bi(Hash_DelTable, 1, p(ptr)),
bi(Hash_FlushTable, 1, p(ptr)),
bi(Hash_Add, 2, p(ptr), p(ptr)),
bi(Hash_AddElement, 2, p(ptr), p(ptr)),
bi(Hash_Find, 2, p(ptr), p(string)),
bi(Hash_FindElement, 2, p(ptr), p(ptr)),
bi(Hash_FindList, 2, p(ptr), p(string)),
bi(Hash_FindElementList, 2, p(ptr), p(ptr)),
bi(Hash_Del, 2, p(ptr), p(string)),
bi(Hash_DelElement, 2, p(ptr), p(ptr)),
bi(Hash_Free, 2, p(ptr), p(ptr)),
bi(Hash_String, 1, p(string)),
bi(Hash_Buffer, 2, p(ptr), p(int)),
bi(Hash_GetList, 1, p(ptr)),
bi(Hash_Stats, 1, p(ptr)),
move to using a hash table for builtin number -> builtin lookup so sparse ranges can be used efficiently. move the auto-allocated builtins to 0x10000000-0x7fffffff. should be more than enough :) use static builtin tables ("nul" terminated) instead of a series of function calls to add builtins to a vm. should be more memory efficient.
2004-01-06 05:51:09 +00:00
{0}
};
add hash table api
2003-04-07 16:38:34 +00:00
void
more rua cleanups: now just one init function to call (it calls the rest)
2004-01-16 07:03:58 +00:00
RUA_Hash_Init (progs_t *pr, int secure)
add hash table api
2003-04-07 16:38:34 +00:00
{
resource usage cleanup This is an imperfect revision of history.
2004-11-11 07:57:00 +00:00
hash_resources_t *res = calloc (1, sizeof (hash_resources_t));
add hash table api
2003-04-07 16:38:34 +00:00
res->tabs = 0;
[gamecode] Add PR_Shutdown for tearing down a VM This is meant for a "permanent" tear-down before freeing the memory holding the VM state or at program shutdown. As a consequence, builtin sub-systems registering resources are now required to pass a "destroy" function pointer that will be called just before the memory holding those resources is freed by the VM resource manager (ie, the manager owns the resource memory block, but each subsystem is responsible for cleaning up any resources held within that block). This even enhances thread-safety in rua_obj (there are some problems with cmd, cvar, and gib).
2022-05-12 09:23:32 +00:00
PR_Resources_Register (pr, "Hash", res, bi_hash_clear, bi_hash_destroy);
[gamecode] Add a data pointer passed to builtin functions This is part of the work for #26 (Record resource pointer with builtin function data). Currently, the data pointer gets as far as the per-instance VM function table (I don't feel like tackling the job of converting all the builtin functions tonight). All the builtin modules that register a resources data block pass that block on to PR_RegisterBuiltins.
2022-01-23 15:20:05 +00:00
PR_RegisterBuiltins (pr, builtins, res);
add hash table api
2003-04-07 16:38:34 +00:00
}
Reference in a new issue Copy permalink