Changeset a04da26a0a26ed33041c9059b44ece39727fc2a1

Timestamp:

04/25/08 11:12:30 (9 months ago)

Author:

dave <dave@…>

Parents:

0c11a534a1b97b7addf59c733a31bcbe1120fcc9

Children:

afa46936e67e892eb5c8429bd0991a4630cbd71f, ea6c371194730654bebe8dce00285a87789ce06a

git-committer:

dave <dave@06fd6eb0-0002-0410-a719-e5602cce40bc> / 2008-04-25T01:12:30Z+0000

Message:

hash.c test-coverage is 100%

Added a few extra tests to bring test coverage up to 100%

Also added FILE *temp_open(void) to testhelper.h which creates a read-write
file for testing that will be ignored by git.

git-svn-id: svn+ssh://davebalmain.com/home/dave/repos/ferret/trunk@1044 06fd6eb0-0002-0410-a719-e5602cce40bc

Location:

c

Files:

• include/global.h (modified) (1 diff)
• include/hash.h (modified) (1 diff)
• include/internal.h (modified) (2 diffs)
• src/global.c (modified) (3 diffs)
• src/hash.c (modified) (3 diffs)
• src/store.c (modified) (1 diff)
• test/test_hash.c (modified) (6 diffs)
• test/testdir/.gitignore (added)
• test/testhelper.c (modified) (1 diff)
• test/testhelper.h (modified) (1 diff)

c/include/global.h

@@ -80 +80 @@
 extern int frt_icmp(const void *p1, const void *p2);
 extern int frt_icmp_risky(const void *p1, const void *p2);
+extern void frt_strsort(char **string_array, int size);
 
 extern int frt_min2(int a, int b);

c/include/hash.h

@@ -492 +492 @@
                                             register const void *key);
 
-extern void frt_h_str_print_keys(FrtHash *ht);
+extern void frt_h_str_print_keys(FrtHash *ht, FILE *out);
+
+/**
+ * The Hash implementation actually keeps a buffer of old hash tables around
+ * for performance reasons. If you want all memory freed when your program
+ * finishes (useful if you are using valgrind) you should call this method on
+ * exit.
+ *
+ * One way to do this is to register it with atexit(). This is done for you
+ * when you call +frt_init+.
+ */
+extern void frt_hash_finalize();
 
 #endif

c/include/internal.h

@@ -537 +537 @@
 #define h_set_safe_int                          frt_h_set_safe_int
 #define h_str_print_keys                        frt_h_str_print_keys
+#define hash_finalize                           frt_hash_finalize
 #define hash_ft                                 frt_hash_ft
 #define hlp_string_diff                         frt_hlp_string_diff
@@ -893 +894 @@
 #define str_hash                                frt_str_hash
 #define strfmt                                  frt_strfmt
+#define strsort                                 frt_strsort
 #define sym_hash                                frt_sym_hash
 #define sym_len                                 frt_sym_len

c/src/global.c

@@ -1 +1 @@
 #include "global.h"
 #include "symbol.h"
+#include "hash.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -43 +44 @@
 {
     return strcmp(*(char **) p1, *(char **) p2);
+}
+
+void frt_strsort(char **str_array, int size)
+{
+    qsort(str_array, size, sizeof(char *), &scmp);
 }
 
@@ -448 +454 @@
 
     symbol_init();
-}
+
+    atexit(&hash_finalize);
+}

c/src/hash.c

@@ -243 +243 @@
         }
 
-#ifdef DEBUG
-        free(self);
-#else
         if (num_free_hts < MAX_FREE_HASH_TABLES) {
             free_hts[num_free_hts++] = self;
@@ -252 +249 @@
             free(self);
         }
-#endif
     }
 }
@@ -502 +498 @@
 }
 
