diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-11-17 23:19:30 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2015-11-17 23:19:30 +0000 |
| commit | 47fa0bf7a2f214a580546e88e9c77cf530905d7b (patch) | |
| tree | 6868d66d911a447313cb7db511f49eacabc00b6d /amiga/font.c | |
| parent | af71481a5f4b0ddb9d5ca55187981dfe9ae2558c (diff) | |
| download | netsurf-47fa0bf7a2f214a580546e88e9c77cf530905d7b.tar.gz netsurf-47fa0bf7a2f214a580546e88e9c77cf530905d7b.tar.bz2 | |
Faster hashing
Diffstat (limited to 'amiga/font.c')
| -rw-r--r-- | amiga/font.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/amiga/font.c b/amiga/font.c index 0655a06e5..8848021b3 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 - 2013 Chris Young <chris@unsatisfactorysoftware.co.uk> + * Copyright 2008 - 2015 Chris Young <chris@unsatisfactorysoftware.co.uk> * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -53,7 +53,7 @@ #include "amiga/object.h" #include "amiga/schedule.h" #ifdef __amigaos4__ -#include <amiga/fnv/fnv.h> +#include <amiga/hash/xxhash.h> #endif #define NSA_UNICODE_FONT PLOT_FONT_FAMILY_COUNT @@ -374,12 +374,12 @@ static inline bool amiga_nsfont_split(const plot_font_style_t *fstyle, static struct ami_font_node *ami_font_open(const char *font, bool critical) { struct ami_font_node *nodedata = NULL; + uint32 hash = 0; #ifdef __amigaos4__ - Fnv32_t hash = fnv_32a_str(font, FNV1_32A_INIT); + hash = XXH32(font, strlen(font), 0); nodedata = (struct ami_font_node *)FindSkipNode(ami_font_list, (APTR)hash); #else - int hash = 0; struct nsObject *node = (struct nsObject *)FindIName((struct List *)ami_font_list, font); if(node) nodedata = node->objstruct; #endif @@ -943,7 +943,7 @@ static void ami_font_cleanup(struct SkipList *skiplist) SubTime(&curtime, &node->lastused); if(curtime.Seconds > 300) { - LOG("Freeing %ld not used for %ld seconds", node->skip_node.sn_Key, curtime.Seconds); + LOG("Freeing font %lx not used for %ld seconds", node->skip_node.sn_Key, curtime.Seconds); ami_font_close(node); RemoveSkipNode(skiplist, node->skip_node.sn_Key); } |