Remove AppDelegate memory leak from Android projects

AppDelegate object and all its members are never released. As a solution I propose to use static unique_ptr that could destroy it at the end of the application. Issue: cocos2d#14110
hopstertv · Aug 6, 2016 · f01b7d8 · f01b7d8
1 parent 2f23ffb
commit f01b7d8
Show file tree

Hide file tree

Showing 25 changed files with 175 additions and 25 deletions.
diff --git a/templates/cpp-template-default/proj.android-studio/app/jni/hellocpp/main.cpp b/templates/cpp-template-default/proj.android-studio/app/jni/hellocpp/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp b/templates/cpp-template-default/proj.android/jni/hellocpp/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/...plate-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp b/...plate-default/frameworks/runtime-src/proj.android-studio/app/jni/hellojavascript/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/...ates/js-template-default/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp b/...ates/js-template-default/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/...lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellolua/main.cpp b/...lua-template-default/frameworks/runtime-src/proj.android-studio/app/jni/hellolua/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/hellolua/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/cpp-empty-test/proj.android-studio/app/jni/main.cpp b/tests/cpp-empty-test/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/cpp-empty-test/proj.android/jni/main.cpp b/tests/cpp-empty-test/proj.android/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/cpp-tests/proj.android-studio/app/jni/main.cpp b/tests/cpp-tests/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/cpp-tests/proj.android/jni/main.cpp b/tests/cpp-tests/proj.android/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/game-controller-test/proj.android-studio/app/jni/main.cpp b/tests/game-controller-test/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/game-controller-test/proj.android/jni/main.cpp b/tests/game-controller-test/proj.android/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/main.cpp b/tests/js-memory-gc-tests/project/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/js-memory-gc-tests/project/proj.android/jni/main.cpp b/tests/js-memory-gc-tests/project/proj.android/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/js-tests/project/proj.android-studio/app/jni/main.cpp b/tests/js-tests/project/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/js-tests/project/proj.android/jni/main.cpp b/tests/js-tests/project/proj.android/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/lua-empty-test/project/proj.android-studio/app/jni/main.cpp b/tests/lua-empty-test/project/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/lua-empty-test/project/proj.android/jni/main.cpp b/tests/lua-empty-test/project/proj.android/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/lua-game-controller-test/project/proj.android-studio/app/jni/main.cpp b/tests/lua-game-controller-test/project/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/lua-game-controller-test/project/proj.android/jni/main.cpp b/tests/lua-game-controller-test/project/proj.android/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }
diff --git a/tests/lua-tests/project/proj.android-studio/app/jni/main.cpp b/tests/lua-tests/project/proj.android-studio/app/jni/main.cpp
@@ -1,3 +1,5 @@
+#include <memory>
+
 #include <android/log.h>
 #include <jni.h>
 
@@ -6,7 +8,11 @@
 #define  LOG_TAG    "main"
 #define  LOGD(...)  __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
 
+namespace {
+std::unique_ptr<AppDelegate> appDelegate;
+}
+
 void cocos_android_app_init(JNIEnv* env) {
     LOGD("cocos_android_app_init");
-    AppDelegate *pAppDelegate = new AppDelegate();
+    appDelegate.reset(new AppDelegate());
 }