Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add logging to CursorWindow JNI code to track #31046363" into nyc-mr1-dev

Browse Source
This commit is contained in:
Amith Yamasani
2016-08-29 17:42:37 +00:00
committed by Android (Google) Code Review
parent 23784fd6d9 0903ec5017
commit 81f876e795
1 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/jni/android_database_CursorWindow.cpp
View File

@@ -16,6 +16,7 @@
#undef LOG_TAG #undef LOG_TAG
#define LOG_TAG "CursorWindow" #define LOG_TAG "CursorWindow"
#define LOG_NDEBUG 0
#include <inttypes.h> #include <inttypes.h>
#include <jni.h> #include <jni.h>
@@ -30,6 +31,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h>
#include <dirent.h>
#undef LOG_NDEBUG
#define LOG_NDEBUG 1
#include <androidfw/CursorWindow.h> #include <androidfw/CursorWindow.h>
#include "android_os_Parcel.h" #include "android_os_Parcel.h"
@@ -61,6 +67,22 @@ static void throwUnknownTypeException(JNIEnv * env, jint type) {
jniThrowException(env, "java/lang/IllegalStateException", msg.string()); jniThrowException(env, "java/lang/IllegalStateException", msg.string());
} }
static int getFdCount() {
char fdpath[PATH_MAX];
int count = 0;
snprintf(fdpath, PATH_MAX, "/proc/%d/fd", getpid());
DIR *dir = opendir(fdpath);
if (dir != NULL) {
struct dirent *dirent;
while ((dirent = readdir(dir))) {
count++;
}
count -= 2; // discount "." and ".."
closedir(dir);
}
return count;
}
static jlong nativeCreate(JNIEnv* env, jclass clazz, jstring nameObj, jint cursorWindowSize) { static jlong nativeCreate(JNIEnv* env, jclass clazz, jstring nameObj, jint cursorWindowSize) {
String8 name; String8 name;
const char* nameStr = env->GetStringUTFChars(nameObj, NULL); const char* nameStr = env->GetStringUTFChars(nameObj, NULL);
@@ -85,7 +107,8 @@ static jlong nativeCreateFromParcel(JNIEnv* env, jclass clazz, jobject parcelObj
CursorWindow* window; CursorWindow* window;
status_t status = CursorWindow::createFromParcel(parcel, &window); status_t status = CursorWindow::createFromParcel(parcel, &window);
if (status || !window) { if (status || !window) {
ALOGE("Could not create CursorWindow from Parcel due to error %d.", status); ALOGE("Could not create CursorWindow from Parcel due to error %d, process fd count=%d",
status, getFdCount());
return 0; return 0;
} }