make sure DEFAULT_MMAP_SIZE is inited

trietbui85 · Mar 22, 2019 · ef4be36 · ef4be36
1 parent 3b2ecbe
commit ef4be36
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Android/MMKV/mmkv/src/main/cpp/native-bridge.cpp b/Android/MMKV/mmkv/src/main/cpp/native-bridge.cpp
@@ -477,7 +477,7 @@ extern "C" JNIEXPORT JNICALL jbyteArray Java_com_tencent_mmkv_MMKV_decodeBytes(J
     if (kv && oKey) {
         string key = jstring2string(env, oKey);
         MMBuffer value = kv->getBytesForKey(key);
-        if (value.length() > 0){
+        if (value.length() > 0) {
             jbyteArray result = env->NewByteArray(value.length());
             env->SetByteArrayRegion(result, 0, value.length(), (const jbyte *) value.getPtr());
             return result;

diff --git a/iOS/MMKV/MMKV/MMKV.mm b/iOS/MMKV/MMKV/MMKV.mm
@@ -44,6 +44,8 @@
 id<MMKVHandler> g_callbackHandler;
 bool g_isLogRedirecting = false;
 
+int DEFAULT_MMAP_SIZE;
+
 #define DEFAULT_MMAP_ID @"mmkv.default"
 #define CRC_FILE_SIZE DEFAULT_MMAP_SIZE
 #define SPECIAL_CHARACTER_DIRECTORY_NAME @"specialCharacter"
@@ -80,6 +82,7 @@ + (void)initialize {
 		g_instanceDic = [NSMutableDictionary dictionary];
 		g_instanceLock = [[NSRecursiveLock alloc] init];
 
+		DEFAULT_MMAP_SIZE = getpagesize();
 		MMKVInfo(@"pagesize:%d", DEFAULT_MMAP_SIZE);
 	}
 }

diff --git a/iOS/MMKV/MMKV/MemoryFile.h b/iOS/MMKV/MMKV/MemoryFile.h
@@ -24,7 +24,7 @@
 #import "LRUCache.hpp"
 #import <Foundation/Foundation.h>
 
-extern const int DEFAULT_MMAP_SIZE;
+extern int DEFAULT_MMAP_SIZE;
 
 class MemoryFile {
 	NSString *m_name;

diff --git a/iOS/MMKV/MMKV/MemoryFile.mm b/iOS/MMKV/MMKV/MemoryFile.mm
@@ -30,7 +30,6 @@
 
 using namespace std;
 
-const int DEFAULT_MMAP_SIZE = getpagesize();
 // 1MB per segment
 constexpr uint32_t SegmentSize = 1024 * 1024;
 // count of segments in memory