X-Git-Url: https://git.kengrimes.com/?p=henge%2Fapc.git;a=blobdiff_plain;f=ston%2Fston_ht.h;h=e97a589f3cc8eb7c8b8a9eac48c522f34a51fd03;hp=11454b3dd5eefbc97d84667c31a5c37e048c8c8a;hb=20b718e416aaa44d1faa31b6370263affa4dc1df;hpb=b0013aa7f2237fb88daf3f2ba856c8cdfe222fa2 diff --git a/ston/ston_ht.h b/ston/ston_ht.h index 11454b3..e97a589 100644 --- a/ston/ston_ht.h +++ b/ston/ston_ht.h @@ -47,7 +47,6 @@ #endif //STON_FUNC #ifdef STON_HT_FREAD #include -#include //memcpy #include #include STON_FUNC_STATIC @@ -57,30 +56,34 @@ ston_ht ston_ht32_fread(FILE*,long,void*(*)(size_t)); #include #endif //STON_HT_FREAD #include +#include //mem* /* STON Hashtable Structure Hashtables are stored as dynamically sized two dimensional arrays */ typedef struct ston_ht_header_t { uint16_t ht_columns; uint8_t ht_2pow, ht_flags; -}* ston_ht; +}ston_ht_h,* ston_ht; STON_FUNC -size_t ston_up2pow(size_t); +uint32_t ston_up2pow(uint32_t); STON_FUNC -ston_ht ston_ht32_create(uint16_t,size_t,uint8_t,void*(*)(size_t)); +uint8_t ston_trailing0(uint32_t); +STON_FUNC +ston_ht ston_ht32_create(uint16_t,uint8_t,uint8_t,void*(*)(size_t)); STON_FUNC uint32_t* ston_ht32_row(ston_ht,uint32_t); STON_FUNC uint32_t ston_ht32_insert(ston_ht,uint32_t,uint16_t,uint32_t); +STON_FUNC +size_t ston_ht32_insertx(ston_ht,uint32_t,uint32_t*,size_t,size_t); -#define ston_ht32_new(_COL,_N,_F,_FN) ston_ht32_create(_COL,ston_up2pow(_N << 1),_F,_FN) -#define ston_ht32_entry(_HT,_KEY,_COL) (ston_ht32_row(_HT,_KEY) + _COL) -#define ston_ht32_insertx(_HT,_KEY,_COL,_VAL) *ston_ht32_entry(_HT,_KEY,_COL) = _VAL +#define ston_ht32_new(_COL,_N,_F,_FN) (ston_ht32_create(_COL,ston_trailing0(ston_up2pow(_N << 1)),_F,_FN)) +#define ston_ht32_entry(_HT,_KEY,_COL) (ston_ht32_row(_HT,_KEY) + _COL) #define ston_ht_size(_HT) ((_HT)->ht_columns << (_HT)->ht_2pow) #define ston_ht_rows(_HT) (0x1 << (_HT)->ht_2pow) #define ston_ht_cols(_HT) ((_HT)->ht_columns) -#define ston_ht_start(_HT) (((uint8_t*)(_HT)) + sizeof(*(_HT))) +#define ston_ht_start(_HT) ((uint8_t*)((_HT) + 1)) #define ston_ht_keyrow(_HT,_KEY) ((_KEY) & (ston_ht_rows(ht) - 1)) #define ston_ht32_start(_HT) ((uint32_t*)ston_ht_start(_HT)) #define ston_ht32_end(_HT) (ston_ht32_start(_HT) + ston_ht_size(_HT)) @@ -88,8 +91,8 @@ uint32_t ston_ht32_insert(ston_ht,uint32_t,uint16_t,uint32_t); /** @see http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 */ STON_FUNC -size_t ston_up2pow -( size_t val ) +uint32_t ston_up2pow +( uint32_t val ) { val = (val << 1) - 1; val |= val >> 1; val |= val >> 2; @@ -99,6 +102,21 @@ size_t ston_up2pow return ++val; } +/** @see https://graphics.stanford.edu/~seander/bithacks.html#ZerosOnRightParallel */ +STON_FUNC +uint8_t ston_trailing0 +( uint32_t v ) +{ uint8_t c = 32; + v &= -(int32_t)v; + if (v) c--; + if (v & 0x0000FFFF) c -= 16; + if (v & 0x00FF00FF) c -= 8; + if (v & 0x0F0F0F0F) c -= 4; + if (v & 0x33333333) c -= 2; + if (v & 0x55555555) c -= 1; + return c; +} + /* Creates a new hash table, provided a memory allocation function that takes a single size_t bytes, a column count, and a row count which determines the size of the table. @@ -111,17 +129,17 @@ size_t ston_up2pow STON_FUNC ston_ht ston_ht32_create ( uint16_t ht_columns, - size_t ht_rows, + uint8_t ht_2pow, uint8_t ht_flags, void* (*alloc_fn)(size_t) ) -{ size_t ht_size = ht_rows * ht_columns * sizeof(uint32_t); - ston_ht ht = (ston_ht) alloc_fn(sizeof(struct ston_ht_header_t) + ht_size); +{ size_t ht_bytes = (ht_columns << ht_2pow) * sizeof(uint32_t); + ston_ht ht = (ston_ht) alloc_fn(sizeof(ston_ht_h) + ht_bytes); if (ht != NULL) - { for (ht->ht_2pow = 0; ht_size; ht->ht_2pow++) - ht_size = ht_size >> 1; - ht->ht_columns = ht_columns; + { ht->ht_columns = ht_columns; + ht->ht_2pow = ht_2pow; ht->ht_flags = ht_flags; + memset(ht + 1, 0, ht_bytes); } return ht; } @@ -132,8 +150,6 @@ ston_ht ston_ht32_create entire structure is verified, and all file operations are finished. Returns NULL with properly set errno on failure. */ -STON_FUNC_STATIC -STON_FUNC_NOINLINE ston_ht ston_ht32_fread ( FILE* file, long fpos, @@ -193,7 +209,7 @@ uint32_t* ston_ht32_row populated: if (row[0] == key) goto write_position; - if (row < row_end) + if (row + ht_cols < row_end) row += ht_cols; else if (looped) return NULL; @@ -220,6 +236,30 @@ uint32_t ston_ht32_insert return old_value; } +/* Inserts a row of units into a hashtable, starting with the specified column. + Returns the number of elements that were written. This function will not + overflow internal buffers, but will return a short count (lower than the + provided 'units') when truncation of source data occurs. */ +STON_FUNC +size_t +ston_ht32_insertx +( struct ston_ht_header_t* ht, + uint32_t key, + uint32_t* data_src, + size_t start_column, + size_t units +) +{ uint32_t* data_row = ston_ht32_row(ht,key); + uint32_t* data_limit = data_row + ston_ht_cols(ht); + uint32_t* data_trg = data_row + start_column; + if (data_row == NULL) + return 0; + while (units-- && data_trg < data_limit) + *data_trg++ = *data_src++; + return (size_t)(data_trg - data_row); +} + + #ifndef STON_DHT_SIZE #define STON_DHT_SIZE 4096 #endif @@ -229,64 +269,63 @@ uint32_t ston_ht32_insert external allocation. */ typedef struct ston_dht_header_t -{ uint16_t ht_columns; - uint8_t ht_2pow, ht_flags; - void* (*ht_alloc)(size_t); - void (*ht_free)(void*); - void** page_head; +{ uint16_t columns; + uint8_t unit_bytes; + uint8_t start_depth; +}ston_dht_h; + +typedef struct ston_dht_t +{ ston_dht_h header; + void* pages[sizeof(void*) * 8]; + void* (*ht_alloc)(size_t); + void (*ht_free)(void*); }* ston_dht; -#define STON_DHT_HEADERSIZE (sizeof(struct ston_dht_header_t)) STON_FUNC -ston_dht ston_dht32_create(uint16_t,size_t,uint8_t,void*(*)(size_t),void(*)(void*)); +ston_dht ston_dht_create(uint16_t,uint8_t,uint8_t,void*(*)(size_t),void(*)(void*)); STON_FUNC uint32_t* ston_dht32_row(ston_dht,uint32_t); STON_FUNC uint32_t ston_dht32_insert(ston_dht,uint32_t,uint16_t,uint32_t); STON_FUNC -void ston_dht32_free(ston_dht); +size_t ston_dht32_insertx(ston_dht,uint32_t,uint32_t*,uint16_t,size_t); +STON_FUNC +ston_dht ston_dht_free(ston_dht); + +#define ston_dht_units(_HT,_DEPTH) ((_HT)->header.columns << _DEPTH) +#define ston_dht_bytes(_HT,_DEPTH) (ston_dht_units(_HT,_DEPTH) * (_HT)->header.unit_bytes) +#define ston_dht_new(_COL,_ALOC,_FRE) (ston_dht_create(_COL,3,sizeof(int),_ALOC,_FRE)) +#define ston_dht_sized(_COL,_N,_ALOC,_FRE) (ston_dht_create(_COL,ston_trailing0(ston_up2pow(_N),sizeof(int),_ALOC,_FRE))) +#define ston_dht32_entry(_HT,_KEY,_COL) (ston_dht32_row(_HT,_KEY) + _COL) +#define ston_dht32_new(_COL,_ALOC,_FRE) (ston_dht_create(_COL,0,sizeof(uint32_t),_ALOC,_FRE)) +#define ston_dht32_sized(_COL,_N,_ALOC,_FRE) (ston_dht_create(_COL,ston_trailing0(ston_up2pow(_N)),sizeof(uint32_t),_ALOC,_FRE)) -#define ston_dht32_new(_COL,_N,_F,_FN) ston_dht32_create(_COLS,ston_up2pow(_N << 1),_F,_FN) -#define ston_dht32_entry(_HT,_KEY,_COL) (ston_dht32_row(_HT,_KEY) + _COL) -#define ston_dht32_insertx(_HT,_KEY,_COL,_VAL) *ston_dht32_col(_HT,_KEY,_COL) = _VAL -#define ston_dht_size(_HT) (ston_ht_size(_HT)) -#define ston_dht_rows(_HT) (ston_ht_rows(_HT)) -#define ston_dht_cols(_HT) (ston_ht_cols(_HT)) -#define ston_dht_keyrow(_HT,_KEY) (ston_ht_keyrow(_HT,_KEY)) -#define ston_dht_pagestart(_HT) ((void**)(((uint8_t*)(_HT)) + STON_DHT_HEADERSIZE)) -#define ston_dht_pagehead(_HT) ((_HT)->page_head) -#define ston_dht_pagemax(_HT) ((void**)((uint8_t*)(_HT) + STON_DHT_SIZE - sizeof(void**))) -#define ston_dht_start(_HT,_DEPTH) ((uint8_t*)*(ston_dht_pagestart(_HT) + _DEPTH)) -#define ston_dht32_start(_HT,_DEPTH) ((uint32_t*)ston_dht_start(_HT,_DEPTH)) -#define ston_dht32_end(_HT,_DEPTH) (ston_ht32_start(_HT,_DEPTH) + ston_ht_size(_HT)) -#define ston_dht32_size(_HT) (ston_dht_size(_HT) * sizeof(uint32_t)) -#define ston_dht32_pagepush(_HT) ((*(++((_HT)->page_head)) = (_HT)->ht_alloc(ston_dht32_size(_HT)))) -#define ston_dht32_pagepop(_HT) ((_HT)->ht_free((_HT)->page_head--)) /* Creates a new bucketted hash table, provided a memory allocation function that takes a single size_t bytes, a memory free function, a column count, and a row count which determines the size of the buckets. */ STON_FUNC -ston_dht ston_dht32_create -( uint16_t ht_columns, - size_t ht_rows, - uint8_t ht_flags, - void* (*ht_alloc)(size_t), - void (*ht_free)(void*) +ston_dht ston_dht_create +( uint16_t columns, + uint8_t start_depth, + uint8_t unit_bytes, + void* (*ht_alloc)(size_t), + void (*ht_free)(void*) ) -{ size_t ht_size = ht_rows * ht_columns * sizeof(uint32_t); - ston_dht ht = (ston_dht) ht_alloc(STON_DHT_SIZE); +{ ston_dht ht = (ston_dht) ht_alloc(sizeof(struct ston_dht_t)); if (ht != NULL) - { for (ht->ht_2pow = 0; ht_size; ht->ht_2pow++) - ht_size = ht_size >> 1; - ht->ht_columns = ht_columns; - ht->ht_flags = ht_flags; + { ht->header.columns = columns; + ht->header.start_depth = start_depth; + ht->header.unit_bytes = unit_bytes; + memset(ht->pages, 0, sizeof(void*) * sizeof(void*) * 8); + ht->pages[start_depth] = ht_alloc(ston_dht_bytes(ht, start_depth)); ht->ht_alloc = ht_alloc; ht->ht_free = ht_free; - ht->page_head = ston_dht_pagestart(ht); - if ((*(ht->page_head) = ht->ht_alloc(ston_dht_size(ht))) == NULL) + if (ht->pages[start_depth] == NULL && ht_free != NULL) ht_free(ht); + else + memset(ht->pages[start_depth], 0, ston_dht_bytes(ht, start_depth)); } return ht; } @@ -296,68 +335,42 @@ ston_dht ston_dht32_create */ STON_FUNC uint32_t* ston_dht32_row -( struct ston_dht_header_t* ht, - uint32_t key +( struct ston_dht_t* ht, + uint32_t key ) -{ uint16_t ht_cols = ston_dht_cols(ht); - size_t row_number = ston_dht_keyrow(ht,key); - uint32_t** page = (uint32_t**)ston_dht_pagestart(ht); - uint32_t** pagemax = (uint32_t**)ston_dht_pagemax(ht); - uint8_t loop_x = 0; - uint8_t loop_y = 0; - uint32_t* row,* row_end; +{ uint16_t columns = ht->header.columns; + uint8_t depth = ht->header.start_depth; + uint32_t mask = ((0x1 << depth) - 1) >> 1; + void* page; + uint32_t* row; + uint32_t row_key; next_page: - row = *page + (row_number * ht_cols); - row_end = *page + (ston_dht_size(ht) - 1); - next_row: - if (row[0] != 0) - goto populated; - write_position: - row[0] = key; - return row; - populated: - if (row[0] == key) - goto write_position; - if (!loop_x) - { if (page < pagemax) - { if (page == (uint32_t**)ston_dht_pagehead(ht)) - if (ston_dht32_pagepush(ht) == NULL) - { ston_dht32_free(ht); - return NULL; - } - ++page; - goto next_row; - } - loop_x = 1; - row_number = (row_number + 1) % ston_dht_rows(ht); - page = (uint32_t**)ston_dht_pagestart(ht); - goto next_row; - } - if (row < row_end) - { row += ht_cols; - goto next_row; + if (ht->pages[depth] == NULL) + { ht->pages[depth] = ht->ht_alloc(ston_dht_bytes(ht, depth)); + if (ht->pages[depth] == NULL) + return NULL; + memset(ht->pages[depth], 0, ston_dht_bytes(ht, depth)); } - else if (!loop_y) - { loop_y = 1; - row = *page; - goto next_row; + page = ht->pages[depth]; + row = (uint32_t*)page + ((key & mask) * columns); + row_key = *row; + if (row_key == key || row_key == 0) + { row[0] = key; + return row; } - if (page < pagemax) - { loop_y = 0; - page++; - goto next_page; - } - return NULL; + depth++; + mask = (mask << 1) | 0x1; + goto next_page; } /* Inserts a value into a hashtable at the specified column, returning the previous value */ STON_FUNC uint32_t ston_dht32_insert -( struct ston_dht_header_t* ht, - uint32_t key, - uint16_t column, - uint32_t value +( struct ston_dht_t* ht, + uint32_t key, + uint16_t column, + uint32_t value ) { uint32_t* value_location, old_value; value_location = ston_dht32_entry(ht,key,column); @@ -366,16 +379,41 @@ uint32_t ston_dht32_insert return old_value; } +/* Insert multiple values, returning the number of bytes written */ +STON_FUNC +size_t +ston_dht32_insertx +( struct ston_dht_t* ht, + uint32_t key, + uint32_t* data_src, + uint16_t start_column, + size_t units +) +{ uint32_t* data_row = ston_dht32_row(ht,key); + uint32_t* data_limit = data_row + ht->header.columns; + uint32_t* data_trg = data_row + start_column; + if (data_row == NULL) + return 0; + while (units-- && data_trg < data_limit) + *data_trg++ = *data_src++; + return (size_t)(data_trg - data_row); +} + /* Free the dynamic hash table */ STON_FUNC -void ston_dht32_free -( struct ston_dht_header_t* ht ) +struct ston_dht_t* ston_dht_free +( struct ston_dht_t* ht ) { void (*ht_free)(void*) = ht->ht_free; + uint8_t depth = ht->header.start_depth; + void** pages = ht->pages; if (ht_free != NULL) - { while (ht->page_head >= ston_dht_pagestart(ht)) - ht_free(ht->page_head--); + { while (pages[depth] != NULL) + ht_free(pages[depth++]); ht_free(ht); + return NULL; } + return ht; } + #endif //_STON_HT_H_