Attachment 158394 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-patch4.txt (text/plain), 1.96 KB, created by Marc-André Laperle

on 2010-02-07 14:42:13 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-André Laperle

Created: 2010-02-07 14:42:13 EST

Size: 1.96 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	7 Feb 2010 19:29:13 -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 = 0;
> 	}
> 
> 	void parseThreadIds(MITuple tuple) {
>Index: cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/all/org.eclipse.cdt.debug.mi.core/cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java,v
>retrieving revision 1.62
>diff -u -r1.62 Target.java
>--- cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java	25 Feb 2009 20:06:29 -0000	1.62
>+++ cdi/org/eclipse/cdt/debug/mi/core/cdi/model/Target.java	7 Feb 2010 19:29:13 -0000
>@@ -347,7 +347,9 @@
> 				} else {
> 					ids = info.getThreadIds();
> 					names = info.getThreadNames();
>-					currentThreadId = info.getCurrentThread();
>+					if (info.getCurrentThread() != 0) {
>+						currentThreadId = info.getCurrentThread();
>+					}
> 				}
> 				if (ids != null && ids.length > 0) {
> 					cthreads = new Thread[ids.length];

Actions: View | Diff

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