X-Git-Url: https://www.kengrimes.com/gitweb/?p=henge%2Fapc.git;a=blobdiff_plain;f=ston%2Fston_ht.h;fp=ston%2Fston_ht.h;h=fb5d5669d4b6a5e65b7d026a1b2bdccb3a18754c;hp=b17e18ecbe2fdd0bff23e10ce8a24ea5a0765560;hb=16091722cd675ef3e48a56c22fc827eb5cde352e;hpb=30e125e6bcfa71297ef4d592b0c80346f5688a1d diff --git a/ston/ston_ht.h b/ston/ston_ht.h index b17e18e..fb5d566 100644 --- a/ston/ston_ht.h +++ b/ston/ston_ht.h @@ -63,7 +63,7 @@ ston_ht ston_ht32_fread(FILE*,long,void*(*)(size_t)); typedef struct ston_ht_header_t { uint16_t ht_columns; uint8_t ht_2pow, ht_flags; -}* ston_ht; +}ston_ht_h,* ston_ht; #define STON_HT_HEADERSIZE (sizeof(struct ston_ht_header_t)) STON_FUNC @@ -79,7 +79,7 @@ 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((struct ston_ht_header_t){_COL,ston_trailing0(ston_up2pow(_N << 1)),_F},_FN)) +#define ston_ht32_new(_COL,_N,_F,_FN) (ston_ht32_create((ston_ht_h){_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) @@ -271,21 +271,22 @@ typedef struct ston_dht_header_t void* (*ht_alloc)(size_t); void (*ht_free)(void*); void** page_head; -}* ston_dht; +}ston_dht_h,* 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_dht32_create(struct ston_ht_header_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*,size_t,size_t); +STON_FUNC +ston_dht ston_dht32_free(ston_dht); -#define ston_dht32_new(_COL,_N,_F,_FN) ston_dht32_create(_COLS,ston_up2pow(_N << 1),_F,_FN) +#define ston_dht32_new(_COL,_N,_F,_ALLOC,_FREE) (ston_dht32_create((ston_ht_h){_COL,ston_trailing0(ston_up2pow(_N << 1)),_F},_ALLOC,_FREE)) #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)) @@ -306,24 +307,20 @@ void ston_dht32_free(ston_dht); */ 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*) +( struct ston_ht_header_t ht_header, + void* (*ht_alloc)(size_t), + void (*ht_free)(void*) ) -{ size_t ht_size = ht_rows * ht_columns * sizeof(uint32_t); +{ size_t ht_bytes = ston_dht32_size(&ht_header); ston_dht ht = (ston_dht) ht_alloc(STON_DHT_SIZE); 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; + { memcpy(ht, &ht_header, sizeof(ht_header)); 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) - ht_free(ht); + if ((*(ht->page_head) = ht->ht_alloc(ht_bytes)) == NULL) + if (ht_free != NULL) + ht_free(ht); } return ht; } @@ -370,7 +367,7 @@ uint32_t* ston_dht32_row page = (uint32_t**)ston_dht_pagestart(ht); goto next_row; } - if (row < row_end) + if (row + ht_cols < row_end) { row += ht_cols; goto next_row; } @@ -405,14 +402,39 @@ uint32_t ston_dht32_insert /* Free the dynamic hash table */ STON_FUNC -void ston_dht32_free +struct ston_dht_header_t* ston_dht32_free ( struct ston_dht_header_t* ht ) { void (*ht_free)(void*) = ht->ht_free; if (ht_free != NULL) { while (ht->page_head >= ston_dht_pagestart(ht)) - ht_free(ht->page_head--); + { ht_free(*(ht->page_head)); + ht->page_head--; + } ht_free(ht); + return NULL; } + return ht; +} + +/* Insert multiple values, returning the number of bytes written */ +STON_FUNC +size_t +ston_dht32_insertx +( struct ston_dht_header_t* ht, + uint32_t key, + uint32_t* data_src, + size_t start_column, + size_t units +) +{ uint32_t* data_row = ston_dht32_row(ht,key); + uint32_t* data_limit = data_row + ston_dht_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); } + #endif //_STON_HT_H_