修复析构函数调用时机

pqpo · Jul 18, 2018 · cad9ad0 · cad9ad0
1 parent e4f4050
commit cad9ad0
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 7 deletions.
diff --git a/jniLibs/armeabi-v7a/liblog4a-lib.so b/jniLibs/armeabi-v7a/liblog4a-lib.so
diff --git a/librarylog4a/src/main/cpp/FlushBuffer.cpp b/librarylog4a/src/main/cpp/FlushBuffer.cpp
@@ -9,6 +9,9 @@ FlushBuffer::~FlushBuffer() {
     if (data_ptr != nullptr) {
         delete[] data_ptr;
     }
+    if (release != nullptr) {
+        delete release;
+    }
 }
 
 size_t FlushBuffer::length() {
@@ -62,4 +65,8 @@ FILE *FlushBuffer::logFile() {
     return log_file;
 }
 
+void FlushBuffer::releaseThis(void *release) {
+    this->release = release;
+}
+
 
diff --git a/librarylog4a/src/main/cpp/LogBuffer.cpp b/librarylog4a/src/main/cpp/LogBuffer.cpp
@@ -74,7 +74,14 @@ void LogBuffer::async_flush() {
 }
 
 void LogBuffer::async_flush(AsyncFileFlush *fileFlush) {
+    async_flush(fileFlush, nullptr);
+}
+
+void LogBuffer::async_flush(AsyncFileFlush *fileFlush, void *releaseThis) {
     if(fileFlush == nullptr) {
+        if (releaseThis != nullptr) {
+            delete releaseThis;
+        }
         return;
     }
     std::lock_guard<std::recursive_mutex> lck_clear(log_mtx);
@@ -84,8 +91,11 @@ void LogBuffer::async_flush(AsyncFileFlush *fileFlush) {
         }
         FlushBuffer* flushBuffer = new FlushBuffer(log_file);
         flushBuffer->write(data_ptr, length());
+        flushBuffer->releaseThis(releaseThis);
         clear();
         fileFlush->async_flush(flushBuffer);
+    } else if (releaseThis != nullptr) {
+        delete releaseThis;
     }
 }
 

diff --git a/librarylog4a/src/main/cpp/includes/FlushBuffer.h b/librarylog4a/src/main/cpp/includes/FlushBuffer.h
@@ -21,9 +21,11 @@ class FlushBuffer {
         void* ptr();
         FILE* logFile();
 
-    private:
-        FILE* log_file = nullptr;
+    void releaseThis(void *release);
 
+private:
+        FILE* log_file = nullptr;
+        void* release = nullptr;
         char* data_ptr = nullptr;
         char* write_ptr = nullptr;
         size_t capacity;

diff --git a/librarylog4a/src/main/cpp/includes/LogBuffer.h b/librarylog4a/src/main/cpp/includes/LogBuffer.h
@@ -34,6 +34,7 @@ class LogBuffer {
     void setAsyncFileFlush(AsyncFileFlush *fileFlush);
     void async_flush();
     void async_flush(AsyncFileFlush *fileFlush);
+    void async_flush(AsyncFileFlush *fileFlush, void *releaseThis);
     void changeLogPath(char *log_path);
 
 public:

diff --git a/librarylog4a/src/main/cpp/log4a-lib.cpp b/librarylog4a/src/main/cpp/log4a-lib.cpp
@@ -67,10 +67,12 @@ static void writeDirtyLogToFile(int buffer_fd) {
         if(buffered_size > 0) {
             char *buffer_ptr_tmp = (char *) mmap(0, buffered_size, PROT_WRITE | PROT_READ, MAP_SHARED, buffer_fd, 0);
             if (buffer_ptr_tmp != MAP_FAILED) {
-                LogBuffer tmp(buffer_ptr_tmp, buffered_size);
-                size_t data_size = tmp.length();
+                LogBuffer *tmp = new LogBuffer(buffer_ptr_tmp, buffered_size);
+                size_t data_size = tmp -> length();
                 if (data_size > 0) {
-                    tmp.async_flush(fileFlush);
+                    tmp -> async_flush(fileFlush, tmp);
+                } else {
+                    delete tmp;
                 }
             }
         }
@@ -92,8 +94,7 @@ static void writeNative(JNIEnv *env, jobject instance, jlong ptr,
 
 static void releaseNative(JNIEnv *env, jobject instance, jlong ptr) {
     LogBuffer* logBuffer = reinterpret_cast<LogBuffer*>(ptr);
-    logBuffer->async_flush(fileFlush);
-    delete logBuffer;
+    logBuffer->async_flush(fileFlush, logBuffer);
     if (fileFlush != nullptr) {
         delete fileFlush;
     }