Merge branch 'en/strmap'

[thirdparty/git.git] / strmap.c

diff --git a/strmap.c b/strmap.c
index dc84c57c077fa50177991f9520f1a464592ee0d9..4fb9f6100eccb7b4b3bcdd18d2801cc7b979807f 100644 (file)
--- a/strmap.c
+++ b/strmap.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "strmap.h"
+#include "mem-pool.h"
 
 int cmp_strmap_entry(const void *hashmap_cmp_fn_data,
                     const struct hashmap_entry *entry1,
@@ -24,13 +25,15 @@ static struct strmap_entry *find_strmap_entry(struct strmap *map,
 
 void strmap_init(struct strmap *map)
 {
-       strmap_init_with_options(map, 1);
+       strmap_init_with_options(map, NULL, 1);
 }
 
 void strmap_init_with_options(struct strmap *map,
+                             struct mem_pool *pool,
                              int strdup_strings)
 {
        hashmap_init(&map->map, cmp_strmap_entry, NULL, 0);
+       map->pool = pool;
        map->strdup_strings = strdup_strings;
 }
 
@@ -42,6 +45,10 @@ static void strmap_free_entries_(struct strmap *map, int free_values)
        if (!map)
                return;
 
+       if (!free_values && map->pool)
+               /* Memory other than util is owned by and freed with the pool */
+               return;
+
        /*
         * We need to iterate over the hashmap entries and free
         * e->key and e->value ourselves; hashmap has no API to
@@ -52,9 +59,8 @@ static void strmap_free_entries_(struct strmap *map, int free_values)
        hashmap_for_each_entry(&map->map, &iter, e, ent) {
                if (free_values)
                        free(e->value);
-               if (map->strdup_strings)
-                       free((char*)e->key);
-               free(e);
+               if (!map->pool)
+                       free(e);
        }
 }
 
@@ -75,14 +81,25 @@ static struct strmap_entry *create_entry(struct strmap *map,
                                         void *data)
 {
        struct strmap_entry *entry;
-       const char *key = str;
 
-       entry = xmalloc(sizeof(*entry));
+       if (map->strdup_strings) {
+               if (!map->pool) {
+                       FLEXPTR_ALLOC_STR(entry, key, str);
+               } else {
+                       size_t len = st_add(strlen(str), 1); /* include NUL */
+                       entry = mem_pool_alloc(map->pool,
+                                              st_add(sizeof(*entry), len));
+                       memcpy(entry + 1, str, len);
+                       entry->key = (void *)(entry + 1);
+               }
+       } else if (!map->pool) {
+               entry = xmalloc(sizeof(*entry));
+       } else {
+               entry = mem_pool_alloc(map->pool, sizeof(*entry));
+       }
        hashmap_entry_init(&entry->ent, strhash(str));
-
-       if (map->strdup_strings)
-               key = xstrdup(str);
-       entry->key = key;
+       if (!map->strdup_strings)
+               entry->key = str;
        entry->value = data;
        return entry;
 }
@@ -128,9 +145,8 @@ void strmap_remove(struct strmap *map, const char *str, int free_value)
                return;
        if (free_value)
                free(ret->value);
-       if (map->strdup_strings)
-               free((char*)ret->key);
-       free(ret);
+       if (!map->pool)
+               free(ret);
 }
 
 void strintmap_incr(struct strintmap *map, const char *str, intptr_t amt)
@@ -143,3 +159,20 @@ void strintmap_incr(struct strintmap *map, const char *str, intptr_t amt)
        else
                strintmap_set(map, str, map->default_value + amt);
 }
+
+int strset_add(struct strset *set, const char *str)
+{
+       /*
+        * Cannot use strmap_put() because it'll return NULL in both cases:
+        *   - cannot find str: NULL means "not found"
+        *   - does find str: NULL is the value associated with str
+        */
+       struct strmap_entry *entry = find_strmap_entry(&set->map, str);
+
+       if (entry)
+               return 0;
+
+       entry = create_entry(&set->map, str, NULL);
+       hashmap_add(&set->map.map, &entry->ent);
+       return 1;
+}