Fix memory leaks in Spine caused by not calling freeStoreMemory. (coc…

…os#18018) * Fix memory leaks in Spine caused by not calling freeStoreMemory.
knoxHuang · Dec 12, 2024 · 63f8fd9 · 63f8fd9
1 parent 970e91c
commit 63f8fd9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/cocos/spine/lib/spine-core.d.ts b/cocos/spine/lib/spine-core.d.ts
@@ -1214,7 +1214,8 @@ declare namespace spine {
     class wasmUtil {
         static spineWasmInit(): void;
         static spineWasmDestroy(): void;
-        static queryStoreMemory(size: number): number;
+        static freeStoreMemory(): void;
+        static createStoreMemory(size: number): number;
         static querySpineSkeletonDataByUUID(uuid: string): SkeletonData;
         static createSpineSkeletonDataWithJson(jsonStr: string, atlasText: string): SkeletonData;
         static createSpineSkeletonDataWithBinary(byteSize: number, atlasText: string): SkeletonData;

diff --git a/cocos/spine/skeleton-data.ts b/cocos/spine/skeleton-data.ts
@@ -218,11 +218,12 @@ export class SkeletonData extends Asset {
         } else {
             const rawData = new Uint8Array(this._nativeAsset);
             const byteSize = rawData.length;
-            const ptr = spine.wasmUtil.queryStoreMemory(byteSize);
+            const ptr = spine.wasmUtil.createStoreMemory(byteSize);
             const wasmMem = spine.wasmUtil.wasm.HEAPU8.subarray(ptr, ptr + byteSize);
             wasmMem.set(rawData);
             this._skeletonCache = spine.wasmUtil.createSpineSkeletonDataWithBinary(byteSize, this._atlasText);
             spine.wasmUtil.registerSpineSkeletonDataWithUUID(this._skeletonCache, uuid);
+            spine.wasmUtil.freeStoreMemory();
         }
 
         return this._skeletonCache;

diff --git a/native/cocos/editor-support/spine-wasm/spine-type-export.cpp b/native/cocos/editor-support/spine-wasm/spine-type-export.cpp
@@ -1382,7 +1382,8 @@ EMSCRIPTEN_BINDINGS(cocos_spine) {
     class_<SpineWasmUtil>("SpineWasmUtil")
     .class_function("spineWasmInit", &SpineWasmUtil::spineWasmInit)
     .class_function("spineWasmDestroy", &SpineWasmUtil::spineWasmDestroy)
-    .class_function("queryStoreMemory", &SpineWasmUtil::queryStoreMemory)
+    .class_function("createStoreMemory", &SpineWasmUtil::createStoreMemory)
+    .class_function("freeStoreMemory", &SpineWasmUtil::freeStoreMemory)
     .class_function("querySpineSkeletonDataByUUID", &SpineWasmUtil::querySpineSkeletonDataByUUID, allow_raw_pointers())
     .class_function("createSpineSkeletonDataWithJson", &SpineWasmUtil::createSpineSkeletonDataWithJson, allow_raw_pointers())
     .class_function("createSpineSkeletonDataWithBinary", &SpineWasmUtil::createSpineSkeletonDataWithBinary, allow_raw_pointers())

diff --git a/native/cocos/editor-support/spine-wasm/spine-wasm.cpp b/native/cocos/editor-support/spine-wasm/spine-wasm.cpp
@@ -15,7 +15,6 @@ EventType SpineWasmUtil::s_currentType = EventType_Event;
 TrackEntry* SpineWasmUtil::s_currentEntry = nullptr;
 Event* SpineWasmUtil::s_currentEvent = nullptr;
 uint8_t* SpineWasmUtil::s_mem = nullptr;
-uint32_t SpineWasmUtil::s_memSize = 0;
 
 void SpineWasmUtil::spineWasmInit() {
     // LogUtil::Initialize();
@@ -95,17 +94,9 @@ void SpineWasmUtil::destroySpineSkeleton(Skeleton* skeleton) {
     }
 }
 
-uint32_t SpineWasmUtil::queryStoreMemory(uint32_t size) {
-    if (s_mem) {
-        if (s_memSize < size) {
-            delete[] s_mem;
-            s_mem = new uint8_t[size];
-            s_memSize = size;
-        }
-    } else {
-        s_mem = new uint8_t[size];
-        s_memSize = size;
-    }
+uint32_t SpineWasmUtil::createStoreMemory(uint32_t size) {
+    s_mem = new uint8_t[size];
+
     return (uint32_t)s_mem;
 }
 
@@ -114,7 +105,6 @@ void SpineWasmUtil::freeStoreMemory() {
         delete[] s_mem;
         s_mem = nullptr;
     }
-    s_memSize = 0;
 }
 
 uint32_t SpineWasmUtil::getCurrentListenerID() {

diff --git a/native/cocos/editor-support/spine-wasm/spine-wasm.h b/native/cocos/editor-support/spine-wasm/spine-wasm.h
@@ -7,7 +7,7 @@ class SpineWasmUtil {
 public:
     static void spineWasmInit();
     static void spineWasmDestroy();
-    static uint32_t queryStoreMemory(uint32_t size);
+    static uint32_t createStoreMemory(uint32_t size);
     static void freeStoreMemory();
 
     static spine::SkeletonData* querySpineSkeletonDataByUUID(const spine::String& uuid);
@@ -28,5 +28,4 @@ class SpineWasmUtil {
     static spine::Event* s_currentEvent;
 
     static uint8_t* s_mem;
-    static uint32_t s_memSize;
 };