fix: fix zmalloc_size on macos (#2646)

* fix: fix zmalloc_size on macos --------- Signed-off-by: Roman Gershman <[email protected]> Co-authored-by: Roman Gershman <[email protected]>
dragonflydb · Feb 23, 2024 · 47171c4 · 47171c4
1 parent 3d27913
commit 47171c4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,7 +80,7 @@ jobs:
           df -h
 
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].4
 
       - name: Configure Cache Env
         uses: actions/github-script@v6

diff --git a/.github/workflows/daily-builds.yml b/.github/workflows/daily-builds.yml
@@ -37,10 +37,10 @@ jobs:
         with:
           submodules: true
       - name: Run sccache-cache
-        uses: mozilla-actions/[email protected].3
+        uses: mozilla-actions/[email protected].4
 
       - name: Configure Cache Env
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
@@ -73,10 +73,20 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+      - name: Run sccache-cache
+        uses: mozilla-actions/[email protected]
+
+      - name: Configure Cache Env
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '')
+
       - name: Install dependencies
         run: |
           brew update && brew install ninja boost openssl automake gcc zstd bison c-ares \
-              autoconf libtool automake
+              autoconf libtool automake flatbuffers
           # brew info icu4c
           mkdir -p $GITHUB_WORKSPACE/build
 
@@ -92,7 +102,8 @@ jobs:
 
 
           echo "*************************** START BUILDING **************************************"
-          CC=gcc-13 CXX=g++-13 cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja -DWITH_UNWIND=OFF
+          CC=gcc-13 CXX=g++-13 cmake .. -DCMAKE_BUILD_TYPE=Debug -GNinja -DWITH_UNWIND=OFF \
+            -DCMAKE_C_COMPILER_LAUNCHER=sccache
 
           ninja src/all
 

diff --git a/helio b/helio
diff --git a/src/redis/zmalloc.h b/src/redis/zmalloc.h
@@ -50,7 +50,11 @@
 #elif defined(__APPLE__)
 #include <malloc/malloc.h>
 #define HAVE_MALLOC_SIZE 1
+#ifdef USE_ZMALLOC_MI
+#define zmalloc_size(p) zmalloc_usable_size(p)
+#else
 #define zmalloc_size(p) malloc_size(p)
+#endif
 #define ZMALLOC_LIB "macos"
 #endif
+9 −0		base/logging.cc
+1 −2		io/CMakeLists.txt
+16 −0		io/file_test.cc
+5 −0		io/io_test.cc
+21 −7		io/proc_reader.cc
+1 −0		io/proc_reader.h
+48 −0		io/testdata/ids.txt