Attachment 155564 Details for Bug 298883 – Proper Improved API extensions for MIExpressions

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

[patch] Proper Improved API extensions for MIExpressions

zpatch2.txt (text/plain), 36.13 KB, created by Marc Khouzam

on 2010-01-07 20:37:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Khouzam

Created: 2010-01-07 20:37:48 EST

Size: 36.13 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java,v
>retrieving revision 1.9
>diff -u -r1.9 GdbLaunchDelegate.java
>--- src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java	12 Oct 2009 13:53:53 -0000	1.9
>+++ src/org/eclipse/cdt/dsf/gdb/launching/GdbLaunchDelegate.java	8 Jan 2010 01:39:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008, 2009  QNX Software Systems and others.
>+ * Copyright (c) 2010 QNX Software Systems and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -9,6 +9,7 @@
>  * QNX Software Systems   - Initial API and implementation
>  * Windriver and Ericsson - Updated for DSF
>  * IBM Corporation 
>+ * Ericsson               - Added support for Mac OS
>  *******************************************************************************/
> package org.eclipse.cdt.dsf.gdb.launching; 
> 
>@@ -382,6 +383,11 @@
> 	}
> 	
> 	private boolean isNonStopSupported(String version) {
>+		if (version.startsWith(LaunchUtils.MACOS_GDB_PREFIX)) {
>+			// Mac OS's GDB does not support Non-Stop
>+			return false;
>+		}
>+		
> 		if (NON_STOP_FIRST_VERSION.compareTo(version) <= 0) {
> 			return true;
> 		}
>@@ -395,12 +401,6 @@
> 			return new GdbDebugServicesFactoryNS(version);
> 		}
> 
>-		if (version.startsWith("6.6") ||  //$NON-NLS-1$
>-			version.startsWith("6.7") ||  //$NON-NLS-1$
>-			version.startsWith("6.8")) {  //$NON-NLS-1$
>-			return new GdbDebugServicesFactory(version);
>-		}
>-
> 		return new GdbDebugServicesFactory(version);
> 	}
> }
>Index: src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java,v
>retrieving revision 1.6
>diff -u -r1.6 LaunchUtils.java
>--- src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java	2 Sep 2009 15:05:18 -0000	1.6
>+++ src/org/eclipse/cdt/dsf/gdb/launching/LaunchUtils.java	8 Jan 2010 01:39:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Ericsson and others.
>+ * Copyright (c) 2010 Ericsson and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,6 +7,7 @@
>  *
>  * Contributors:
>  * Ericsson   - Initial API and implementation
>+ * Ericsson   - Added support for Mac OS
>  *******************************************************************************/
> package org.eclipse.cdt.dsf.gdb.launching;
> 
>@@ -43,6 +44,12 @@
> 
> public class LaunchUtils {
> 
>+	/**
>+	 * A prefix that we use to indicate that a GDB version is for MAC OS
>+	 * @since 2.1
>+	 */
>+	public static final String MACOS_GDB_PREFIX = "APPLE"; //$NON-NLS-1$
>+	
>    	/**
> 	 * Verify the following things about the project:
> 	 * - is a valid project name given
>@@ -212,7 +219,27 @@
>      */
> 	public static String getGDBVersionFromText(String versionOutput) {
>         String version = "";//$NON-NLS-1$
>-        
>+
>+        // First look for the case of Apple's GDB, since the version must be handled differently
>+        // The format is:
>+        // GNU gdb 6.3.50-20050815 (Apple version gdb-696) (Sat Oct 20 18:20:28 GMT 2007)
>+        // GNU gdb 6.3.50-20050815 (Apple version gdb-966) (Tue Mar 10 02:43:13 UTC 2009)
>+        // GNU gdb 6.3.50-20050815 (Apple version gdb-1346) (Fri Sep 18 20:40:51 UTC 2009)
>+        // Also, it seems the version that changes is the "Apple version" so that is the
>+        // one we will extract.  The normal GDB version is fixed and won't help us.
>+        if (versionOutput.toLowerCase().indexOf("apple") != -1) {  //$NON-NLS-1$
>+        	// Add a prefix to indicate we are dealing with an Apple GDB
>+        	version = MACOS_GDB_PREFIX;
>+    		Pattern pattern = Pattern.compile(" \$Apple version gdb-(\\d*)\$",  Pattern.MULTILINE); //$NON-NLS-1$
>+
>+    		Matcher matcher = pattern.matcher(versionOutput);
>+    		if (matcher.find()) {
>+    			version += matcher.group(1);
>+    		}
>+    		
>+    		return version;
>+        }
>+        		
> 		// These are the GDB version patterns I have seen up to now
> 		// The pattern works for all of them extracting the version of 6.8.50.20080730
> 		// GNU gdb 6.8.50.20080730
>Index: src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java,v
>retrieving revision 1.6
>diff -u -r1.6 GdbDebugServicesFactory.java
>--- src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java	18 Dec 2009 18:59:42 -0000	1.6
>+++ src/org/eclipse/cdt/dsf/gdb/service/GdbDebugServicesFactory.java	8 Jan 2010 01:39:47 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Ericsson and others.
>+ * Copyright (c) 2010 Ericsson and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -7,7 +7,8 @@
>  * 
>  * Contributors:
>  *     Ericsson - initial API and implementation
>- *     Nokia - create and use backend service. 
>+ *     Nokia    - create and use backend service.
>+ *     Ericsson - Added support for Mac OS
>  *******************************************************************************/
> package org.eclipse.cdt.dsf.gdb.service;
> 
>@@ -24,14 +25,16 @@
> import org.eclipse.cdt.dsf.debug.service.ISourceLookup;
> import org.eclipse.cdt.dsf.debug.service.IStack;
> import org.eclipse.cdt.dsf.debug.service.command.ICommandControl;
>+import org.eclipse.cdt.dsf.gdb.launching.LaunchUtils;
> import org.eclipse.cdt.dsf.gdb.service.command.GDBControl;
> import org.eclipse.cdt.dsf.gdb.service.command.GDBControl_7_0;
>+import org.eclipse.cdt.dsf.gdb.service.macos.MacOSGDBExpressions;
> import org.eclipse.cdt.dsf.mi.service.CSourceLookup;
>-import org.eclipse.cdt.dsf.mi.service.MIExpressions;
> import org.eclipse.cdt.dsf.mi.service.IMIBackend;
> import org.eclipse.cdt.dsf.mi.service.MIBreakpoints;
> import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
> import org.eclipse.cdt.dsf.mi.service.MIDisassembly;
>+import org.eclipse.cdt.dsf.mi.service.MIExpressions;
> import org.eclipse.cdt.dsf.mi.service.MIMemory;
> import org.eclipse.cdt.dsf.mi.service.MIModules;
> import org.eclipse.cdt.dsf.mi.service.MIRegisters;
>@@ -44,10 +47,24 @@
> 	// This should eventually be "7.0" once GDB 7.0 is released
> 	private static final String GDB_7_0_VERSION = "6.8.50.20090218"; //$NON-NLS-1$
> 	
>+	// Contains the GDB version string such as
>+	// 7.0
>+	// 6.8.50.20090218
>+	// For MacOS, it contains the Apple version number, such as
>+	// 969
>+	// 1465
> 	private final String fVersion;
> 	
>+	// Indicate if we are dealing with a Mac OS GDB
>+	private boolean fIsMacOSGdb = false;
>+	
> 	public GdbDebugServicesFactory(String version) {
>-		fVersion = version;
>+		if (version.startsWith(LaunchUtils.MACOS_GDB_PREFIX)) {
>+			fIsMacOSGdb = true;
>+			fVersion = version.substring(LaunchUtils.MACOS_GDB_PREFIX.length());
>+		} else {
>+			fVersion = version;
>+		}
> 	}
> 	
> 	public String getVersion() { return fVersion; }
>@@ -73,16 +90,22 @@
> 			}
> 		}
> 
>-
>         return super.createService(clazz, session);
> 	}
> 
> 	protected MIBreakpointsManager createBreakpointManagerService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MIBreakpointsManager(session, CDebugCorePlugin.PLUGIN_ID);
>+		}
> 		return new MIBreakpointsManager(session, CDebugCorePlugin.PLUGIN_ID);
> 	}
> 
> 	@Override
> 	protected IBreakpoints createBreakpointService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MIBreakpoints(session);
>+		}
>+		
> 		if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) {
> 			return new GDBBreakpoints_7_0(session);
> 		}
>@@ -90,6 +113,10 @@
> 	}
> 	
> 	protected ICommandControl createCommandControl(DsfSession session, ILaunchConfiguration config) {
>+		if (fIsMacOSGdb) {
>+			return new GDBControl(session, config);
>+		}
>+		
> 		if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) {
> 			return new GDBControl_7_0(session, config);
> 		}
>@@ -97,21 +124,37 @@
> 	}
> 
> 	protected IMIBackend createBackendGDBService(DsfSession session, ILaunchConfiguration lc) {
>+		if (fIsMacOSGdb) {
>+			return new GDBBackend(session, lc);
>+		}
>+		
> 		return new GDBBackend(session, lc);
> 	}
> 
> 	@Override
> 	protected IDisassembly createDisassemblyService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MIDisassembly(session);
>+		}
>+		
> 		return new MIDisassembly(session);
> 	}
> 	
> 	@Override
> 	protected IExpressions createExpressionService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MacOSGDBExpressions(session);
>+		}
>+		
> 		return new MIExpressions(session);
> 	}
> 
> 	@Override
> 	protected IMemory createMemoryService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MIMemory(session);
>+		}
>+		
> 		if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) {
> 			return new GDBMemory_7_0(session);
> 		}
>@@ -121,11 +164,19 @@
> 
> 	@Override
> 	protected IModules createModulesService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MIModules(session);
>+		}
>+		
> 		return new MIModules(session);
> 	}
> 		
> 	@Override
> 	protected IProcesses createProcessesService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new GDBProcesses(session);
>+		}
>+		
> 		if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) {
> 			return new GDBProcesses_7_0(session);
> 		}
>@@ -134,11 +185,19 @@
> 
> 	@Override
> 	protected IRegisters createRegistersService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MIRegisters(session);
>+		}
>+		
> 		return new MIRegisters(session);
> 	}
> 
> 	@Override
> 	protected IRunControl createRunControlService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new GDBRunControl(session);
>+		}
>+		
> 		if (GDB_7_0_VERSION.compareTo(fVersion) <= 0) {
> 			return new GDBRunControl_7_0(session);
> 		}
>@@ -147,11 +206,19 @@
> 
> 	@Override
> 	protected ISourceLookup createSourceLookupService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new CSourceLookup(session);
>+		}
>+		
> 		return new CSourceLookup(session);
> 	}
> 	
> 	@Override
> 	protected IStack createStackService(DsfSession session) {
>+		if (fIsMacOSGdb) {
>+			return new MIStack(session);
>+		}
>+		
> 		return new MIStack(session);
> 	}
> }
>Index: src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java
>===================================================================
>RCS file: src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java
>diff -N src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBExpressions.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,32 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 Wind River Systems and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     Wind River Systems - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.cdt.dsf.gdb.service.macos;
>+
>+import org.eclipse.cdt.dsf.mi.service.MIExpressions;
>+import org.eclipse.cdt.dsf.mi.service.MIVariableManager;
>+import org.eclipse.cdt.dsf.service.DsfSession;
>+
>+/**
>+ * Specific ExpressionService for MacOS
>+ * 
>+ * @since 2.1
>+ */
>+public class MacOSGDBExpressions extends MIExpressions {
>+
>+    public MacOSGDBExpressions(DsfSession session) {
>+        super(session);
>+    }
>+
>+    @Override
>+    protected MIVariableManager createMIVariableManager() {
>+        return new MacOSGDBVariableManager(getSession(), getServicesTracker());
>+    }
>+}
>Index: src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java
>===================================================================
>RCS file: src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java
>diff -N src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/cdt/dsf/gdb/service/macos/MacOSGDBVariableManager.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,136 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 Wind River Systems and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ *     Wind River Systems - initial API and implementation
>+ *******************************************************************************/
>+package org.eclipse.cdt.dsf.gdb.service.macos;
>+
>+import org.eclipse.cdt.dsf.concurrent.DataRequestMonitor;
>+import org.eclipse.cdt.dsf.mi.service.MIVariableManager;
>+import org.eclipse.cdt.dsf.mi.service.command.commands.macos.MacOSMIVarUpdate;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIVarChange;
>+import org.eclipse.cdt.dsf.mi.service.command.output.macos.MacOSMIVarUpdateInfo;
>+import org.eclipse.cdt.dsf.service.DsfServicesTracker;
>+import org.eclipse.cdt.dsf.service.DsfSession;
>+
>+/**
>+ * Specific VariableManager for MacOS
>+ *   
>+ * @since 2.1
>+ */
>+public class MacOSGDBVariableManager extends MIVariableManager {
>+
>+    public MacOSGDBVariableManager(DsfSession session, DsfServicesTracker tracker) {
>+        super(session, tracker);
>+    }
>+
>+    @Override
>+    protected MIRootVariableObject createRootVariableObject(VariableObjectId id) {
>+    	return new MacOSGDBRootVariableObject(id);
>+    }
>+    
>+	private class MacOSGDBRootVariableObject extends MIRootVariableObject {
>+
>+		public MacOSGDBRootVariableObject(VariableObjectId id) {
>+			super(id);
>+		}
>+
>+		@Override
>+		public void update(final DataRequestMonitor<Boolean> rm) {
>+
>+			if (isOutOfScope()) {
>+		    	rm.setData(false);
>+				rm.done();
>+			} else if (currentState != STATE_READY) {
>+				// Object is not fully created or is being updated
>+				// so add RequestMonitor to pending queue
>+				updatesPending.add(rm);
>+			} else if (getOutOfDate() == false) {
>+				rm.setData(false);
>+				rm.done();
>+			} else {
>+				// Object needs to be updated in the back-end
>+				currentState = STATE_UPDATING;
>+
>+				// In GDB, var-update will only report a change if -var-evaluate-expression has
>+				// changed -- in the current format--.  This means that situations like
>+				// double z = 1.2;
>+				// z = 1.4;
>+				// Will not report a change if the format is anything else than natural.
>+				// This is because 1.2 and 1.4 are both printed as 1, 0x1, etc
>+				// Since we cache the values of every format, we must know if -any- format has
>+				// changed, not just the current one.
>+				// To solve this, we always do an update in the natural format; I am not aware
>+				// of any case where the natural format would stay the same, but another format
>+				// would change.  However, since a var-update update all children as well,
>+			    // we must make sure these children are also in the natural format
>+				// The simplest way to do this is that whenever we change the format
>+				// of a variable object, we immediately set it back to natural with a second
>+				// var-set-format command.  This is done in the getValue() method
>+				getCommandControl().queueCommand(
>+						new MacOSMIVarUpdate(getRootToUpdate().getControlDMContext(), getGdbName()),
>+						new DataRequestMonitor<MacOSMIVarUpdateInfo>(getSession().getExecutor(), rm) {
>+							@Override
>+							protected void handleCompleted() {
>+								currentState = STATE_READY;
>+								
>+								if (isSuccess()) {
>+									setOutOfDate(false);
>+
>+									MIVarChange[] changes = getData().getMIVarChanges();
>+									if (changes.length > 0 && changes[0].isInScope() == false) {
>+										// Object is out-of-scope
>+										outOfScope = true;
>+										
>+										// We can delete this root in GDB right away.  This is safe, even
>+									 	// if the root has children, because they are also out-of-scope.
>+										// We -must- also remove this entry from our LRU.  If we don't
>+										// we can end-up with a race condition that create this object
>+										// twice, or have an infinite loop while never re-creating the object.
>+										// The can happen if we update a child first then we request 
>+										// the root later,
>+										getLRUCache().remove(getInternalId());
>+
>+										rm.setData(true);
>+										rm.done();
>+									} else {
>+										// The root object is now up-to-date, we must parse the changes, if any.
>+										processChanges(changes);
>+
>+										// We only mark this root as updated in our list if it is in-scope.
>+										// For out-of-scope object, we don't ever need to re-update them so
>+										// we don't need to add them to this list.
>+										rootVariableUpdated(MacOSGDBRootVariableObject.this);
>+
>+										rm.setData(false);
>+										rm.done();
>+									}
>+
>+									while (updatesPending.size() > 0) {
>+										DataRequestMonitor<Boolean> pendingRm = updatesPending.poll();
>+										pendingRm.setData(false);
>+										pendingRm.done();
>+									}
>+								} else {
>+									// We were not able to update for some reason
>+									rm.setData(false);
>+									rm.done();
>+
>+									while (updatesPending.size() > 0) {
>+										DataRequestMonitor<Boolean> pendingRm = updatesPending.poll();
>+										pendingRm.setStatus(getStatus());
>+										pendingRm.done();
>+									}
>+								}
>+							}
>+						});
>+		    }
>+		}
>+	}
>+	
>+}
>Index: src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java,v
>retrieving revision 1.5
>diff -u -r1.5 MIExpressions.java
>--- src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java	17 Dec 2009 18:44:58 -0000	1.5
>+++ src/org/eclipse/cdt/dsf/mi/service/MIExpressions.java	8 Jan 2010 01:39:48 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2006, 2008 Wind River Systems and others.
>+ * Copyright (c) 2010 Wind River Systems and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -452,7 +452,7 @@
>         // to the back-end, through the MICommandControl service
> 		// It must be created after the ExpressionService is registered
> 		// since it will need to find it.
>-        varManager = new MIVariableManager(getSession(), getServicesTracker());
>+        varManager = createMIVariableManager();
> 
>         // Create the meta command cache which will use the variable manager
>         // to actually send MI commands to the back-end
>@@ -464,6 +464,16 @@
> 	}
> 
> 	/**
>+	 * Creates the MI variable manager to be used by this expression service.
>+	 * Overriding classes may override to provide a custom services tracker. 
>+	 * 
>+	 * @since 2.1
>+	 */
>+	protected MIVariableManager createMIVariableManager() {
>+	    return new MIVariableManager(getSession(), getServicesTracker());
>+	}
>+	
>+	/**
> 	 * This method shuts down this service. It unregisters the service, stops
> 	 * receiving service events, and calls the superclass shutdown() method to
> 	 * finish the shutdown process.
>Index: src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java,v
>retrieving revision 1.2
>diff -u -r1.2 MIVariableManager.java
>--- src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java	4 Mar 2009 04:09:30 -0000	1.2
>+++ src/org/eclipse/cdt/dsf/mi/service/MIVariableManager.java	8 Jan 2010 01:39:48 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2008 Monta Vista and others.
>+ * Copyright (c) 2010 Monta Vista and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -697,7 +697,7 @@
> 	        							}
> 
> 	        							if (childVar == null) {
>-	        								childVar = new MIVariableObject(childId, MIVariableObject.this);
>+	        								childVar = createVariableObject(childId, MIVariableObject.this);
> 	        								childVar.setGdbName(child.getVarName());
> 	        								childVar.setExpressionData(
> 	        										childFullExpression,
>@@ -914,7 +914,19 @@
> 		}
> 	}
> 	
>-	private class MIRootVariableObject extends MIVariableObject {
>+	/**
>+	 * Method to allow to override the MIVariableObject creation
>+	 * 
>+     * @since 2.1
>+     */
>+	protected MIVariableObject createVariableObject(VariableObjectId id, MIVariableObject parentObj) {
>+	    return new MIVariableObject(id, parentObj);
>+	}
>+	
>+	/**
>+     * @since 2.1
>+     */
>+	public class MIRootVariableObject extends MIVariableObject {
> 
> 		// Only root variables go through the GDB creation process
> 		protected static final int STATE_NOT_CREATED = 10;
>@@ -925,7 +937,7 @@
> 		// will have the same control context
> 	    private ICommandControlDMContext fControlContext = null;
> 	    
>-		private boolean outOfDate = false;
>+		private boolean fOutOfDate = false;
> 		
> 	    // Modifiable descendants are any variable object that is a descendant or itself for
> 	    // which the value can change.
>@@ -940,8 +952,10 @@
> 		public ICommandControlDMContext getControlDMContext() { return fControlContext; }
> 
> 		public boolean isUpdating() { return currentState == STATE_UPDATING; }
>-
>-		public void markAsOutOfDate() { outOfDate = true; }
>+        
>+		public void setOutOfDate(boolean outOfDate) { fOutOfDate = outOfDate; }
>+		
>+		public boolean getOutOfDate() { return fOutOfDate; }
> 		
> 		// Remember that we must add ourself as a modifiable descendant if our value can change
> 		public void addModifiableDescendant(String gdbName, MIVariableObject descendant) {
>@@ -1033,7 +1047,7 @@
> 				// Object is not fully created or is being updated
> 				// so add RequestMonitor to pending queue
> 				updatesPending.add(rm);
>-			} else if (outOfDate == false) {
>+			} else if (getOutOfDate() == false) {
> 				rm.setData(false);
> 				rm.done();
> 			} else {
>@@ -1063,7 +1077,7 @@
> 								currentState = STATE_READY;
> 								
> 								if (isSuccess()) {
>-									outOfDate = false;
>+									setOutOfDate(false);
> 
> 									MIVarChange[] changes = getData().getMIVarChanges();
> 									if (changes.length > 0 && changes[0].isInScope() == false) {
>@@ -1088,7 +1102,7 @@
> 										// We only mark this root as updated in our list if it is in-scope.
> 										// For out-of-scope object, we don't ever need to re-update them so
> 										// we don't need to add them to this list.
>-										updatedRootList.add(MIRootVariableObject.this);
>+										rootVariableUpdated(MIRootVariableObject.this);
> 
> 										rm.setData(false);
> 										rm.done();
>@@ -1138,9 +1152,16 @@
> 		    } else {
> 		        // Variable was never created or was already deleted, no need to do anything.
> 		    }
>-		}		
>-		
>-
>+		}
>+	}
>+	
>+    /**
>+ 	 * Method to allow to override the MIRootVariableObject creation.
>+	 *
>+     * @since 2.1
>+     */
>+	protected MIRootVariableObject createRootVariableObject(VariableObjectId id) {
>+	    return new MIRootVariableObject(id);
> 	}
> 	
> 	/**
>@@ -1153,8 +1174,10 @@
> 	 *     
> 	 * Note that if no frameContext is specified (only Execution, or even only Container), which can
> 	 * characterize a global variable for example, we will only use the available information.
>+	 * 
>+	 * @since 2.1
> 	 */
>-	private class VariableObjectId {
>+	public class VariableObjectId {
> 		// We don't use the expression context because it is not safe to compare them
> 		// See bug 187718.  So we store the expression itself, and it's parent execution context.
> 		String fExpression = null;
>@@ -1163,6 +1186,9 @@
>         // the same frame will have a different level based on the current depth of the stack 
> 		Integer fFrameId = null;
> 		
>+		public VariableObjectId() {
>+		}
>+		
> 		@Override
> 		public boolean equals(Object other) {
> 			if (other instanceof VariableObjectId) {
>@@ -1220,6 +1246,16 @@
> 		}
> 	}
> 	
>+    /**
>+ 	 * Method to allow to override the VariableObjectId creation.
>+	 *
>+     * @since 2.1
>+     */
>+	protected VariableObjectId createVariableObjectId() {
>+	    return new VariableObjectId();
>+	}
>+
>+	
> 	/**
> 	 * This is the real work horse of managing our objects. Not only must every
> 	 * value be unique to get inserted, this also creates an LRU (least recently
>@@ -1338,6 +1374,34 @@
>     	fSession.removeServiceEventListener(this);
> 	}
> 
>+    /**
>+     * @since 2.1
>+     */
>+	protected DsfSession getSession() {
>+	    return fSession;
>+	}
>+	
>+	/**
>+     * @since 2.1
>+     */
>+	protected ICommandControl getCommandControl() {
>+	    return fCommandControl;
>+	}
>+	
>+    /**
>+     * @since 2.1
>+     */
>+	protected void rootVariableUpdated(MIRootVariableObject rootObj) {
>+	    updatedRootList.add(rootObj);
>+	}
>+	
>+    /**
>+     * @since 2.1
>+     */
>+	protected Map<VariableObjectId, MIVariableObject> getLRUCache() {
>+		return lruVariableList;
>+	}
>+	
> 	/** 
> 	 * This method returns a variable object based on the specified
> 	 * ExpressionDMC, creating it in GDB if it was not created already.
>@@ -1354,7 +1418,7 @@
>                              final DataRequestMonitor<MIVariableObject> rm) {
> 		// Generate an id for this expression so that we can determine if we already
> 		// have a variable object tracking it.  If we don't we'll need to create one.
>-		final VariableObjectId id = new VariableObjectId();
>+		final VariableObjectId id = createVariableObjectId();
> 		id.generateId(
> 				exprCtx,
> 				new RequestMonitor(fSession.getExecutor(), rm) {
>@@ -1431,7 +1495,7 @@
> 
> 		// Variable objects that are created directly like this, are considered ROOT variable objects
> 		// in comparison to variable objects that are children of other variable objects.
>-		final MIRootVariableObject newVarObj = new MIRootVariableObject(id);
>+		final MIRootVariableObject newVarObj = createRootVariableObject(id);
> 		
> 		// We must put this object in our map right away, in case it is 
> 		// requested again, before it completes its creation.
>@@ -1443,7 +1507,7 @@
> 			protected void handleCompleted() {
> 				if (isSuccess()) {
> 					// Also store the object as a varObj that is up-to-date
>-					updatedRootList.add(newVarObj);
>+    				rootVariableUpdated(newVarObj);	
> 					// VarObj can now be used by others
> 					newVarObj.creationCompleted(true);
> 
>@@ -1625,7 +1689,7 @@
>     					}
>     				});
>     	
>-    	} else if (command instanceof MIDataEvaluateExpression) {
>+    	} else if (command instanceof MIDataEvaluateExpression<?>) {
>     		// This does not use the variable objects but sends the command directly to the back-end
> 			fCommandControl.queueCommand(command, rm);
>     	} else {
>@@ -1684,7 +1748,7 @@
>     public void markAllOutOfDate() {
>     	MIRootVariableObject root;
>     	while ((root = updatedRootList.poll()) != null) {
>-    		root.markAsOutOfDate();
>+    		root.setOutOfDate(true);
>     	}       
>     }
> 
>Index: src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java
>===================================================================
>RCS file: src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java
>diff -N src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/cdt/dsf/mi/service/command/commands/macos/MacOSMIVarUpdate.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,49 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 QNX Software Systems and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     QNX Software Systems - Initial API and implementation
>+ *     Wind River Systems   - Modified for new DSF Reference Implementation
>+ *     Ericsson				- Modified for handling of frame contexts
>+ *******************************************************************************/
>+
>+package org.eclipse.cdt.dsf.mi.service.command.commands.macos;
>+
>+import org.eclipse.cdt.dsf.debug.service.command.ICommandControlService.ICommandControlDMContext;
>+import org.eclipse.cdt.dsf.mi.service.command.commands.MICommand;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput;
>+import org.eclipse.cdt.dsf.mi.service.command.output.macos.MacOSMIVarUpdateInfo;
>+
>+/**
>+ * 
>+ *     -var-update [print-values] {NAME | "*"}
>+ *
>+ *  Update the value of the variable object NAME by evaluating its
>+ *  expression after fetching all the new values from memory or registers.
>+ *  A `*' causes all existing variable objects to be updated.
>+ *  If print-values has a value for of 0 or --no-values, print only the names of the variables; 
>+ *  if print-values is 1 or --all-values, also print their values; 
>+ *  if it is 2 or --simple-values print the name and value for simple data types and just 
>+ *  the name for arrays, structures and unions. 
>+ *  
>+ *  It seems that for MacOS, we must use the full string for print-values, such as
>+ *  --all-values.
>+ * 
>+ * @since 2.1
>+ */
>+public class MacOSMIVarUpdate extends MICommand<MacOSMIVarUpdateInfo> {
>+
>+	public MacOSMIVarUpdate(ICommandControlDMContext dmc, String name) {
>+		// Must use --all-values instead of 1 for Mac OS
>+		super(dmc, "-var-update", new String[] { "--all-values", name }); //$NON-NLS-1$//$NON-NLS-2$
>+	}
>+	
>+    @Override
>+    public MacOSMIVarUpdateInfo getResult(MIOutput out) {
>+        return new MacOSMIVarUpdateInfo(out);
>+    }
>+}
>Index: src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java
>===================================================================
>RCS file: src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java
>diff -N src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/cdt/dsf/mi/service/command/output/macos/MacOSMIVarUpdateInfo.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,123 @@
>+/*******************************************************************************
>+ * Copyright (c) 2010 QNX Software Systems and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *     QNX Software Systems - Initial API and implementation
>+ *     Ericsson             - Created version for Mac OS
>+ *******************************************************************************/
>+package org.eclipse.cdt.dsf.mi.service.command.output.macos;
>+
>+import java.util.ArrayList;
>+import java.util.List;
>+
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIConst;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIInfo;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIList;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIOutput;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIResult;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIResultRecord;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MITuple;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIValue;
>+import org.eclipse.cdt.dsf.mi.service.command.output.MIVarChange;
>+
>+/**
>+ * GDB/MI var-update for Mac OS.
>+ * -var-update *
>+ * ^done,changelist=[varobj={name="var1",in_scope="true",type_changed="false"}],time={.....}
>+ * 
>+ * @since 2.1
>+ */
>+public class MacOSMIVarUpdateInfo extends MIInfo {
>+
>+	MIVarChange[] changeList;
>+
>+	public MacOSMIVarUpdateInfo(MIOutput record) {
>+		super(record);
>+        List<MIVarChange> aList = new ArrayList<MIVarChange>();
>+        if (isDone()) {
>+            MIOutput out = getMIOutput();
>+            MIResultRecord rr = out.getMIResultRecord();
>+            if (rr != null) {
>+                MIResult[] results =  rr.getMIResults();
>+                for (int i = 0; i < results.length; i++) {
>+                    String var = results[i].getVariable();
>+                    if (var.equals("changelist")) { //$NON-NLS-1$
>+                        MIValue value = results[i].getMIValue();
>+                        if (value instanceof MITuple) {
>+                            parseChangeList((MITuple)value, aList);
>+                        } else if (value instanceof MIList) {
>+                            parseChangeList((MIList)value, aList);
>+                        }
>+                    }
>+                }
>+            }
>+        }
>+        changeList = aList.toArray(new MIVarChange[aList.size()]);
>+	}
>+
>+	public MIVarChange[] getMIVarChanges() {
>+		return changeList;
>+	}
>+
>+	/**
>+	 * For MI2 the format is now a MIList.
>+	 * @param tuple
>+	 * @param aList
>+	 */
>+	void parseChangeList(MIList miList, List<MIVarChange> aList) {
>+		// The MIList in Apple gdb contains MIResults instead of MIValues. It looks like:
>+		// ^done,changelist=[varobj={name="var1",in_scope="true",type_changed="false"}],time={.....}
>+		// Bug 250037
>+		MIResult[] results = miList.getMIResults();
>+		for (int i = 0; i < results.length; i++) {
>+			String var = results[i].getVariable();
>+			if (var.equals("varobj")) { //$NON-NLS-1$
>+				MIValue value = results[i].getMIValue();
>+				if (value instanceof MITuple) {
>+					parseChangeList((MITuple)value, aList);
>+				} else if (value instanceof MIList) {
>+					parseChangeList((MIList)value, aList);
>+				}
>+			}
>+		}
>+	} 
>+	
>+	void parseChangeList(MITuple tuple, List<MIVarChange> aList) {
>+		MIResult[] results = tuple.getMIResults();
>+		MIVarChange change = null;
>+		for (int i = 0; i < results.length; i++) {
>+			String var = results[i].getVariable();
>+			MIValue value = results[i].getMIValue();
>+			if (value instanceof MITuple) {
>+				parseChangeList((MITuple)value, aList);
>+			}
>+			else
>+			{
>+				String str = ""; //$NON-NLS-1$
>+				if (value instanceof MIConst) {
>+					str = ((MIConst)value).getString();
>+				}
>+				if (var.equals("name")) { //$NON-NLS-1$
>+					change = new MIVarChange(str);
>+					aList.add(change);
>+				} else if (var.equals("value")) { //$NON-NLS-1$
>+					if (change != null) {
>+						change.setValue(str);
>+					}
>+				} else if (var.equals("in_scope")) { //$NON-NLS-1$
>+					if (change != null) {
>+						change.setInScope("true".equals(str)); //$NON-NLS-1$
>+					}
>+				} else if (var.equals("type_changed")) { //$NON-NLS-1$
>+					if (change != null) {
>+						change.setChanged("true".equals(str)); //$NON-NLS-1$
>+					}
>+				}				
>+			}
>+		}
>+	}
>+}

Flags:

marc.khouzam: iplog-

Actions: View | Diff

Attachments on bug 298883: 155504 | 155544 | 155563 | 155564 | 155570 | 155584 | 155648