change resource_type trie storage

This commit is contained in:
Enno Rehling 2017-09-18 11:48:42 +02:00
parent 97dc98862b
commit c9445ab517
1 changed files with 37 additions and 19 deletions

View File

@ -60,6 +60,12 @@ static critbit_tree cb_resources;
luxury_type *luxurytypes;
potion_type *potiontypes;
#define RTYPENAMELEN 16
typedef struct rt_entry {
char key[RTYPENAMELEN];
struct resource_type *value;
} rt_entry;
static int res_changeaura(unit * u, const resource_type * rtype, int delta)
{
assert(rtype != NULL);
@ -166,13 +172,19 @@ static int num_resources;
static void rt_register(resource_type * rtype)
{
char buffer[64];
const char * name = rtype->_name;
size_t len = strlen(name);
rt_entry ent;
assert(len < sizeof(buffer) - sizeof(rtype));
len = cb_new_kv(name, len, &rtype, sizeof(rtype), buffer);
cb_insert(&cb_resources, buffer, len);
if (len > RTYPENAMELEN) {
log_error("resource names may not be longer than %d bytes: %s",
RTYPENAMELEN, name);
len = RTYPENAMELEN;
}
ent.value = rtype;
memset(ent.key, 0, RTYPENAMELEN);
memcpy(ent.key, name, len);
cb_insert(&cb_resources, &ent, sizeof(ent));
++num_resources;
}
@ -186,7 +198,6 @@ resource_type *rt_get_or_create(const char *name) {
else {
rtype->_name = strdup(name);
rt_register(rtype);
return rt_find(name);
}
}
return rtype;
@ -390,12 +401,18 @@ const potion_type *resource2potion(const resource_type * rtype)
resource_type *rt_find(const char *name)
{
void * match;
resource_type *result = 0;
size_t len = strlen(name);
if (cb_find_prefix(&cb_resources, name, strlen(name) + 1, &match, 1, 0)) {
cb_get_kv(match, &result, sizeof(result));
if (len > RTYPENAMELEN) {
log_error("resource name is longer than $d bytes: %s",
RTYPENAMELEN, name);
len = RTYPENAMELEN;
}
return result;
if (cb_find_prefix(&cb_resources, name, len, &match, 1, 0)) {
rt_entry *ent = (rt_entry *)match;
return ent->value;
}
return NULL;
}
item **i_find(item ** i, const item_type * it)
@ -792,14 +809,14 @@ int change_money(unit * u, int v)
return 0;
}
static int add_resourcename_cb(const void * match, const void * key, size_t keylen, void *data)
static int add_resourcename_cb(const void * match, const void * key,
size_t keylen, void *data)
{
struct locale * lang = (struct locale *)data;
int i = locale_index(lang);
critbit_tree * cb = rnames + i;
resource_type *rtype;
resource_type *rtype = ((rt_entry *)match)->value;
cb_get_kv(match, &rtype, sizeof(rtype));
for (i = 0; i != 2; ++i) {
char buffer[128];
const char * name = LOC(lang, resourcename(rtype, (i == 0) ? 0 : NMF_PLURAL));
@ -835,20 +852,20 @@ const resource_type *findresourcetype(const char *name, const struct locale *lan
else {
log_debug("findresourcetype: transliterate failed for '%s'\n", name);
}
return 0;
return NULL;
}
attrib_type at_showitem = {
"showitem"
};
static int add_itemname_cb(const void * match, const void * key, size_t keylen, void *data)
static int add_itemname_cb(const void * match, const void * key,
size_t keylen, void *data)
{
struct locale * lang = (struct locale *)data;
critbit_tree * cb = inames + locale_index(lang);
resource_type *rtype;
resource_type *rtype = ((rt_entry *)match)->value;
cb_get_kv(match, &rtype, sizeof(rtype));
if (rtype->itype) {
int i;
for (i = 0; i != 2; ++i) {
@ -980,9 +997,10 @@ void free_rtype(resource_type *rtype) {
free(rtype);
}
int free_rtype_cb(const void * match, const void * key, size_t keylen, void *cbdata) {
resource_type *rtype;
cb_get_kv(match, &rtype, sizeof(rtype));
static int free_rtype_cb(const void * match, const void * key,
size_t keylen, void *cbdata)
{
resource_type *rtype = ((rt_entry *)match)->value;;
free_rtype(rtype);
return 0;
}