Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: jni/JniLogSystem.cpp

Issue 6606493159784448: New JNI bindings (Closed)
Left Patch Set: Cleaned up namespace usage in cpp files. Created March 20, 2014, 3:17 p.m.
Right Patch Set: Removed TODO from AppInfo. Created April 11, 2014, 1:28 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « jni/JniJsValue.cpp ('k') | jni/JniSubscription.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 Eyeo GmbH
4 * 4 *
5 * Adblock Plus is free software: you can redistribute it and/or modify 5 * Adblock Plus is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License version 3 as 6 * it under the terms of the GNU General Public License version 3 as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
8 * 8 *
9 * Adblock Plus is distributed in the hope that it will be useful, 9 * Adblock Plus is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details. 12 * GNU General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU General Public License 14 * You should have received a copy of the GNU General Public License
15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 */ 16 */
17 17
18 #include "JniCallbacks.h" 18 #include "JniCallbacks.h"
19 19
20 AdblockPlus::Android::JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jo bject callbackObject) : 20 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
21 JniCallbackBase(env, callbackObject), AdblockPlus::LogSystem()
22 { 21 {
23 m_LogLevelClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG(" LogSystem$LogLevel")))); 22 try
23 {
24 return JniPtrToLong(new JniLogSystemCallback(env, callbackObject));
25 }
26 CATCH_THROW_AND_RETURN(env, 0)
24 } 27 }
25 28
26 AdblockPlus::Android::JniLogSystemCallback::~JniLogSystemCallback() 29 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
27 { 30 {
31 delete JniLongToTypePtr<JniLogSystemCallback>(ptr);
28 } 32 }
29 33
30 void AdblockPlus::Android::JniLogSystemCallback::operator()(AdblockPlus::LogSyst em::LogLevel logLevel, const std::string& message, 34 JniLogSystemCallback::JniLogSystemCallback(JNIEnv* env, jobject callbackObject)
31 const std::string& source) 35 : JniCallbackBase(env, callbackObject), AdblockPlus::LogSystem()
32 { 36 {
33 AdblockPlus::Android::JNIEnvAcquire env(GetJavaVM()); 37 logLevelClass.reset(new JniGlobalReference<jclass>(env, env->FindClass(PKG("Lo gSystem$LogLevel"))));
38 }
39
40 void JniLogSystemCallback::operator()(AdblockPlus::LogSystem::LogLevel logLevel, const std::string& message, const std::string& source)
41 {
42 JNIEnvAcquire env(GetJavaVM());
34 43
35 jclass clazz = env->GetObjectClass(GetCallbackObject()); 44 jclass clazz = env->GetObjectClass(GetCallbackObject());
36 jmethodID method = env->GetMethodID(clazz, "logCallback", "(" TYP("LogSystem$L ogLevel") "Ljava/lang/String;Ljava/lang/String;)V"); 45 jmethodID method = env->GetMethodID(clazz, "logCallback", "(" TYP("LogSystem$L ogLevel") "Ljava/lang/String;Ljava/lang/String;)V");
37 46
38 // TODO: Set log level from Java and handle it here (to reduce C++->Java calls ) 47 // TODO: Set log level from Java and handle it here (to reduce C++->Java calls )
39 48
40 if (method) 49 if (method)
41 { 50 {
42 const char* enumName = 0; 51 const char* enumName = 0;
43 52
(...skipping 10 matching lines...) Expand all
54 enumName = "INFO"; 63 enumName = "INFO";
55 break; 64 break;
56 case AdblockPlus::LogSystem::LOG_LEVEL_WARN: 65 case AdblockPlus::LogSystem::LOG_LEVEL_WARN:
57 enumName = "WARN"; 66 enumName = "WARN";
58 break; 67 break;
59 case AdblockPlus::LogSystem::LOG_LEVEL_ERROR: 68 case AdblockPlus::LogSystem::LOG_LEVEL_ERROR:
60 enumName = "ERROR"; 69 enumName = "ERROR";
61 break; 70 break;
62 } 71 }
63 72
64 jclass enumClass = m_LogLevelClass->get(); 73 jclass enumClass = logLevelClass->Get();
65 if (enumClass) 74 if (enumClass)
66 { 75 {
67 jfieldID enumField = env->GetStaticFieldID(enumClass, enumName, TYP("LogSy stem$LogLevel")); 76 jfieldID enumField = env->GetStaticFieldID(enumClass, enumName, TYP("LogSy stem$LogLevel"));
68 jobject jLogLevel = env->GetStaticObjectField(enumClass, enumField); 77 jobject jLogLevel = env->GetStaticObjectField(enumClass, enumField);
69 78
70 jstring jMessage = env->NewStringUTF(message.c_str()); 79 jstring jMessage = env->NewStringUTF(message.c_str());
71 jstring jSource = env->NewStringUTF(source.c_str()); 80 jstring jSource = env->NewStringUTF(source.c_str());
72 81
73 env->CallVoidMethod(GetCallbackObject(), method, jLogLevel, jMessage, jSou rce); 82 env->CallVoidMethod(GetCallbackObject(), method, jLogLevel, jMessage, jSou rce);
74 } 83 }
75 84
76 CheckAndLogJavaException(*env); 85 CheckAndLogJavaException(*env);
77 } 86 }
78 } 87 }
79 88
80 static jlong JNICALL JniCtor(JNIEnv* env, jclass clazz, jobject callbackObject)
81 {
82 TRY
83 {
84 return AdblockPlus::Android::JniPtr2Long(new AdblockPlus::Android::JniLogSys temCallback(env, callbackObject));
85 }
86 CATCH_THROW_AND_RETURN(env, 0)
87 }
88
89 static void JNICALL JniDtor(JNIEnv* env, jclass clazz, jlong ptr)
90 {
91 delete AdblockPlus::Android::JniLong2TypePtr<AdblockPlus::Android::JniLogSyste mCallback>(ptr);
92 }
93
94 static JNINativeMethod methods[] = 89 static JNINativeMethod methods[] =
95 { 90 {
96 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor }, 91 { (char*)"ctor", (char*)"(Ljava/lang/Object;)J", (void*)JniCtor },
97 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }, }; 92 { (char*)"dtor", (char*)"(J)V", (void*)JniDtor }
93 };
98 94
99 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_android_api_LogSystem_reg isterNatives(JNIEnv *env, jclass clazz) 95 extern "C" JNIEXPORT void JNICALL Java_org_adblockplus_libadblockplus_LogSystem_ registerNatives(JNIEnv *env, jclass clazz)
100 { 96 {
101 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])); 97 env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0]));
102 } 98 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld