ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(libretro-db) c_converter: use a hash based lookup in get_match_key.

This commit is contained in:
aliaspider 2016-01-25 03:12:48 +01:00
parent d53a0c5994
commit a0d2272e88
1 changed files with 90 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
libretro-db/c_converter.c
View File

@ -11,7 +11,7 @@
#include "libretrodb.h"
void dat_converter_exit(int rc)
static void dat_converter_exit(int rc)
{
fflush(stdout);
exit(rc);
@ -84,13 +84,13 @@ struct dat_converter_bt_node_t
dat_converter_bt_node_t* left;
};
int dat_converter_cmp_func(const void *a, const void *b, void *ctx)
static int dat_converter_cmp_func(const void* a, const void* b, void* ctx)
{
return strcmp(a, b);
}
dat_converter_list_t* dat_converter_list_create(dat_converter_list_enum type)
static dat_converter_list_t* dat_converter_list_create(dat_converter_list_enum type)
{
dat_converter_list_t* list = malloc(sizeof(*list));
list->type = type;
@ -101,7 +101,7 @@ dat_converter_list_t* dat_converter_list_create(dat_converter_list_enum type)
return list;
}
void dat_converter_bt_node_free(dat_converter_bt_node_t* node)
static void dat_converter_bt_node_free(dat_converter_bt_node_t* node)
{
if (!node)
return;
@ -110,7 +110,7 @@ void dat_converter_bt_node_free(dat_converter_bt_node_t* node)
free(node);
}
void dat_converter_list_free(dat_converter_list_t* list)
static void dat_converter_list_free(dat_converter_list_t* list)
{
if (!list)
return;
@ -136,7 +136,8 @@ void dat_converter_list_free(dat_converter_list_t* list)
free(list);
}
dat_converter_bt_node_t* dat_converter_bt_node_insert(dat_converter_list_t* list, dat_converter_bt_node_t** node, dat_converter_map_t* map)
static dat_converter_bt_node_t* dat_converter_bt_node_insert(dat_converter_list_t* list, dat_converter_bt_node_t** node,
dat_converter_map_t* map)
{
assert(map->key);
assert(list->type == DAT_CONVERTER_MAP_LIST);
@ -168,7 +169,7 @@ dat_converter_bt_node_t* dat_converter_bt_node_insert(dat_converter_list_t* list
}
void dat_converter_list_append(dat_converter_list_t* dst, void* item)
static void dat_converter_list_append(dat_converter_list_t* dst, void* item)
{
if (dst->count == dst->capacity)
{
@ -221,7 +222,7 @@ void dat_converter_list_append(dat_converter_list_t* dst, void* item)
dst->count++;
}
dat_converter_list_t* dat_converter_lexer(char* src, const char* dat_path)
static dat_converter_list_t* dat_converter_lexer(char* src, const char* dat_path)
{
@ -286,7 +287,7 @@ dat_converter_list_t* dat_converter_lexer(char* src, const char* dat_path)
return token_list;
}
dat_converter_list_t* dat_parser_table(dat_converter_list_item_t** start_token)
static dat_converter_list_t* dat_parser_table(dat_converter_list_item_t** start_token)
{
dat_converter_list_t* parsed_table = dat_converter_list_create(DAT_CONVERTER_MAP_LIST);
dat_converter_map_t map = {0};
@ -356,52 +357,43 @@ dat_converter_list_t* dat_parser_table(dat_converter_list_item_t** start_token)
return NULL;
}
const char* dat_converter_get_match_key(dat_converter_list_t* list, const char* match_key)
typedef struct dat_converter_match_key_t dat_converter_match_key_t;
struct dat_converter_match_key_t
{
char* value;
uint32_t hash;
dat_converter_match_key_t* next;
};
static const char* dat_converter_get_match_key(dat_converter_list_t* list, dat_converter_match_key_t* match_key)
{
int i;
const char* res;
char* key;
char* dot;
assert(match_key);
if (list->type != DAT_CONVERTER_MAP_LIST)
return NULL;
key = strdup(match_key);
dot = strchr(key, '.');
for (i = 0; i < list->count; i++)
{
if(list->values[i].map.hash == match_key->hash)
{
assert(!strcmp(list->values[i].map.key, match_key->value));
if (dot)
{
*dot = '\0';
for (i = 0; i < list->count; i++)
if (!strcmp(list->values[i].map.key, key))
{
if (list->values[i].map.type == DAT_CONVERTER_LIST_MAP)
{
res = dat_converter_get_match_key(list->values[i].map.value.list, dot + 1);
free(key);
return res;
}
break;
}
}
else
{
for (i = 0; i < list->count; i++)
if (!strcmp(list->values[i].map.key, key))
{
if ((list->values[i].map.type == DAT_CONVERTER_STRING_MAP))
{
free(key);
if(match_key->next)
return dat_converter_get_match_key(list->values[i].map.value.list, match_key->next);
else if ((list->values[i].map.type == DAT_CONVERTER_STRING_MAP))
return list->values[i].map.value.string;
}
break;
}
}
else
return NULL;
}
}
return NULL;
}
dat_converter_list_t* dat_converter_parser(dat_converter_list_t* target, dat_converter_list_t* lexer_list, const char* match_key)
static dat_converter_list_t* dat_converter_parser(dat_converter_list_t* target, dat_converter_list_t* lexer_list,
dat_converter_match_key_t* match_key)
{
bool skip = true;
dat_converter_list_item_t* current = lexer_list->values;
@ -442,7 +434,13 @@ dat_converter_list_t* dat_converter_parser(dat_converter_list_t* target, dat_con
map.key = dat_converter_get_match_key(map.value.list, match_key);
if (!map.key)
{
printf("missing match key '%s' in one of the entries\n", match_key);
printf("missing match key '");
while(match_key->next)
{
printf("%s.", match_key->value);
match_key = match_key->next;
}
printf("%s' in one of the entries\n", match_key->value);
dat_converter_exit(1);
}
}
@ -675,7 +673,7 @@ static int value_provider(dat_converter_list_item_t** current_item, struct rmsgp
int main(int argc, char** argv)
{
const char* rdb_path;
const char* match_key = NULL;
dat_converter_match_key_t* match_key = NULL;
RFILE* rdb_file;
if (argc < 2)
@ -690,9 +688,31 @@ int main(int argc, char** argv)
argc--;
argv++;
if (argc > 1)
if (argc > 1 && **argv)
{
match_key = *argv;
dat_converter_match_key_t* current_mk;
char* dot;
match_key = malloc(sizeof(*match_key));
match_key->value = strdup(*argv);
match_key->next = NULL;
current_mk = match_key;
dot = match_key->value;
while (*dot++)
{
if (*dot == '.')
{
*dot++ = '\0';
current_mk->hash = djb2_calculate(current_mk->value);
current_mk->next = malloc(sizeof(*match_key));
current_mk = current_mk->next;
current_mk->value = dot;
current_mk->next = NULL;
}
}
current_mk->hash = djb2_calculate(current_mk->value);
argc--;
argv++;
}
@ -755,6 +775,16 @@ int main(int argc, char** argv)
free(dat_buffers[dat_count]);
free(dat_buffers);
if(match_key)
free(match_key->value);
while(match_key)
{
dat_converter_match_key_t* next = match_key->next;
free(match_key);
match_key = next;
}
return 0;
}