Attachment 190711 Details for Bug 326951 – New implementation of shutdown sequence.

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

[patch] New implementation of shutdown sequence.

ShutdownSequence-patch.txt (text/plain), 8.66 KB, created by Nobody - feel free to take it

on 2011-03-08 17:55:15 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Nobody - feel free to take it

Created: 2011-03-08 17:55:15 EST

Size: 8.66 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.dsf.gdb
>Index: src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt/dsf-gdb/org.eclipse.cdt.dsf.gdb/src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java,v
>retrieving revision 1.3
>diff -u -r1.3 ShutdownSequence.java
>--- src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java	29 Jan 2010 14:37:01 -0000	1.3
>+++ src/org/eclipse/cdt/dsf/gdb/launching/ShutdownSequence.java	8 Mar 2011 22:45:41 -0000
>@@ -10,40 +10,59 @@
>  *******************************************************************************/
> package org.eclipse.cdt.dsf.gdb.launching;
> 
>+import java.util.ArrayList;
>+import java.util.Collections;
>+import java.util.Comparator;
>+import java.util.List;
>+
> import org.eclipse.cdt.dsf.concurrent.DsfExecutor;
> import org.eclipse.cdt.dsf.concurrent.RequestMonitor;
> import org.eclipse.cdt.dsf.concurrent.Sequence;
>-import org.eclipse.cdt.dsf.debug.service.IBreakpoints;
>-import org.eclipse.cdt.dsf.debug.service.IDisassembly;
>-import org.eclipse.cdt.dsf.debug.service.IExpressions;
>-import org.eclipse.cdt.dsf.debug.service.IMemory;
>-import org.eclipse.cdt.dsf.debug.service.IModules;
>-import org.eclipse.cdt.dsf.debug.service.IProcesses;
>-import org.eclipse.cdt.dsf.debug.service.IRegisters;
>-import org.eclipse.cdt.dsf.debug.service.IRunControl;
>-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.internal.GdbPlugin;
>-import org.eclipse.cdt.dsf.gdb.service.IGDBTraceControl;
>-import org.eclipse.cdt.dsf.mi.service.IMIBackend;
>-import org.eclipse.cdt.dsf.mi.service.MIBreakpointsManager;
>-import org.eclipse.cdt.dsf.service.DsfServicesTracker;
> import org.eclipse.cdt.dsf.service.IDsfService;
>+import org.osgi.framework.InvalidSyntaxException;
>+import org.osgi.framework.ServiceReference;
> 
> public class ShutdownSequence extends Sequence {
> 
>-    String fSessionId;
>-
>-    String fApplicationName;
>-
>-    String fDebugModelId;
>-
>-    DsfServicesTracker fTracker;
>+	class ServiceShutdownStep extends Step {
>+		
>+		IDsfService fService;
>+
>+		ServiceShutdownStep( IDsfService service ) {
>+			super();
>+			fService = service;
>+		}
>+
>+		/* (non-Javadoc)
>+		 * @see org.eclipse.cdt.dsf.concurrent.Sequence.Step#execute(org.eclipse.cdt.dsf.concurrent.RequestMonitor)
>+		 */
>+		@Override
>+		public void execute( final RequestMonitor rm ) {
>+			fService.shutdown( new RequestMonitor( getExecutor(), rm ) {
>+
>+				/* (non-Javadoc)
>+				 * @see org.eclipse.cdt.dsf.concurrent.RequestMonitor#handleCompleted()
>+				 */
>+				@Override
>+				protected void handleCompleted() {
>+					if ( !isSuccess() ) {
>+						GdbPlugin.getDefault().getLog().log( getStatus() );
>+					}
>+					rm.done();
>+				}
>+			} );
>+		}
>+	}
>+
>+    private String fSessionId;
>+    
>+    private Step[] fSteps;
> 
>     public ShutdownSequence(DsfExecutor executor, String sessionId, RequestMonitor requestMonitor) {
>         super(executor, requestMonitor);
>         fSessionId = sessionId;
>+        fSteps = createSteps();
>     }
> 
>     @Override
>@@ -51,116 +70,38 @@
>         return fSteps;
>     }
> 
>-    private final Step[] fSteps = new Step[] { new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            assert GdbPlugin.getBundleContext() != null;
>-            fTracker = new DsfServicesTracker(GdbPlugin.getBundleContext(), fSessionId);
>-            requestMonitor.done();
>-        }
>-
>-        @Override
>-        public void rollBack(RequestMonitor requestMonitor) {
>-            fTracker.dispose();
>-            fTracker = null;
>-            requestMonitor.done();
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IGDBTraceControl.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IDisassembly.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IRegisters.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(MIBreakpointsManager.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IBreakpoints.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(ISourceLookup.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IExpressions.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IStack.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IModules.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IMemory.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IRunControl.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IProcesses.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(ICommandControl.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            shutdownService(IMIBackend.class, requestMonitor);
>-        }
>-    }, new Step() {
>-        @Override
>-        public void execute(RequestMonitor requestMonitor) {
>-            fTracker.dispose();
>-            fTracker = null;
>-            requestMonitor.done();
>-        }
>-    } };
>-
>-    @SuppressWarnings("unchecked")
>-    private void shutdownService(Class clazz, final RequestMonitor requestMonitor) {
>-        IDsfService service = (IDsfService)fTracker.getService(clazz);
>-        if (service != null) {
>-            service.shutdown(new RequestMonitor(getExecutor(), requestMonitor) {
>-                @Override
>-                protected void handleCompleted() {
>-                    if (!isSuccess()) {
>-                        GdbPlugin.getDefault().getLog().log(getStatus());
>-                    }
>-                    requestMonitor.done();
>-                }
>-            });
>-        } else {
>-        	// It is possible that a particular service was not instantiated at all
>-        	// depending on our backend
>-            requestMonitor.done();
>-        }
>-    }
>+	private Step[] createSteps() {
>+		IDsfService[] services = getServices();
>+		ServiceShutdownStep[] steps = new ServiceShutdownStep[services.length];
>+		for ( int i = 0; i < steps.length; ++i )
>+			steps[i] = new ServiceShutdownStep( services[i] );
>+		return steps;
>+	}
>+	
>+	private IDsfService[] getServices() {
>+		IDsfService[] result = new IDsfService[0];
>+		try {
>+			ServiceReference<?>[] serviceRefs = GdbPlugin.getBundleContext().getServiceReferences( 
>+					IDsfService.class.getName(),
>+					String.format( "(%s=%s)", IDsfService.PROP_SESSION_ID, fSessionId ).intern() ); //$NON-NLS-1$
>+			List<IDsfService> services = new ArrayList<IDsfService>( serviceRefs.length );
>+			for ( ServiceReference<?> ref : serviceRefs ) {
>+				Object serviceObj = GdbPlugin.getBundleContext().getService( ref );
>+				if ( serviceObj instanceof IDsfService ) {
>+					services.add( (IDsfService)serviceObj );
>+				}
>+			}
>+			Collections.sort( services, new Comparator<IDsfService>() {
>+
>+				public int compare( IDsfService o1, IDsfService o2 ) {
>+					return o2.getStartupNumber() - o1.getStartupNumber();
>+				}
>+			} );
>+			result = services.toArray( new IDsfService[services.size()] );
>+		}
>+		catch( InvalidSyntaxException e ) {
>+			// Shouldn't happen
>+		}
>+		return result;
>+	}
> }

Flags:

nobody: iplog-

Actions: View | Diff

Attachments on bug 326951: 180190 | 186578 | 189393 | 190711