On Thu, 2005-08-04 at 18:22 -0400, Bryce McKinlay wrote:
> Aaron Luchko wrote:
>
> >+ try
> >+ {
> >+ if ((invokeOpts &
> >JdwpConstants.InvokeOptions.INVOKE_SINGLE_THREADED)
> >+ != 0)
> >+ {
> >+ // We must suspend all running threads first
> >+ suspendSuccess =
> >vm.suspendAllThreadsExcept(Thread.currentThread().
> >+ getThreadGroup());
> >+ }
> >+ return vm.executeMethod(null, thread, clazz, method, values,
> >+ false);
> >+ }
> >+ catch (Exception ex)
> >+ {
> >+ if (suspendSuccess)
> >+ { // We must first resume the suspended threads
> >+
> >vm.resumeAllThreadsExcept(Thread.currentThread().getThreadGroup());
> >+ }
> >
> >
>
> What happens if some threads are already suspended by the debugger?
> Looks like this would resume them which wouldn't be the expected behaviour.
If a thread must be resumed as many times as it's been suspended in
order to resume fully, this is the behavior of resumeAllThreadsExcept.
However you did bring to my attention an error I made in this patch
where I don't resume the suspended threads if the execution was
successful.
Aaron
--- /dev/null 2005-06-09 16:29:11.371620296 -0400
+++ gnu/classpath/jdwp/processor/ClassTypeCommandSet.java 2005-08-04 18:30:28.000000000 -0400
@@ -0,0 +1,228 @@
+/* ClassTypeCommandSet.java -- class to implement the ClassType
+ Command Set
+ Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.processor;
+
+import gnu.classpath.jdwp.IVirtualMachine;
+import gnu.classpath.jdwp.Jdwp;
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.exception.InvalidFieldException;
+import gnu.classpath.jdwp.exception.JdwpException;
+import gnu.classpath.jdwp.exception.JdwpInternalErrorException;
+import gnu.classpath.jdwp.exception.NotImplementedException;
+import gnu.classpath.jdwp.id.IdManager;
+import gnu.classpath.jdwp.id.ObjectId;
+import gnu.classpath.jdwp.id.ReferenceTypeId;
+import gnu.classpath.jdwp.util.MethodResult;
+import gnu.classpath.jdwp.util.Value;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+
+/**
+ * A class representing the ClassType Command Set.
+ *
+ * @author Aaron Luchko <[EMAIL PROTECTED]>
+ */
+public class ClassTypeCommandSet implements CommandSet
+{
+ // Our hook into the jvm
+ private final IVirtualMachine vm = Jdwp.getIVirtualMachine();
+
+ // Manages all the different ids that are assigned by jdwp
+ private final IdManager idMan = Jdwp.getIdManager();
+
+ public boolean runCommand(ByteBuffer bb, DataOutputStream os, byte command)
+ throws JdwpException
+ {
+ try
+ {
+ switch (command)
+ {
+ case JdwpConstants.CommandSet.ClassType.SUPERCLASS:
+ executeSuperclass(bb, os);
+ break;
+ case JdwpConstants.CommandSet.ClassType.SET_VALUES:
+ executeSetValues(bb, os);
+ break;
+ case JdwpConstants.CommandSet.ClassType.INVOKE_METHOD:
+ executeInvokeMethod(bb, os);
+ break;
+ case JdwpConstants.CommandSet.ClassType.NEW_INSTANCE:
+ executeNewInstance(bb, os);
+ break;
+ default:
+ throw new NotImplementedException("Command " + command +
+ " not found in ClassType Command Set.");
+ }
+ }
+ catch (IOException ex)
+ {
+ // The DataOutputStream we're using isn't talking to a socket at all
+ // So if we throw an IOException we're in serious trouble
+ throw new JdwpInternalErrorException(ex);
+ }
+ return true;
+ }
+
+ private void executeSuperclass(ByteBuffer bb, DataOutputStream os)
+ throws JdwpException, IOException
+ {
+ ReferenceTypeId refId = idMan.readReferenceTypeId(bb);
+ Class clazz = refId.getType();
+ Class superClazz = clazz.getSuperclass();
+
+ ReferenceTypeId clazzId = idMan.getReferenceTypeId(superClazz);
+ clazzId.write(os);
+ }
+
+ private void executeSetValues(ByteBuffer bb, DataOutputStream os)
+ throws JdwpException, IOException
+ {
+ ReferenceTypeId refId = idMan.readReferenceTypeId(bb);
+
+ // We don't actually seem to need this...
+ Class clazz = refId.getType();
+
+ int numValues = bb.getInt();
+
+ for (int i = 0; i < numValues; i++)
+ {
+ ObjectId fieldId = idMan.readId(bb);
+ Field field = (Field) (fieldId.getObject());
+ Object value = Value.getUntaggedObj(bb, field.getType());
+ try
+ {
+ field.setAccessible(true); // Might be a private field
+ field.set(null, value);
+ }
+ catch (IllegalArgumentException ex)
+ {
+ throw new InvalidFieldException(ex);
+ }
+ catch (IllegalAccessException ex)
+ { // Since we set it as accessible this really shouldn't happen
+ throw new JdwpInternalErrorException(ex);
+ }
+ }
+ }
+
+ private void executeInvokeMethod(ByteBuffer bb, DataOutputStream os)
+ throws JdwpException, IOException
+ {
+ MethodResult mr = invokeMethod(bb);
+
+ Object value = mr.getReturnedValue();
+ Exception exception = mr.getThrownException();
+ ObjectId eId = idMan.getId(exception);
+
+ Value.writeTaggedValue(os, value);
+ eId.writeTagged(os);
+ }
+
+ private void executeNewInstance(ByteBuffer bb, DataOutputStream os)
+ throws JdwpException, IOException
+ {
+ MethodResult mr = invokeMethod(bb);
+
+ Object obj = mr.getReturnedValue();
+ ObjectId oId = idMan.getId(obj);
+ Exception exception = mr.getThrownException();
+ ObjectId eId = idMan.getId(exception);
+
+ oId.writeTagged(os);
+ eId.writeTagged(os);
+ }
+
+ /**
+ * Execute the static method and return the resulting MethodResult.
+ */
+ private MethodResult invokeMethod(ByteBuffer bb) throws JdwpException,
+ IOException
+ {
+ ReferenceTypeId refId = idMan.readReferenceTypeId(bb);
+ Class clazz = refId.getType();
+
+ ObjectId tId = idMan.readId(bb);
+ Thread thread = (Thread) tId.getObject();
+
+ ObjectId mId = idMan.readId(bb);
+ Method method = (Method) mId.getObject();
+
+ int args = bb.getInt();
+ Object[] values = new Object[args];
+
+ for (int i = 0; i < args; i++)
+ {
+ values[i] = Value.getObj(bb);
+ }
+ boolean suspendSuccess = false;
+ int invokeOpts = bb.getInt();
+ try
+ {
+ if ((invokeOpts & JdwpConstants.InvokeOptions.INVOKE_SINGLE_THREADED)
+ != 0)
+ {
+ // We must suspend all running threads first
+ suspendSuccess = vm.suspendAllThreadsExcept(Thread.currentThread().
+ getThreadGroup());
+ }
+ MethodResult mr = vm.executeMethod(null, thread, clazz, method, values,
+ false);
+ if (suspendSuccess)
+ { // We must call resume if we suspended threads
+ suspendSuccess = false;
+ vm.resumeAllThreadsExcept(Thread.currentThread().getThreadGroup());
+ }
+ return mr;
+ }
+ catch (Exception ex)
+ {
+ if (suspendSuccess)
+ { // We must call resume if we suspended threads
+ vm.resumeAllThreadsExcept(Thread.currentThread().getThreadGroup());
+ }
+ throw new JdwpInternalErrorException(ex);
+ }
+ }
+}
--- /dev/null 2005-06-09 16:29:11.371620296 -0400
+++ gnu/classpath/jdwp/util/MethodResult.java 2005-08-03 15:32:08.000000000 -0400
@@ -0,0 +1,76 @@
+/* MethodResult.java -- class to wrap around values returned from a Method call
+ in the VM
+ Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.util;
+
+/**
+ * A class to wrap around values returned from a Method call in the VM.
+ *
+ * @author Aaron Luchko <[EMAIL PROTECTED]>
+ */
+public class MethodResult
+{
+ // The Object returned by the executing method
+ private Object returnedValue;
+
+ // Any Exception that was thrown by the executing method
+ private Exception thrownException;
+
+ public Object getReturnedValue()
+ {
+ return returnedValue;
+ }
+
+ public void setReturnedValue(Object returnedValue)
+ {
+ this.returnedValue = returnedValue;
+ }
+
+ public Exception getThrownException()
+ {
+ return thrownException;
+ }
+
+ public void setThrownException(Exception thrownException)
+ {
+ this.thrownException = thrownException;
+ }
+
+}
_______________________________________________
Classpath-patches mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/classpath-patches
