Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-24 12:35:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Supporting infrastructure for global hashset

Browse source
This commit is contained in:
Justin Ethier 2020-01-25 23:44:46 -05:00
parent b838bf72a5
commit 89e9e3087f
1 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
runtime.c
View file

@ -225,6 +225,7 @@ static symbol_type __EOF = { {0}, eof_tag, ""}; // symbol_type in lieu of custo
const object Cyc_EOF = &__EOF; const object Cyc_EOF = &__EOF;
static ck_hs_t lib_table; static ck_hs_t lib_table;
static ck_hs_t symbol_table; static ck_hs_t symbol_table;
static ck_hs_t global_hs_table;
static int symbol_table_initial_size = 4096; static int symbol_table_initial_size = 4096;
static pthread_mutex_t symbol_table_lock; static pthread_mutex_t symbol_table_lock;
@ -335,6 +336,38 @@ static bool set_insert(ck_hs_t * hs, const void *value)
} }
// End hashset supporting functions // End hashset supporting functions
// New set of hashset functions that store non-relocated objects
static unsigned long hs_obj_hash(const void *object, unsigned long seed)
{
unsigned long h;
h = (unsigned long)MurmurHash64A(object, 0, seed);
return h;
}
static bool hs_obj_compare(const void *previous, const void *compare)
{
return (previous == compare);
}
static void *obj_set_get(ck_hs_t * hs, const void *value)
{
unsigned long h;
void *v;
h = CK_HS_HASH(hs, hs_obj_hash, value);
v = ck_hs_get(hs, h, value);
return v;
}
static bool obj_set_insert(ck_hs_t * hs, const void *value)
{
unsigned long h;
h = CK_HS_HASH(hs, hs_obj_hash, value);
return ck_hs_put(hs, h, value);
}
// End new hashset functions
/** /**
* @brief Perform one-time heap initializations for the program * @brief Perform one-time heap initializations for the program
* @param heap_size Unused * @param heap_size Unused
@ -355,6 +388,13 @@ void gc_init_heap(long heap_size)
fprintf(stderr, "Unable to initialize symbol table\n"); fprintf(stderr, "Unable to initialize symbol table\n");
exit(1); exit(1);
} }
if (!ck_hs_init(&global_hs_table,
CK_HS_MODE_OBJECT | CK_HS_MODE_SPMC,
hs_obj_hash, hs_obj_compare,
&my_allocator, 256, 43423)) {
fprintf(stderr, "Unable to initialize symbol table\n");
exit(1);
}
if (pthread_mutex_init(&(symbol_table_lock), NULL) != 0) { if (pthread_mutex_init(&(symbol_table_lock), NULL) != 0) {
fprintf(stderr, "Unable to initialize symbol_table_lock mutex\n"); fprintf(stderr, "Unable to initialize symbol_table_lock mutex\n");
exit(1); exit(1);
@ -490,6 +530,13 @@ void add_global(object * glo)
// Tried using a vpbuffer for this and the benchmark // Tried using a vpbuffer for this and the benchmark
// results were the same or worse. // results were the same or worse.
global_table = malloc_make_pair(mcvar(glo), global_table); global_table = malloc_make_pair(mcvar(glo), global_table);
// TODO: insert into global_hs_table. will require a symbol arg to add_global
// that matches the symbol passed to global_set
//
// pthread_mutex_lock(&symbol_table_lock); // Only 1 "writer" allowed
// set_insert(&lib_table, psym);
// pthread_mutex_unlock(&symbol_table_lock);
} }
void debug_dump_globals() void debug_dump_globals()