avoid flush & addToNextBatch after destroy

doric-pub · Sep 12, 2023 · 790cfc4 · 790cfc4
1 parent 65a08c7
commit 790cfc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/common/dangle/DangleContext.h b/common/dangle/DangleContext.h
@@ -102,8 +102,11 @@ namespace dangle {
                     m_done = false;
 
                     addToNextBatch([&] {
-                        op();
-
+                        if (!destroy) {
+                            op();
+                        } else {
+                            DangleSysLog("addToNextBatch after DangleContext destroyed");
+                        }
                         std::unique_lock<decltype(mutex)> lock(mutex);
                         m_done = true;
                         m_done_cv.notify_all();
@@ -153,6 +156,10 @@ namespace dangle {
 
             // [GL thread] Do all the remaining work we can do on the GL thread
             void flush(void) {
+                if (destroy) {
+                    DangleSysLog("flush after DangleContext destroyed");
+                    return;
+                }
                 // Keep a copy and clear backlog to minimize lock time
                 std::vector<Batch> copy;
                 {

diff --git a/common/dangle/DanglePlatformUtils.h b/common/dangle/DanglePlatformUtils.h
@@ -26,7 +26,7 @@ namespace dangle {
 
 #ifdef DANGLE_DEBUG
 #ifdef __ANDROID__
-#define DangleSysLog(fmt, ...) __android_log_print(ANDROID_LOG_ERROR, "Dangle", fmt, ##__VA_ARGS__)
+#define DangleSysLog(fmt, ...) __android_log_print(ANDROID_LOG_ERROR, "DangleJNI", fmt, ##__VA_ARGS__)
 #endif
 #ifdef __APPLE__
 #define DangleSysLog(fmt, ...) DangleiOSLog("Dangle: " fmt, ##__VA_ARGS__)