Attachment 283501 Details for Bug 564911 – Timeout-for-deadlock

[patch] Timeout-for-deadlock

eclipse.platform.swt.patch (text/plain), 1.56 KB, created by Alexander Diewald

on 2020-07-03 12:00:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Diewald

Created: 2020-07-03 12:00:04 EDT

Size: 1.56 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
>index 7d475d3..bc2d71b 100644
>--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
>+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java
>@@ -1891,13 +1891,23 @@
> 	 * You should check 'retObj.swtAsyncTimeout' after making a call to this.
> 	 */
> 	private static Webkit2AsyncReturnObj execAsyncAndWaitForReturn(Browser browser, Consumer<Integer> asyncFunc, String additionalErrorInfo) {
>+		class CtxIteration implements Runnable {
>+			boolean eventsDispatched;
>+
>+			@Override
>+			public void run() {
>+				eventsDispatched = OS.g_main_context_iteration (0, false);
>+			}
>+		}
>+
> 		Webkit2AsyncReturnObj retObj = new Webkit2AsyncReturnObj();
> 		int callbackId = CallBackMap.putObject(retObj);
> 		asyncFunc.accept(callbackId);
> 		Display display = browser.getDisplay();
> 		final Instant timeOut = Instant.now().plusMillis(ASYNC_EXEC_TIMEOUT_MS);
> 		while (!browser.isDisposed()) {
>-			boolean eventsDispatched = OS.g_main_context_iteration (0, false);
>+			CtxIteration ctxIteration = new CtxIteration();
>+			display.asyncExec(ctxIteration);
> 			if (retObj.callbackFinished)
> 				break;
> 			else if (Instant.now().isAfter(timeOut)) {
>@@ -1916,7 +1926,7 @@
> 				retObj.swtAsyncTimeout = true;
> 				break;
> 			}
>-			else if (!eventsDispatched)
>+			else if (!ctxIteration.eventsDispatched)
> 				display.sleep();
> 		}
> 		CallBackMap.removeObject(callbackId);

Actions: View | Diff

Attachments on bug 564911: 283501 | 283507 | 283508