#include "chash.h"
-#define INLINE inline __attribute__((always_inline))
+
+void crehash(ctable_t *table) {
+ cResize(table, table->size);
+}
ctable_t *cCreate(unsigned int size, float loadfactor) {
ctable_t *ctable;
ctable->table = nodes;
ctable->size = size;
- ctable->mask = (size << 1)-1;
+ ctable->mask = (size << 2)-1;
ctable->numelements = 0; // Initial number of elements in the hash
ctable->loadfactor = loadfactor;
+ ctable->resize=loadfactor*size;
+ ctable->listhead=NULL;
return ctable;
}
//Store objects and their pointers into hash
-unsigned int cInsert(ctable_t *table, unsigned int key, void *val) {
+INLINE void cInsert(ctable_t *table, void * key, void *val) {
unsigned int newsize;
int index;
cnode_t *ptr, *node;
- if(table->numelements > (table->loadfactor * table->size)) {
- //Resize
- newsize = table->size << 1;
- cResize(table,newsize);
+ ptr = &table->table[(((unsigned int)key) & table->mask)>>2];
+ if (ptr->key==0) {
+ ptr->key=key;
+ ptr->val=val;
+ ptr->lnext=table->listhead;
+ table->listhead=ptr;
+ return;
}
- ptr = table->table;
+ cnode_t *tmp=malloc(sizeof(cnode_t));
+ tmp->next=ptr->next;
+ ptr->next=tmp;
+ tmp->key=key;
+ tmp->val=val;
+ tmp->lnext=table->listhead;
+ table->listhead=tmp;
+
table->numelements++;
- index =(key & table->mask)>>2;
- if(ptr[index].next == NULL && ptr[index].key == 0) { // Insert at the first position in the hashtable
- ptr[index].key = key;
- ptr[index].val = val;
- } else { // Insert in the beginning of linked list
- if ((node = calloc(1, sizeof(cnode_t))) == NULL) {
- printf("Calloc error %s, %d\n", __FILE__, __LINE__);
- return 1;
- }
- node->key = key;
- node->val = val;
- node->next = ptr[index].next;
- ptr[index].next = node;
+ if(table->numelements > table->resize) {
+ newsize = table->size << 1;
+ cResize(table,newsize);
}
- return 0;
}
// Search for an address for a given oid
-INLINE void * cSearch(ctable_t *table, unsigned int key) {
+INLINE void * cSearch(ctable_t *table, void * key) {
//REMOVE HASH FUNCTION CALL TO MAKE SURE IT IS INLINED HERE
- cnode_t *node = &table->table[(key & table->mask)>>2];
+ cnode_t *node = &table->table[(((unsigned int)key) & table->mask)>>2];
while(node != NULL) {
if(node->key == key) {
return NULL;
}
-unsigned int cRemove(ctable_t *table, unsigned int key) {
+unsigned int cRemove(ctable_t *table, void * key) {
int index;
cnode_t *curr, *prev;
cnode_t *ptr, *node;
ptr = table->table;
- index =(key & table->mask)>>2;
+ index =(((unsigned int)key) & table->mask)>>2;
curr = &ptr[index];
for (; curr != NULL; curr = curr->next) {
if (curr->key == key) { // Find a match in the hash table
table->numelements--; // Decrement the number of elements in the global hashtable
if ((curr == &ptr[index]) && (curr->next == NULL)) { // Delete the first item inside the hashtable with no linked list of cnode_t
- curr->key = 0;
- curr->val = NULL;
+ curr->key = 0;
+ curr->val = NULL;
} else if ((curr == &ptr[index]) && (curr->next != NULL)) { //Delete the first item with a linked list of cnode_t connected
- curr->key = curr->next->key;
- curr->val = curr->next->val;
- node = curr->next;
- curr->next = curr->next->next;
- free(node);
+ curr->key = curr->next->key;
+ curr->val = curr->next->val;
+ node = curr->next;
+ curr->next = curr->next->next;
+ free(node);
} else { // Regular delete from linked listed
- prev->next = curr->next;
- free(curr);
+ prev->next = curr->next;
+ free(curr);
}
return 0;
}
}
unsigned int cResize(ctable_t *table, unsigned int newsize) {
- cnode_t *node, *ptr, *curr, *next; // curr and next keep track of the current and the next chashlistnodes in a linked list
- unsigned int oldsize;
- int isfirst; // Keeps track of the first element in the chashlistnode_t for each bin in hashtable
- int i,index;
- cnode_t *newnode;
-
- ptr = table->table;
- oldsize = table->size;
-
- if((node = calloc(newsize, sizeof(cnode_t))) == NULL) {
- printf("Calloc error %s %d\n", __FILE__, __LINE__);
- return 1;
- }
+ int i;
+ cnode_t *last=NULL;
+ int mask=(newsize<<2)-1;
+ int oldsize = table->size;
+ cnode_t *ptr = table->table;
+ cnode_t * ntable=calloc(newsize, sizeof(cnode_t));
- table->table = node; //Update the global hashtable upon resize()
+ table->table = ntable;
table->size = newsize;
- table->mask = (newsize << 1)-1;
- table->numelements = 0;
-
- for(i = 0; i < oldsize; i++) { //Outer loop for each bin in hash table
- curr = &ptr[i];
- isfirst = 1;
- while (curr != NULL) { //Inner loop to go through linked lists
- if (curr->key == 0) { //Exit inner loop if there the first element for a given bin/index is NULL
- break; //key = val =0 for element if not present within the hash table
- }
- next = curr->next;
-
- index =(key & table->mask)>>2;
-#ifdef DEBUG
- printf("DEBUG(resize) -> index = %d, key = %d, val = %x\n", index, curr->key, curr->val);
-#endif
- // Insert into the new table
- if(table->table[index].next == NULL && table->table[index].key == 0) {
- table->table[index].key = curr->key;
- table->table[index].val = curr->val;
- table->numelements++;
+ table->mask = mask;
+ table->resize=newsize*table->loadfactor;
+
+ for(i = 0; i < oldsize; i++) {
+ int isfirst=1;
+ cnode_t * curr=&ptr[i];
+ if (curr->key==0)
+ continue;
+ while(curr!=NULL) {
+ cnode_t * next = curr->next;
+ int index =(((unsigned int)curr->key) & mask)>>2;
+ cnode_t * newnode=&ntable[index];
+
+ if(newnode->key==0) {
+ newnode->key=curr->key;
+ newnode->val=curr->val;
+ newnode->lnext=last;
+ last=newnode;
} else {
- if((newnode = calloc(1, sizeof(cnode_t))) == NULL) {
- printf("Calloc error %s, %d\n", __FILE__, __LINE__);
- return 1;
- }
- newnode->key = curr->key;
- newnode->val = curr->val;
- newnode->next = table->table[index].next;
- table->table[index].next = newnode;
- table->numelements++;
+ cnode_t *tmp=malloc(sizeof(cnode_t));
+ tmp->next=newnode->next;
+ newnode->next=tmp;
+ tmp->key=curr->key;
+ tmp->val=curr->val;
+ tmp->lnext=last;
+ last=tmp;
}
-
- //free the linked list of chashlistnode_t if not the first element in the hash table
- if (isfirst != 1) {
- free(curr);
+ if (isfirst) {
+ isfirst=0;
+ } else {
+ free(curr);
}
-
- isfirst = 0;
curr = next;
}
}
-
+ table->listhead=last;
free(ptr); //Free the memory of the old hash table
return 0;
}
cnode_t *ptr, *curr, *next;
ptr = ctable->table;
- for(i=0 ; i<ctable->size ; i++) {
+ for(i=0; i<ctable->size; i++) {
curr = &ptr[i];
- isFirst = 1 ;
+ isFirst = 1;
while(curr != NULL) {
next = curr->next;
if(isFirst != 1) {
- free(curr);
+ free(curr);
}
isFirst = 0;
curr = next;
projects / IRC.git / blobdiff