[Bf-blender-cvs] [6d9a223c90c] master: BLI_dynstr: add memarena-based version, and helper to clear without freeing.

[Bastien Montagne]

Commit: 6d9a223c90c845b2cdf9f9d6a224e2609d25c32a
Author: Bastien Montagne
Date:   Mon Apr 24 10:42:10 2017 +0200
Branches: master
https://developer.blender.org/rB6d9a223c90c845b2cdf9f9d6a224e2609d25c32a

BLI_dynstr: add memarena-based version, and helper to clear without freeing.

===================================================================

M       source/blender/blenlib/BLI_dynstr.h
M       source/blender/blenlib/intern/BLI_dynstr.c

===================================================================

diff --git a/source/blender/blenlib/BLI_dynstr.h 
b/source/blender/blenlib/BLI_dynstr.h
index 7aa1c30e449..b26accc7f78 100644
--- a/source/blender/blenlib/BLI_dynstr.h
+++ b/source/blender/blenlib/BLI_dynstr.h
@@ -43,11 +43,14 @@
 #include "BLI_compiler_attrs.h"
 
 struct DynStr;
+struct MemArena;
 
 /** The abstract DynStr type */
 typedef struct DynStr DynStr;
 
 DynStr *BLI_dynstr_new(void) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT;
+DynStr *BLI_dynstr_new_memarena(void) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT;
+
 void    BLI_dynstr_append(DynStr *__restrict ds, const char *cstr) 
ATTR_NONNULL();
 void    BLI_dynstr_nappend(DynStr *__restrict ds, const char *cstr, int len) 
ATTR_NONNULL();
 
@@ -56,8 +59,9 @@ void    BLI_dynstr_vappendf(DynStr *__restrict ds, const char 
*__restrict format
 
 int     BLI_dynstr_get_len(DynStr *ds) ATTR_WARN_UNUSED_RESULT ATTR_NONNULL();
 char   *BLI_dynstr_get_cstring(DynStr *ds) ATTR_MALLOC ATTR_WARN_UNUSED_RESULT 
ATTR_NONNULL();
-
 void    BLI_dynstr_get_cstring_ex(DynStr *__restrict ds, char *__restrict str) 
ATTR_NONNULL();
+
+void    BLI_dynstr_clear(DynStr *ds) ATTR_NONNULL();
 void    BLI_dynstr_free(DynStr *ds) ATTR_NONNULL();
 
 #endif  /* __BLI_DYNSTR_H__ */
diff --git a/source/blender/blenlib/intern/BLI_dynstr.c 
b/source/blender/blenlib/intern/BLI_dynstr.c
index ecd4a6e6b09..bce6614beb5 100644
--- a/source/blender/blenlib/intern/BLI_dynstr.c
+++ b/source/blender/blenlib/intern/BLI_dynstr.c
@@ -35,6 +35,7 @@
 
 #include "MEM_guardedalloc.h"
 #include "BLI_utildefines.h"
+#include "BLI_memarena.h"
 #include "BLI_string.h"
 #include "BLI_dynstr.h"
 
@@ -64,6 +65,7 @@ struct DynStrElem {
 struct DynStr {
        DynStrElem *elems, *last;
        int curlen;
+       MemArena *memarena;
 };
 
 /***/
@@ -78,11 +80,32 @@ DynStr *BLI_dynstr_new(void)
        DynStr *ds = MEM_mallocN(sizeof(*ds), "DynStr");
        ds->elems = ds->last = NULL;
        ds->curlen = 0;
+       ds->memarena = NULL;
        
        return ds;
 }
 
 /**
+ * Create a new DynStr.
+ *
+ * \return Pointer to a new DynStr.
+ */
+DynStr *BLI_dynstr_new_memarena(void)
+{
+       DynStr *ds = MEM_mallocN(sizeof(*ds), "DynStr");
+       ds->elems = ds->last = NULL;
+       ds->curlen = 0;
+       ds->memarena = BLI_memarena_new(BLI_MEMARENA_STD_BUFSIZE, __func__);
+
+       return ds;
+}
+
+BLI_INLINE void *dynstr_alloc(DynStr *__restrict ds, size_t size)
+{
+       return ds->memarena ? BLI_memarena_alloc(ds->memarena, size) : 
malloc(size);
+}
+
+/**
  * Append a c-string to a DynStr.
  *
  * \param ds The DynStr to append to.
@@ -90,10 +113,10 @@ DynStr *BLI_dynstr_new(void)
  */
 void BLI_dynstr_append(DynStr *__restrict ds, const char *cstr)
 {
-       DynStrElem *dse = malloc(sizeof(*dse));
+       DynStrElem *dse = dynstr_alloc(ds, sizeof(*dse));
        int cstrlen = strlen(cstr);
        
-       dse->str = malloc(cstrlen + 1);
+       dse->str = dynstr_alloc(ds, cstrlen + 1);
        memcpy(dse->str, cstr, cstrlen + 1);
        dse->next = NULL;
        
@@ -114,10 +137,10 @@ void BLI_dynstr_append(DynStr *__restrict ds, const char 
*cstr)
  */
 void BLI_dynstr_nappend(DynStr *__restrict ds, const char *cstr, int len)
 {
-       DynStrElem *dse = malloc(sizeof(*dse));
+       DynStrElem *dse = dynstr_alloc(ds, sizeof(*dse));
        int cstrlen = BLI_strnlen(cstr, len);
 
-       dse->str = malloc(cstrlen + 1);
+       dse->str = dynstr_alloc(ds, cstrlen + 1);
        memcpy(dse->str, cstr, cstrlen);
        dse->str[cstrlen] = '\0';
        dse->next = NULL;
@@ -296,22 +319,41 @@ char *BLI_dynstr_get_cstring(DynStr *ds)
 }
 
 /**
+ * Clear the DynStr
+ *
+ * \param ds The DynStr to clear.
+ */
+void BLI_dynstr_clear(DynStr *ds)
+{
+       if (ds->memarena) {
+               BLI_memarena_clear(ds->memarena);
+       }
+       else {
+               for (DynStrElem *dse_next, *dse = ds->elems; dse; dse = 
dse_next) {
+                       dse_next = dse->next;
+
+                       free(dse->str);
+                       free(dse);
+               }
+       }
+
+       ds->elems = ds->last = NULL;
+       ds->curlen = 0;
+}
+
+/**
  * Free the DynStr
  *
  * \param ds The DynStr to free.
  */
 void BLI_dynstr_free(DynStr *ds)
 {
-       DynStrElem *dse;
-       
-       for (dse = ds->elems; dse; ) {
-               DynStrElem *n = dse->next;
-               
-               free(dse->str);
-               free(dse);
-               
-               dse = n;
+       if (ds->memarena) {
+               BLI_memarena_free(ds->memarena);
        }
-       
+       else {
+               BLI_dynstr_clear(ds);
+       }
+
        MEM_freeN(ds);
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs