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

Merge pull request #2668 from aliaspider/master 

(libretro-db) c_converter: more performance improvements.
This commit is contained in:
Twinaphex 2016-01-24 05:52:38 +01:00
parent 458e3a0fad 032e67bedf
commit 9561332295
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretro-db/Makefile
View File

@ -33,6 +33,7 @@ PLAIN_CONVERTER_C = \
bintree.c \ bintree.c \
query.c \ query.c \
plain_converter.c \ plain_converter.c \
$(LIBRETRO_COMMON_DIR)/hash/rhash.c \
$(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \ $(LIBRETRO_COMMON_DIR)/compat/compat_fnmatch.c \
$(LIBRETRO_COMMON_DIR)/file/retro_file.c \ $(LIBRETRO_COMMON_DIR)/file/retro_file.c \
$(LIBRETRO_COMMON_DIR)/compat/compat_strl.c $(LIBRETRO_COMMON_DIR)/compat/compat_strl.c

10
libretro-db/c_converter.c
View File

@ -7,6 +7,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <rhash.h>
#include "libretrodb.h" #include "libretrodb.h"
@ -48,6 +49,7 @@ typedef struct dat_converter_bt_node_t dat_converter_bt_node_t;
struct dat_converter_map_t struct dat_converter_map_t
{ {
const char* key; const char* key;
uint32_t hash;
dat_converter_map_enum type; dat_converter_map_enum type;
union union
{ {
@ -77,6 +79,7 @@ union dat_converter_list_item_t
struct dat_converter_bt_node_t struct dat_converter_bt_node_t
{ {
int index; int index;
uint32_t hash;
dat_converter_bt_node_t* right; dat_converter_bt_node_t* right;
dat_converter_bt_node_t* left; dat_converter_bt_node_t* left;
}; };
@ -144,7 +147,10 @@ dat_converter_bt_node_t* dat_converter_bt_node_insert(dat_converter_list_t* list
return *node; return *node;
} }
int diff = strcmp(list->values[(*node)->index].map.key, map->key); int diff = (*node)->hash - map->hash;
if(!diff)
diff = strcmp(list->values[(*node)->index].map.key, map->key);
if(diff < 0) if(diff < 0)
return dat_converter_bt_node_insert(list, &(*node)->left, map); return dat_converter_bt_node_insert(list, &(*node)->left, map);
@ -190,11 +196,13 @@ void dat_converter_list_append(dat_converter_list_t* dst, void* item)
dst->values[dst->count].map = *map; dst->values[dst->count].map = *map;
else else
{ {
map->hash = djb2_calculate(map->key);
dat_converter_bt_node_t* new_node = dat_converter_bt_node_insert(dst, &dst->bt_root, map); dat_converter_bt_node_t* new_node = dat_converter_bt_node_insert(dst, &dst->bt_root, map);
if(new_node) if(new_node)
{ {
dst->values[dst->count].map = *map; dst->values[dst->count].map = *map;
new_node->index = dst->count; new_node->index = dst->count;
new_node->hash = map->hash;
} }
else else
return; return;