diff options
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_database_CursorWindow.cpp | 7 | ||||
| -rw-r--r-- | core/jni/android_database_SQLiteDatabase.cpp | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp index fad9539..c4cd2a6 100644 --- a/core/jni/android_database_CursorWindow.cpp +++ b/core/jni/android_database_CursorWindow.cpp @@ -50,13 +50,14 @@ CursorWindow * get_window_from_object(JNIEnv * env, jobject javaWindow) return GET_WINDOW(env, javaWindow); } -static void native_init_empty(JNIEnv * env, jobject object, jboolean localOnly) +static void native_init_empty(JNIEnv * env, jobject object, jint cursorWindowSize, + jboolean localOnly) { uint8_t * data; size_t size; CursorWindow * window; - window = new CursorWindow(MAX_WINDOW_SIZE); + window = new CursorWindow(cursorWindowSize); if (!window) { jniThrowException(env, "java/lang/RuntimeException", "No memory for native window object"); return; @@ -614,7 +615,7 @@ static jint getType_native(JNIEnv* env, jobject object, jint row, jint column) static JNINativeMethod sMethods[] = { /* name, signature, funcPtr */ - {"native_init", "(Z)V", (void *)native_init_empty}, + {"native_init", "(IZ)V", (void *)native_init_empty}, {"native_init", "(Landroid/os/IBinder;)V", (void *)native_init_memory}, {"native_getBinder", "()Landroid/os/IBinder;", (void *)native_getBinder}, {"native_clear", "()V", (void *)native_clear}, diff --git a/core/jni/android_database_SQLiteDatabase.cpp b/core/jni/android_database_SQLiteDatabase.cpp index 7aeed98..a5878a9 100644 --- a/core/jni/android_database_SQLiteDatabase.cpp +++ b/core/jni/android_database_SQLiteDatabase.cpp @@ -46,7 +46,6 @@ #define UTF16_STORAGE 0 #define INVALID_VERSION -1 -#define SQLITE_SOFT_HEAP_LIMIT (4 * 1024 * 1024) #define ANDROID_TABLE "android_metadata" /* uncomment the next line to force-enable logging of all statements */ // #define DB_LOG_STATEMENTS @@ -66,6 +65,7 @@ enum { static jfieldID offset_db_handle; static jmethodID method_custom_function_callback; static jclass string_class = NULL; +static jint sSqliteSoftHeapLimit = 0; static char *createStr(const char *path, short extra) { int len = strlen(path) + extra; @@ -129,7 +129,7 @@ static void dbopen(JNIEnv* env, jobject object, jstring pathString, jint flags) // The soft heap limit prevents the page cache allocations from growing // beyond the given limit, no matter what the max page cache sizes are // set to. The limit does not, as of 3.5.0, affect any other allocations. - sqlite3_soft_heap_limit(SQLITE_SOFT_HEAP_LIMIT); + sqlite3_soft_heap_limit(sSqliteSoftHeapLimit); // Set the default busy handler to retry for 1000ms and then return SQLITE_BUSY err = sqlite3_busy_timeout(handle, 1000 /* ms */); @@ -379,10 +379,14 @@ done: if (meta != NULL) sqlite3_free_table(meta); } +static void native_setSqliteSoftHeapLimit(JNIEnv* env, jobject clazz, jint limit) { + sSqliteSoftHeapLimit = limit; +} + static jint native_releaseMemory(JNIEnv *env, jobject clazz) { // Attempt to release as much memory from the - return sqlite3_release_memory(SQLITE_SOFT_HEAP_LIMIT); + return sqlite3_release_memory(sSqliteSoftHeapLimit); } static void native_finalize(JNIEnv* env, jobject object, jint statementId) @@ -466,6 +470,7 @@ static JNINativeMethod sMethods[] = {"enableSqlProfiling", "(Ljava/lang/String;S)V", (void *)enableSqlProfiling}, {"native_setLocale", "(Ljava/lang/String;I)V", (void *)native_setLocale}, {"native_getDbLookaside", "()I", (void *)native_getDbLookaside}, + {"native_setSqliteSoftHeapLimit", "(I)V", (void *)native_setSqliteSoftHeapLimit}, {"releaseMemory", "()I", (void *)native_releaseMemory}, {"native_finalize", "(I)V", (void *)native_finalize}, {"native_addCustomFunction", |