wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 791640 - EventTracer will only measure the main thread responsiveness, fixes profiling hang. r=blassey

Browse Source 
--HG--
extra : rebase_source : a5a9074b74ab8638cfc4b568b0d09ca7b5e61b17
This commit is contained in:
Benoit Girard 2012-09-20 14:23:15 -04:00
parent 896de64465
commit 67e3ae7491
4 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
embedding/android/GeckoAppShell.java
View File

@ -1662,25 +1662,6 @@ public class GeckoAppShell
}
}
static SynchronousQueue<Date> sTracerQueue = new SynchronousQueue<Date>();
public static void fireAndWaitForTracerEvent() {
getMainHandler().post(new Runnable() {
public void run() {
try {
sTracerQueue.put(new Date());
} catch(InterruptedException ie) {
Log.w("GeckoAppShell", "exception firing tracer", ie);
}
}
});
try {
sTracerQueue.take();
} catch(InterruptedException ie) {
Log.w("GeckoAppShell", "exception firing tracer", ie);
}
}
// unused
static void checkUriVisited(String uri) {}
// unused

18
mobile/android/base/GeckoAppShell.java
View File

@ -1939,24 +1939,6 @@ public class GeckoAppShell
return sEventDispatcher;
}
static SynchronousQueue<Date> sTracerQueue = new SynchronousQueue<Date>();
public static void fireAndWaitForTracerEvent() {
getMainHandler().post(new Runnable() {
public void run() {
try {
sTracerQueue.put(new Date());
} catch(InterruptedException ie) {
Log.w(LOGTAG, "exception firing tracer", ie);
}
}
});
try {
sTracerQueue.take();
} catch(InterruptedException ie) {
Log.w(LOGTAG, "exception firing tracer", ie);
}
}
/**
* Remove a previously-registered listener for a gecko event.
* This method is thread-safe and may be called at any time. In particular, calling it

14
widget/android/AndroidBridge.cpp
View File

@ -140,7 +140,6 @@ AndroidBridge::Init(JNIEnv *jEnv,
jScanMedia = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "scanMedia", "(Ljava/lang/String;Ljava/lang/String;)V");
jGetSystemColors = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getSystemColors", "()[I");
jGetIconForExtension = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getIconForExtension", "(Ljava/lang/String;I)[B");
jFireAndWaitForTracerEvent = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "fireAndWaitForTracerEvent", "()V");
jCreateShortcut = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "createShortcut", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
jGetShowPasswordSetting = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getShowPasswordSetting", "()Z");
jPostToJavaThread = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "postToJavaThread", "(Z)V");
@ -1446,18 +1445,6 @@ AndroidBridge::OpenGraphicsLibraries()
}
}
void
AndroidBridge::FireAndWaitForTracerEvent() {
JNIEnv *env = GetJNIEnv();
if (!env)
return;
AutoLocalJNIFrame jniFrame(env, 0);
env->CallStaticVoidMethod(mGeckoAppShellClass,
jFireAndWaitForTracerEvent);
}
namespace mozilla {
class TracerRunnable : public nsRunnable{
public:
@ -1479,7 +1466,6 @@ namespace mozilla {
if (!AndroidBridge::Bridge())
return NS_OK;
AndroidBridge::Bridge()->FireAndWaitForTracerEvent();
mHasRun = true;
mTracerCondVar->Notify();
return NS_OK;

3
widget/android/AndroidBridge.h
View File

@ -252,8 +252,6 @@ public:
bool GetShowPasswordSetting();
void FireAndWaitForTracerEvent();
/* See GLHelpers.java as to why this is needed */
void *CallEglCreateWindowSurface(void *dpy, void *config, AndroidGeckoSurfaceView& surfaceView);
@ -442,7 +440,6 @@ protected:
jmethodID jScanMedia;
jmethodID jGetSystemColors;
jmethodID jGetIconForExtension;
jmethodID jFireAndWaitForTracerEvent;
jmethodID jCreateShortcut;
jmethodID jGetShowPasswordSetting;
jmethodID jPostToJavaThread;