From 6d676c5c33ef3aff6e2a17aa29b172e7596b48ce Mon Sep 17 00:00:00 2001 From: William Brown Date: Jan 30 2017 04:22:27 +0000 Subject: Fix queue, enable all tests --- diff --git a/src/sds/bpt/search.c b/src/sds/bpt/search.c index 29880dc..1a844fd 100644 --- a/src/sds/bpt/search.c +++ b/src/sds/bpt/search.c @@ -114,7 +114,7 @@ sds_bptree_retrieve_internal(struct sds_bptree_instance *binst, struct sds_bptre return result; } #else - sds_bptree_search_node(binst, key, root, &target_node); + sds_bptree_search_node(binst, root, key, &target_node); #endif /* Now get the key from the node. */ diff --git a/src/sds/core/utils.c b/src/sds/core/utils.c index 9a6c919..a7f1f9f 100644 --- a/src/sds/core/utils.c +++ b/src/sds/core/utils.c @@ -83,9 +83,6 @@ sds_malloc(size_t size) { sds_log("sds_malloc", "CRITICAL: Unable to allocate memory!"); exit (1); } -#ifdef DEBUG - memset(ptr, 0, size); -#endif return ptr; } @@ -108,9 +105,6 @@ sds_memalign(size_t size, size_t alignment) sds_log("sds_memalign", "CRITICAL: Unable to allocate memory!"); exit (1); } -#ifdef DEBUG - memset(ptr, 0, size); -#endif return ptr; } diff --git a/src/sds/queue/queue.c b/src/sds/queue/queue.c index d107977..5db68fd 100644 --- a/src/sds/queue/queue.c +++ b/src/sds/queue/queue.c @@ -38,6 +38,7 @@ sds_queue_enqueue(sds_queue *q, void *elem) { sds_log("sds_queue_enqueue", "Queue %p - Queueing ptr %p to %p", q, elem, node); #endif node->element = elem; + node->prev = NULL; node->next = q->tail; if (q->tail != NULL) { q->tail->prev = node; diff --git a/test/test_sds.c b/test/test_sds.c index 4cdc525..276d3d5 100644 --- a/test/test_sds.c +++ b/test/test_sds.c @@ -11,12 +11,12 @@ int main ( int argc __attribute__((unused)), char **argv __attribute__((unused))) { int result = 0; - // result += run_bpt_tests(); - // result += run_set_tests(); + result += run_bpt_tests(); + result += run_set_tests(); result += run_cow_tests(); - // result += run_queue_tests(); - // result += run_tqueue_tests(); - // result += run_lqueue_tests(); + result += run_queue_tests(); + result += run_tqueue_tests(); + result += run_lqueue_tests(); return result; }