beginnings of hashtable implementation

Author: chrisguiney

.gitignore

@@ -3,6 +3,6 @@ tests/*tests
 tests/*.dSYM/
 tests/heap_t_tests.dSYM/
 build/
-tests/tests.log
+tests/*.log
 *.o
 *xcode*

Makefile

@@ -1,4 +1,4 @@
-CFLAGS=-std=c99 -g -O2 -Wall -Wextra -fPIC -Isrc -rdynamic -DNDEBUG $(OPTFLAGS)
+CFLAGS=-std=c99 -g -O2 -Wall -Wextra -fPIC -Isrc -DNDEBUG $(OPTFLAGS)
 LIBS=-ldl -lm
 PREFIX?=/usr/local
 
@@ -48,6 +48,7 @@ clean:
 		rm -f tests/tests.log
 		find . -name "*.gc*" -exec rm {} \;
 		rm -rf `find . -name "*.dSYM" -print`
+		rm -rf `find . -name "callgrind.out.*" -print`
 
 # The Install
 install: all

include/adt.h

@@ -1,9 +1,10 @@
 //Abstract Data Type headers
 #ifndef cmsketch_adt_h
 #define cmsketch_adt_h
+#include <stdlib.h>
 #include <stdint.h>
 
 typedef int (*comparator) (void* item, void* item2);
-typedef uint32_t (*hasher) (void* key);
-
+typedef uint32_t (*hasher) (void* key, size_t item);
+typedef void (*dtor) (void* value);
 #endif

include/heap_t.h

@@ -11,11 +11,11 @@
 #include "adt.h"
 
 typedef struct {
-    comparator cmp;                                   // Comparator function
-    int size;                                         // Max size
-    int items;                                        // Items currently in heap
-    size_t item_size;                                 // Size of item
-    void **list;                                      // Array of items
+	comparator	cmp;		// Comparator function
+	int		size;		// Max size
+	int		items;		// Items currently in heap
+	size_t		item_size;	// Size of item
+	void**		list;		// Array of items
 } heap_t;
 
 heap_t* heap_create(int size, size_t type_size, comparator cmp);

include/llist_t.h

@@ -7,18 +7,23 @@
 //
 #ifndef cmsketch_llist_t_h
 #define cmsketch_llist_t_h
+
+#include "adt.h"
+
 typedef struct llist_node_t {
-	void* value;
-	struct llist_node_t* next;
+	struct llist_node_t*	next;
+	void*			value;
 } llist_node_t;
 
 typedef struct {
-	int size;
-	llist_node_t* head;
+	int		size;
+	dtor		destructor;
+	llist_node_t*	head;
 } llist_t;
 
-llist_t* llist_create();
+llist_t* llist_create(dtor destructor);
 void llist_destroy(llist_t* list);
+void* llist_node_destroy(llist_node_t* node);
 void llist_push(llist_t* list, void* item);
 void* llist_pop(llist_t* list);
 

include/map_t.h

@@ -0,0 +1,42 @@
+//
+//  map_t.h
+//  cmsketch
+//
+//  Created by Chris Guiney on 4/18/14.
+//  Copyright (c) 2014 Chris Guiney. All rights reserved.
+//
+
+#ifndef cmsketch_map_t_h
+#define cmsketch_map_t_h
+#include "adt.h"
+#include "llist_t.h"
+
+typedef struct {
+	int		num_buckets;
+	int		num_entries;
+	float		load_factor;
+	size_t		key_size;
+	hasher		hash;
+	comparator	cmp;
+	dtor		destructor;
+	llist_t**	buckets;
+} map_t;
+
+typedef struct {
+	uint32_t	hash;
+	void*		key;
+	void*		value;
+} map_entry_t;
+
+typedef struct {
+	size_t	size;
+	void*	value;
+} map_key_t;
+
+map_t* map_create(float load_factor, size_t key_size, int initial_bucket_count, comparator cmp, hasher hash, dtor destructor);
+map_t* map_create_simple(float load_factor, size_t key_size, comparator cmp, dtor destructor);
+void map_put(map_t* map, void* key, void* value);
+void* map_get(map_t* map, void* key);
+void* map_delete(map_t* map, void* key);
+
+#endif

include/sketch_t.h

@@ -10,18 +10,14 @@
 #define cmsketch_sketch_t_h
 
 typedef struct {
-    int k;        // Number of top-k items to keep track of
-    int width;    // Width of field
-    int depth;    // Depth of field
-    int *field;   // Int field -- width * depth length
-    heap_t *heap; // Heap for sorting
+	int	k;	// Number of top-k items to keep track of
+	int	width;	// Width of field
+	int	depth;	// Depth of field
+	int	*field;	// Int field -- width * depth length
+	heap_t	*heap;	// Heap for sorting
 } sketch_t;
 
-sketch_t* sketch_create(size_t data_size,
-                        double delta,
-                        double epsilon,
-                        int k,
-                        comparator cmp);
+sketch_t* sketch_create(size_t data_size, double delta, double epsilon, int k, comparator cmp);
 void sketch_destroy(sketch_t *s);
 
 #endif