Attachment 173087 Details for Bug 311965 – Fix for HEAD

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

[patch] Fix for HEAD

zpatch.txt (text/plain), 3.22 KB, created by Marc Khouzam

on 2010-06-30 09:02:33 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-06-30 09:02:33 EDT

Size: 3.22 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java,v
>retrieving revision 1.21
>diff -u -r1.21 GDBProcesses_7_0.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	3 Jun 2010 00:09:37 -0000	1.21
>+++ src/org/eclipse/cdt/dsf/gdb/service/GDBProcesses_7_0.java	30 Jun 2010 13:01:41 -0000
>@@ -797,13 +797,24 @@
> 		}
> 		// END OF WORKAROUND to be removed when GDB 7.2 is available
> 		
>-		IMIContainerDMContext[] containerDmcs = new IMIContainerDMContext[groups.length];
>-		for (int i = 0; i < groups.length; i++) {
>-			String groupId = groups[i].getGroupId();
>+		// With GDB 7.1, we can receive a bogus process when we are not debugging anything
>+        // -list-thread-groups
>+        // ^done,groups=[{id="0",type="process",pid="0"}]
>+		// As for GDB 7.2, the pid field is missing altogether in this case
>+		// -list-thread-groups
>+		// ^done,groups=[{id="i1",type="process"}]
>+		// Just ignore that entry
>+		List<IMIContainerDMContext> containerDmcs = new ArrayList<IMIContainerDMContext>(groups.length);
>+		for (IThreadGroupInfo group : groups) {
>+			if (group.getPid() == null || 
>+					group.getPid().equals("") || group.getPid().equals("0")) { //$NON-NLS-1$ //$NON-NLS-2$
>+				continue;
>+			}
>+			String groupId = group.getGroupId();
> 			IProcessDMContext procDmc = createProcessContext(controlDmc, groupId); 
>-			containerDmcs[i] = createContainerContext(procDmc, groupId);
>+			containerDmcs.add(createContainerContext(procDmc, groupId));
> 		}
>-		return containerDmcs;
>+		return containerDmcs.toArray(new IMIContainerDMContext[containerDmcs.size()]);
> 	}
> 
> 	public void getRunningProcesses(final IDMContext dmc, final DataRequestMonitor<IProcessDMContext[]> rm) {
>Index: src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java,v
>retrieving revision 1.5
>diff -u -r1.5 MIListThreadGroupsInfo.java
>--- src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java	28 Jun 2010 19:38:25 -0000	1.5
>+++ src/org/eclipse/cdt/dsf/mi/service/command/output/MIListThreadGroupsInfo.java	30 Jun 2010 13:01:41 -0000
>@@ -318,8 +318,12 @@
> 					}
> 				}
> 			}
>-			// In the case of -list-thread-groups --available, we can use the id as the pid
>-			if (pid.equals("")) { //$NON-NLS-1$
>+			// In the case of -list-thread-groups --available, the pid field is not present, but the
>+			// pid is used as the main id.  To know we are in this case, we check that we have
>+			// a description, that only happens for -list-thread-groups --available
>+			// We must check this because with GDB 7.2, there will be no pid field as a result
>+			// of -list-thread-groups, if no process is actually running yet.
>+			if (pid.equals("") && !desc.equals("")) { //$NON-NLS-1$ //$NON-NLS-2$
> 				pid = id;
> 			}
> 			fGroupList[i] = new ThreadGroupInfo(id, desc, type, pid, user, cores, exec);

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 311965: 167383 | 173087 | 173147