feature：修改logger模块名为zap

build.gradle

@@ -2,6 +2,8 @@
 buildscript {
     // 混淆开关
     ext.MINIFY_ENABLE = false
+    // ndk版本
+    ext.NDK_VERSION = '21.3.6528147'
     // kotlin版本
     ext.KOTLIN_VERSION = '1.4.20'
     // compileSdkVersion
@@ -18,7 +20,7 @@ buildscript {
         mavenCentral()
         jcenter()
     }
-    
+
     dependencies {
         classpath "com.android.tools.build:gradle:4.1.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"

demo/build.gradle

@@ -73,5 +73,5 @@ android {
 
 dependencies {
 //    implementation project(':library_caps')
-    implementation project(':library_logger')
+    implementation project(':library_zap')
 }

demo/src/main/java/com/suyghur/dolin/simple/DemoApplication.kt

@@ -2,9 +2,9 @@ package com.suyghur.dolin.simple
 
 import android.app.Application
 import android.content.Context
-import com.suyghur.dolin.logger.entity.Config
-import com.suyghur.dolin.logger.entity.Level
-import com.suyghur.dolin.logger.Logger
+import com.suyghur.dolin.zap.entity.Config
+import com.suyghur.dolin.zap.entity.Level
+import com.suyghur.dolin.zap.Zap
 
 /**
  * @author #Suyghur.
@@ -24,6 +24,6 @@ class DemoApplication : Application() {
                 .setRecordLevel(Level.DEBUG)
                 .setOverdueDay(3)
                 .create()
-        Logger.initialize(config)
+        Zap.initialize(config)
     }
 }

library_logger/CMakeLists.txt → library_zap/CMakeLists.txt

@@ -11,13 +11,11 @@ cmake_minimum_required(VERSION 3.4.1)
 # Gradle automatically packages shared libraries with your APK.
 
 aux_source_directory(src/main/cpp/ DIR_SOURCE)
-aux_source_directory(src/main/cpp/libs DIR_LIB_SOURCE)
-include_directories(src/main/cpp/libs)
+include_directories(src/main/cpp/includes)
 add_library(
-        logkit
+        zap
         SHARED
         ${DIR_SOURCE}
-        ${DIR_LIB_SOURCE}
 )
 
 # Searches for a specified prebuilt library and stores the path as a
@@ -37,7 +35,7 @@ find_library( # Sets the name of the path variable.
 # build script, prebuilt third-party libraries, or system libraries.
 
 target_link_libraries( # Specifies the target library.
-        logkit
+        zap
         # Links the target library to the log library
         # included in the NDK.
         ${log-lib})

library_logger/build.gradle → library_zap/build.gradle

@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdkVersion MIN_SDK_VERSION
         targetSdkVersion TARGET_SDK_VERSION
-        ndkVersion "21.1.6352462"
+        ndkVersion NDK_VERSION
 
         externalNativeBuild {
             cmake {

library_logger/src/main/cpp/libs/buffer.cpp → library_zap/src/main/cpp/buffer.cpp

@@ -2,7 +2,7 @@
 // Created by #Suyghur, on 4/7/21.
 //
 
-#include "buffer.h"
+#include "includes/buffer.h"
 
 Buffer::Buffer(char *ptr, size_t buffer_size) : buffer_ptr(ptr), buffer_size(buffer_size), buffer_header(buffer_ptr, buffer_size) {}
 

library_logger/src/main/cpp/libs/buffer_flush.cpp → library_zap/src/main/cpp/buffer_flush.cpp

@@ -4,7 +4,7 @@
 
 #include <cmath>
 #include <cstring>
-#include "buffer_flush.h"
+#include "includes/buffer_flush.h"
 
 BufferFlush::BufferFlush(FILE *log_file, size_t size) : capacity(size), log_file_ptr(log_file) {}
 
@@ -13,7 +13,8 @@ BufferFlush::~BufferFlush() {
         delete[] data_ptr;
     }
     if (release_ptr != nullptr) {
-        delete release_ptr;
+//        delete release_ptr;
+        ::operator delete(release_ptr);
     }
 
 }

library_logger/src/main/cpp/libs/buffer_header.cpp → library_zap/src/main/cpp/buffer_header.cpp

@@ -2,7 +2,7 @@
 // Created by #Suyghur, on 4/7/21.
 //
 
-#include "buffer_header.h"
+#include "includes/buffer_header.h"
 
 buffer_header::BufferHeader::BufferHeader(void *data, size_t size) : data_ptr((char *) data), data_size(size) {}
 

library_logger/src/main/cpp/libs/file_flush.cpp → library_zap/src/main/cpp/file_flush.cpp

@@ -2,7 +2,7 @@
 // Created by #Suyghur, on 4/7/21.
 //
 
-#include "file_flush.h"
+#include "includes/file_flush.h"
 
 FileFlush::FileFlush() {
     async_thread = std::thread(&FileFlush::asyncLogThread, this);

library_logger/src/main/cpp/logger.cpp → library_zap/src/main/cpp/zap.cpp

@@ -6,9 +6,9 @@
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sstream>
-#include "libs/buffer.h"
-#include "libs/file_flush.h"
-#include "libs/buffer_header.h"
+#include "includes/buffer.h"
+#include "includes/file_flush.h"
+#include "includes/buffer_header.h"
 
 static FileFlush *p_file_flush = nullptr;
 
@@ -133,7 +133,7 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     if (vm->GetEnv((void **) &env, JNI_VERSION_1_6) != JNI_OK) {
         return JNI_ERR;
     }
-    jclass clz = env->FindClass("com/suyghur/dolin/logger/impl/Record2MMap");
+    jclass clz = env->FindClass("com/suyghur/dolin/zap/impl/Record2MMap");
     if (env->RegisterNatives(clz, gMethods, sizeof(gMethods) / sizeof(gMethods[0])) < 0) {
         return JNI_ERR;
     }

library_logger/src/main/java/com/suyghur/dolin/logger/Version.kt → library_zap/src/main/java/com/suyghur/dolin/zap/Version.kt

@@ -1,4 +1,4 @@
-package com.suyghur.dolin.logger
+package com.suyghur.dolin.zap
 
 /**
  * @author #Suyghur.

library_logger/src/main/java/com/suyghur/dolin/logger/Logger.kt → library_zap/src/main/java/com/suyghur/dolin/zap/Zap.kt

@@ -1,13 +1,13 @@
-package com.suyghur.dolin.logger
+package com.suyghur.dolin.zap
 
-import com.suyghur.dolin.logger.entity.Config
-import com.suyghur.dolin.logger.impl.LoggerPrint
+import com.suyghur.dolin.zap.entity.Config
+import com.suyghur.dolin.zap.impl.LoggerPrint
 
 /**
  * @author #Suyghur.
  * Created on 4/7/21
  */
-object Logger {
+object Zap {
 
     fun initialize(config: Config) {
         LoggerPrint.getInstance().initialize(config)

library_logger/src/main/java/com/suyghur/dolin/logger/entity/Config.kt → library_zap/src/main/java/com/suyghur/dolin/zap/entity/Config.kt

@@ -1,4 +1,4 @@
-package com.suyghur.dolin.logger.entity
+package com.suyghur.dolin.zap.entity
 
 import android.content.Context
 import android.text.TextUtils

library_logger/src/main/java/com/suyghur/dolin/logger/entity/Level.kt → library_zap/src/main/java/com/suyghur/dolin/zap/entity/Level.kt

@@ -1,4 +1,4 @@
-package com.suyghur.dolin.logger.entity
+package com.suyghur.dolin.zap.entity
 
 /**
  * @author #Suyghur.

library_logger/src/main/java/com/suyghur/dolin/logger/entity/LoggerData.kt → library_zap/src/main/java/com/suyghur/dolin/zap/entity/ZapData.kt

@@ -1,16 +1,16 @@
-package com.suyghur.dolin.logger.entity
+package com.suyghur.dolin.zap.entity
 
 /**
  * 参考[android.os.Message]的享元模式
  * @author #Suyghur.
  * Created on 4/8/21
  */
-class LoggerData {
+class ZapData {
 
     var level: Level = Level.NONE
     var tag = ""
     var msg: String = ""
-    private var next: LoggerData? = null
+    private var next: ZapData? = null
 
     fun recycle() {
         level = Level.NONE
@@ -27,12 +27,12 @@ class LoggerData {
 
     companion object {
         private val sPoolSync = Any()
-        private var sPool: LoggerData? = null
+        private var sPool: ZapData? = null
         private var sPoolSize = 0
         private const val MAX_POOL_SIZE = 50
 
         @JvmStatic
-        fun obtain(): LoggerData {
+        fun obtain(): ZapData {
             synchronized(sPoolSync) {
                 if (sPool != null) {
                     val data = sPool
@@ -42,11 +42,11 @@ class LoggerData {
                     return data
                 }
             }
-            return LoggerData()
+            return ZapData()
         }
 
         @JvmStatic
-        fun obtain(level: Level, tag: String, msg: String): LoggerData {
+        fun obtain(level: Level, tag: String, msg: String): ZapData {
             val data = obtain()
             data.level = level
             data.tag = tag

library_logger/src/main/java/com/suyghur/dolin/logger/impl/LoggerPrint.kt → library_zap/src/main/java/com/suyghur/dolin/zap/impl/LoggerPrint.kt

@@ -1,11 +1,11 @@
-package com.suyghur.dolin.logger.impl
+package com.suyghur.dolin.zap.impl
 
 import android.util.Log
 import androidx.annotation.Keep
-import com.suyghur.dolin.logger.entity.Config
-import com.suyghur.dolin.logger.entity.Level
-import com.suyghur.dolin.logger.entity.LoggerData
-import com.suyghur.dolin.logger.internal.ILogger
+import com.suyghur.dolin.zap.entity.Config
+import com.suyghur.dolin.zap.entity.Level
+import com.suyghur.dolin.zap.entity.ZapData
+import com.suyghur.dolin.zap.internal.ILogger
 import java.lang.reflect.Array
 
 /**
@@ -97,7 +97,7 @@ class LoggerPrint : ILogger {
                 "$any"
             }
         }
-        val data = LoggerData.obtain(level, tag, msg)
+        val data = ZapData.obtain(level, tag, msg)
         if (!interceptLogcat(level)) {
             printInner(data)
         }
@@ -107,7 +107,7 @@ class LoggerPrint : ILogger {
         data.recycle()
     }
 
-    private fun printInner(data: LoggerData) {
+    private fun printInner(data: ZapData) {
         if (data.msg.length <= MAX_LENGTH_OF_SINGLE_MESSAGE) {
             doPrint(data.level, data.tag, data.msg)
             return

library_logger/src/main/java/com/suyghur/dolin/logger/impl/Record2MMap.kt → library_zap/src/main/java/com/suyghur/dolin/zap/impl/Record2MMap.kt

@@ -1,6 +1,6 @@
-package com.suyghur.dolin.logger.impl
+package com.suyghur.dolin.zap.impl
 
-import com.suyghur.dolin.logger.internal.IRecord
+import com.suyghur.dolin.zap.internal.IRecord
 
 /**
  * @author #Suyghur.
@@ -12,7 +12,7 @@ class Record2MMap(bufferPath: String, capacity: Int, logPath: String, compress:
     private var ptr = 0L
 
     init {
-        System.loadLibrary("logger")
+        System.loadLibrary("zap")
         try {
             ptr = initNative(bufferPath, capacity, logPath, compress)
         } catch (e: Exception) {

library_logger/src/main/java/com/suyghur/dolin/logger/internal/ILogger.kt → library_zap/src/main/java/com/suyghur/dolin/zap/internal/ILogger.kt

@@ -1,4 +1,4 @@
-package com.suyghur.dolin.logger.internal
+package com.suyghur.dolin.zap.internal
 
 /**
  * @author #Suyghur.

library_logger/src/main/java/com/suyghur/dolin/logger/internal/IRecord.kt → library_zap/src/main/java/com/suyghur/dolin/zap/internal/IRecord.kt

@@ -1,4 +1,4 @@
-package com.suyghur.dolin.logger.internal
+package com.suyghur.dolin.zap.internal
 
 /**
  * @author #Suyghur.

settings.gradle

@@ -1,4 +1,4 @@
 include ':demo'
 //include ':library_caps'
-include ':library_logger'
+include ':library_zap'
 rootProject.name = 'Dolin'