qmake|StringPool: Removed build option "deng_stringpoolzoneallocs"

StringPool will shortly be transitioning to de::String plus there is little benefit to allocating a pooled string from the Zone.
skyjake · Nov 7, 2012 · b65cd8e · b65cd8e
1 parent fbd9e66
commit b65cd8e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 27 deletions.
diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -27,7 +27,6 @@
 # - deng_nopackres              Do not package the Doomsday resources
 # - deng_rangecheck             Parameter range checking/value assertions
 # - deng_snowberry              (Unix) Include Snowberry in installation
-# - deng_stringpoolzoneallocs   Use the memory Zone for allocs in StringPool
 # - deng_tests                  Build and deploy the test suite
 # - deng_writertypecheck        Enable type checking in Writer/Reader
 #

diff --git a/doomsday/libdeng/include/de/stringpool.h b/doomsday/libdeng/include/de/stringpool.h
@@ -3,10 +3,6 @@
  *
  * String pool (case insensitive). @ingroup base
  *
- * @par Build Options
- * Define the macro @c DENG_STRINGPOOL_ZONE_ALLOCS to make StringPool allocate
- * memory from the memory zone instead of with system malloc().
- *
  * @author Copyright &copy; 2010-2012 Daniel Swanson <danij@dengine.net>
  * @author Copyright &copy; 2012 Jaakko Keränen <jaakko.keranen@iki.fi>
  *
@@ -28,8 +24,6 @@
 #ifndef LIBDENG_STRINGPOOL_H
 #define LIBDENG_STRINGPOOL_H
 
-//#define DENG_STRINGPOOL_ZONE_ALLOCS
-
 #ifdef __cplusplus
 #ifndef DENG2_C_API_ONLY
 

diff --git a/doomsday/libdeng/libdeng.pro b/doomsday/libdeng/libdeng.pro
@@ -46,10 +46,6 @@ deng_writertypecheck {
     DEFINES += DENG_WRITER_TYPECHECK
 }
 
-deng_stringpoolzoneallocs {
-    DEFINES += DENG_STRINGPOOL_ZONE_ALLOCS
-}
-
 # Source Files ---------------------------------------------------------------
 
 # Public headers

diff --git a/doomsday/libdeng/src/stringpool.cpp b/doomsday/libdeng/src/stringpool.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "de/memory.h"
-#include "de/memoryzone.h"
 #include "de/str.hh"
 #include "de/stringpool.h"
 #include "de/unittest.h"
@@ -38,14 +37,6 @@
 # define strdup _strdup
 #endif
 
-#ifdef DENG_STRINGPOOL_ZONE_ALLOCS
-#  define STRINGPOOL_STRDUP(x)  Z_StrDup(x)
-#  define STRINGPOOL_FREE(x)    Z_Free(x)
-#else
-#  define STRINGPOOL_STRDUP(x)  strdup(x)
-#  define STRINGPOOL_FREE(x)    M_Free(x)
-#endif
-
 /// Macro used for converting internal ids to externally visible Ids.
 #define EXPORT_ID(i)    (uint(i) + 1)
 #define IMPORT_ID(i)    (Id((i) - 1))
@@ -221,7 +212,7 @@ struct StringPool::Instance
      */
     InternalId copyAndAssignUniqueId(char const* text)
     {
-        CaselessStr* str = new CaselessStr(STRINGPOOL_STRDUP(text));
+        CaselessStr* str = new CaselessStr(strdup(text));
 
         // This is a new string that is added to the pool.
         interns.insert(str); // O(log n)
@@ -231,7 +222,7 @@ struct StringPool::Instance
 
     void destroyStr(CaselessStr* str)
     {
-        STRINGPOOL_FREE(str->toCString()); // duplicated cstring
+        M_Free(str->toCString()); // duplicated cstring
         delete str; // CaselessStr instance
     }
 
@@ -473,7 +464,7 @@ void StringPool::read(Reader* reader)
         CaselessStr* str = new CaselessStr;
         str->deserialize(reader, &text);
         // Create a copy of the string whose ownership StringPool controls.
-        str->setText(STRINGPOOL_STRDUP(Str_Text(&text)));
+        str->setText(strdup(Str_Text(&text)));
         d->interns.insert(str);
         Str_Free(&text);
 
@@ -527,10 +518,6 @@ void StringPool::print() const
 #ifdef _DEBUG
 LIBDENG_DEFINE_UNITTEST(StringPool)
 {
-#ifdef DENG_STRINGPOOL_ZONE_ALLOCS
-    return 0; // Zone is not available yet.
-#endif
-
     de::StringPool p;
     ddstring_t* s = Str_NewStd();
     ddstring_t* s2 = Str_NewStd();