-void h_str_print_keys(Hash *self)
+void h_str_print_keys(Hash *self, FILE *out)
 {
     HashEntry *he;
     int i = self->size;
-    printf("keys:\n");
+    char **keys = ALLOC_N(char *, self->size);
     for (he = self->table; i > 0; he++) {
         if (he->key && he->key != dummy_key) {        /* active entry */
-            printf("\t%s\n", (char *)he->key);
             i--;
-        }
-    }
-}
+            keys[i] = (char *)he->key;
+        }
+    }
+    strsort(keys, self->size);
+    fprintf(out, "keys:\n");
+    for (i = 0; i < self->size; i++) {
+        fprintf(out, "\t%s\n", keys[i]);
+    }
+    free(keys);
+}
+
+void hash_finalize()
+{
+    while (num_free_hts > 0) {
+        free(free_hts[--num_free_hts]);
+    }
+}

c/src/store.c

@@ -70 +70 @@
     mutex_init(&store->mutex_i, NULL);
     mutex_init(&store->mutex, NULL);
-    store->locks = hs_new(ptr_hash, ptr_eq, (free_ft)&close_lock_i);
+    store->locks = hs_new_ptr((free_ft)&close_lock_i);
     return store;
 }

c/test/test_hash.c

@@ -3 +3 @@
 #include "global.h"
 #include <stdlib.h>
+#include <unistd.h>
 #include "test.h"
+#include "testhelper.h"
 
 static int *malloc_int(int val)
@@ -12 +14 @@
 }
 
+static void mark_free(void *p)
+{
+    strcpy((char *)p, "freed");
+}
 /**
  * Basic test for string Hash. Make sure string can be retrieved
@@ -18 +24 @@
 {
     Hash *h = h_new_str(NULL, &free);
+    FILE *f;
+    char buf[100], *t;
+    memset(buf, 0, 100);
     (void)data; /* suppress unused argument warning */
 
@@ -32 +41 @@
     Apnull(h_get(h, "one"));
     Atrue(h_has_key(h, "one"));
+    h_set(h, "two", malloc_int(2));
+    h_set(h, "three", malloc_int(3));
+    h_set(h, "four", malloc_int(4));
+
+    f = temp_open();
+    h_str_print_keys(h, f);
+    fseek(f, 0, SEEK_SET);
+    fread(buf, 1, 100, f);
+    fclose(f);
+    Asequal("keys:\n\tfour\n\tone\n\tthree\n\ttwo\n", buf);
+    h_destroy(h);
+
+    /* test h_rem with allocated key */
+    strcpy(buf, "key");
+    h_new_str(&mark_free, (free_ft)NULL);
+    h_set(h, buf, "val");
+    Asequal("val", h_get(h, "key"));
+    t = (char *)h_rem(h, "key", false);
+    Asequal("val", t);
+    Asequal("key", buf);
+    h_set(h, buf, "new val");
+    Asequal("new val", h_get(h, "key"));
+    t = (char *)h_rem(h, "key", true);
+    Asequal("new val", t);
+    Asequal("freed", buf);
     h_destroy(h);
 }
@@ -122 +156 @@
     Aiequal(1, h->size);
     Atrue(h_has_key_int(h, 0));
-    h_set_int(h, 10, estrdup("ten"));
+    Assert(h_set_safe_int(h, 10, estrdup("ten")), "Not existing");
+    Assert(!h_set_safe_int(h, 10, "10"), "Won't overwrite existing");
+    Asequal("ten", h_get_int(h, 10));
     Aiequal(2, h->size);
     Atrue(h_has_key_int(h, 10));
@@ -170 +206 @@
     (void)data; /* suppress unused argument warning */
 
+    Aiequal(ptr_hash(word1), intern("one"));
+    Atrue(ptr_eq(word1, intern("one")));
     h_set(h, word1, estrdup("1"));
     h_set(h, word2, estrdup("2"));

c/test/testhelper.c

@@ -557 +557 @@
 }
 
+FILE *temp_open()
+{
+    return fopen("test/testdir/tmp", "w+");
+}

c/test/testhelper.h

@@ -21 +21 @@
 extern bool ary_includes(int *array, int size, int val);
 extern char *num_to_str(int num);
+extern FILE *temp_open();
 
 #endif