Attachment 158135 Details for Bug 269838 – Updated CDI patch, fixes threads stacks

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated CDI patch, fixes threads stacks

MacInfoThreads-patch3.txt (text/plain), 2.61 KB, created by Marc-André Laperle

on 2010-02-03 22:40:38 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-André Laperle

Created: 2010-02-03 22:40:38 EST

Size: 2.61 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.debug.mi.core
>Index: mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.debug.mi.core/mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java,v
>retrieving revision 1.1.2.2
>diff -u -r1.1.2.2 MacOsCLIInfoThreadsInfo.java
>--- mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java	3 Feb 2010 22:49:20 -0000	1.1.2.2
>+++ mi/org/eclipse/cdt/debug/mi/core/command/factories/macos/MacOsCLIInfoThreadsInfo.java	4 Feb 2010 03:33:03 -0000
>@@ -52,9 +52,11 @@
> 			threadIds = new int[0];
> 		}
> 		Arrays.sort(threadIds);
>-		if (threadIds.length > 0) {
>-			currentThreadId = threadIds[0];
>-		}
>+		
>+		// -thread-list-ids doesn't provide the current thread id so we
>+		// set currentThreadId to a dumb value. This has the effect of falling
>+		// back to the thread id provided by the stopped event. See EventManager::processSuspendedEvent
>+		currentThreadId = -1;
> 	}
> 
> 	void parseThreadIds(MITuple tuple) {
>Index: cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java,v
>retrieving revision 1.35
>diff -u -r1.35 EventManager.java
>--- cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java	14 Jun 2007 18:32:54 -0000	1.35
>+++ cdi/org/eclipse/cdt/debug/mi/core/cdi/EventManager.java	4 Feb 2010 03:33:03 -0000
>@@ -282,6 +282,12 @@
> 		currentTarget.updateState(threadId);
> 		try {
> 			Thread cthread = (Thread)currentTarget.getCurrentThread();
>+			
>+			// As a fallback, use the id from the stopped event
>+			if(cthread == null) {
>+				cthread = (Thread)currentTarget.getThread(threadId);
>+			}
>+			
> 			if (cthread != null) {
> 				cthread.getCurrentStackFrame();
> 			} else {
>@@ -422,9 +428,19 @@
> 				Thread currentThread = null;
> 				try {
> 					currentThread = (Thread)currentTarget.getCurrentThread();
>+					// As a fallback, use the id from the stopped event
>+					if(currentThread == null) {
>+						currentThread = (Thread)currentTarget.getThread(stopped.getThreadId());
>+					}
>+					if(currentThread != null) {
>+						tid = currentThread.getId();
>+					}
>+					else {
>+						return true;
>+					}
> 				} catch (CDIException e1) {
> 				}
>-				tid = currentThread.getId();
>+				
> 				// Select the old thread now.
> 				if (tid > 0) {
> 					MIThreadSelect selectThread = factory.createMIThreadSelect(tid);

Actions: View | Diff

Attachments on bug 269838: 129741 | 129886 | 151905 | 151906 | 155392 | 155393 | 156477 | 157863 | 157865 | 158135 | 158393 | 158394