Implemented memory pool realloc function

Author: kala13x

build.sh

@@ -15,17 +15,17 @@ TOOLS_DONE=0
 CPU_COUNT=1
 
 for arg in "$@"; do
-    if [[ $arg == --tool=* ]]; then
+    if [[ $arg == --tool=* || $arg == -m=* ]]; then
         MAKE_TOOL="${arg#*=}"
         echo "Using tool: $MAKE_TOOL"
     fi
 
-    if [[ $arg == --prefix=* ]]; then
+    if [[ $arg == --prefix=* || $arg == -p=* ]]; then
         INSTALL_PREFIX="${arg#*=}"
         echo "Using prefix: $INSTALL_PREFIX"
     fi
 
-    if [[ $arg == --ssl=* ]]; then
+    if [[ $arg == --ssl=* || $arg == -s=* ]]; then
         USE_SSL="${arg#*=}"
         echo "Using SSL: $USE_SSL"
     fi
@@ -171,24 +171,23 @@ clean_project
 build_library
 
 for arg in "$@"; do
-    if [[ $arg == "--examples" ]]; then
+    if [[ $arg == "--examples" || $arg == "-e" ]]; then
         build_examples
     fi
 
-    if [[ $arg == "--tools" ]]; then
+    if [[ $arg == "--tools" || $arg == "-t" ]]; then
         build_tools
     fi
 
-    if [[ $arg == "--install" ]]; then
+    if [[ $arg == "--install" || $arg == "-i" ]]; then
         install_library
         install_tools
     fi
 done
 
 # Do cleanup last
 for arg in "$@"; do
-    if [[ $arg == "--cleanup" ||
-          $arg == "--clean" ]]; then
+    if [[ $$arg == "--clean" || $arg == "-c" ]]; then
         clean_project
     fi
 done

misc/generate.sh

@@ -82,10 +82,6 @@ enable_crc32() {
     USE_CRC32=y
 }
 
-enable_array() {
-    USE_ARRAY=y
-}
-
 enable_list() {
     USE_LIST=y
 }
@@ -106,6 +102,11 @@ enable_xsig() {
     USE_XSIG=y
 }
 
+enable_array() {
+    USE_ARRAY=y
+    enable_pool
+}
+
 enable_md5() {
     USE_MD5=y
     enable_xstr
@@ -134,6 +135,7 @@ enable_xbuf() {
 enable_xstr() {
     USE_XSTR=y
     enable_array
+    enable_pool
 }
 
 enable_thread() {
@@ -190,6 +192,7 @@ enable_addr() {
 enable_xjson() {
     USE_XJSON=y
     enable_map
+    enable_pool
     enable_xstr
     enable_array
 }

src/sys/pool.c

@@ -95,6 +95,24 @@ void *XPool_Alloc(xpool_t *pPool, size_t nSize)
     return pRet;
 }
 
+void *XPool_Realloc(xpool_t *pPool, void *pData, size_t nDataSize, size_t nNewSize)
+{
+    XASSERT_RET(nNewSize, NULL);
+    XASSERT_RET(pPool, NULL);
+
+    void *pNew = XPool_Alloc(pPool, nNewSize);
+    if (pNew == NULL) return NULL;
+
+    if (pData != NULL && nDataSize)
+    {
+        size_t nCopySize = XSTD_MIN(nDataSize, nNewSize);
+        memcpy(pNew, pData, nCopySize);
+        XPool_Free(pPool, pData, nDataSize);
+    }
+
+    return pNew;
+}
+
 void XPool_Free(xpool_t *pPool, void *pData, size_t nSize)
 {
     XASSERT_VOID_RET(pData);
@@ -147,18 +165,7 @@ void* xrealloc(xpool_t *pPool, void *pData, size_t nDataSize, size_t nNewSize)
 {
     XASSERT_RET(nNewSize, NULL);
     if (!pPool) return realloc(pData, nNewSize);
-
-    void *pNew = XPool_Alloc(pPool, nNewSize);
-    if (pNew == NULL) return NULL;
-
-    if (pData != NULL && nDataSize)
-    {
-        size_t nCopySize = XSTD_MIN(nDataSize, nNewSize);
-        memcpy(pNew, pData, nCopySize);
-        xfreen(pPool, pData, nDataSize);
-    }
-
-    return pNew;
+    return XPool_Realloc(pPool, pData, nDataSize, nNewSize);
 }
 
 void xfree(xpool_t *pPool, void *pData)

src/sys/pool.h

@@ -39,6 +39,7 @@ void XPool_Destroy(xpool_t *pPool);
 void XPool_Reset(xpool_t *pPool);
 
 void *XPool_Alloc(xpool_t *pPool, size_t nSize);
+void *XPool_Realloc(xpool_t *pPool, void *pData, size_t nDataSize, size_t nNewSize);
 void XPool_Free(xpool_t *pPool, void *pData, size_t nSize);
 
 size_t XPool_GetSize(xpool_t *pPool);