This patch adds a new event to JDWP (correct to the spec this time :-)
) as well as changing from *.class for to defined constants to use with
the getParameter() method inside the *Event classes. This is to fix an
issue with the new ExceptionEvent since the old method of calling
getParameter would not allow filtering by caught/uncaught exceptions.
My thanks to anyone who reviews and commits.
-Kyle
ChangeLog:
2006-06-09 Kyle Galloway <[EMAIL PROTECTED]>
* gnu/classpath/jdwp/event/BreakpointEvent.java: Added Object
_instance for filter compatibility
* gnu/classpath/jdwp/event/BreakpointEvent.java(getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/ClassPrepareEventEvent.java(getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/Event.java: Added constants for
type and changed the abstract method getParameters to match
* gnu/classpath/jdwp/event/ThreadEndEvent.java(getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/ThreadStartEvent.java(getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/VmDeathEvent.java(getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/VmInitEvent.java(getParameter):
changed from Class type to constants
* gnu/classpath/jdwp/event/ClassMatchFilter.java(matches):
changed from Class type to constants
* gnu/classpath/jdwp/event/ClassOnlyFilter.java(matches):
changed from Class type to constants
* gnu/classpath/jdwp/event/InstanceOnlyFilter.java(matches):
changed from Class type to constants
* gnu/classpath/jdwp/event/ThreadOnlyFilter.java(matches):
changed from Class type to constants
* gnu/classpath/jdwp/event/ExceptionEvent.java: New file
Index: gnu/classpath/jdwp/event/BreakpointEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/BreakpointEvent.java,v
retrieving revision 1.1
diff -u -r1.1 BreakpointEvent.java
--- gnu/classpath/jdwp/event/BreakpointEvent.java 15 Mar 2006 22:55:54 -0000 1.1
+++ gnu/classpath/jdwp/event/BreakpointEvent.java 9 Jun 2006 14:00:55 -0000
@@ -62,6 +62,9 @@
// Location where breakpoint occurred
private Location _location;
+
+ //object instance
+ private Object _instance;
/**
* Constructs a new BreakpointEvent
@@ -69,11 +72,12 @@
* @param thread thread in which event occurred
* @param loc location where breakpoint occurred
*/
- public BreakpointEvent(Thread thread, Location loc)
+ public BreakpointEvent(Thread thread, Location loc, Object instance)
{
super(JdwpConstants.EventKind.BREAKPOINT);
_thread = thread;
_location = loc;
+ _instance = instance;
}
/**
@@ -83,12 +87,14 @@
* @param type the type of parameter desired
* @returns the desired parameter or null
*/
- public Object getParameter(Class type)
+ public Object getParameter(int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
- else if (type == Location.class)
+ else if (type == EVENT_LOCATION)
return _location;
+ else if (type == EVENT_INSTANCE)
+ return _instance;
return null;
}
Index: gnu/classpath/jdwp/event/ClassPrepareEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ClassPrepareEvent.java,v
retrieving revision 1.1
diff -u -r1.1 ClassPrepareEvent.java
--- gnu/classpath/jdwp/event/ClassPrepareEvent.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/ClassPrepareEvent.java 9 Jun 2006 14:00:55 -0000
@@ -116,11 +116,11 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
- else if (type == ReferenceTypeId.class)
+ else if (type == EVENT_CLASS)
return _class;
return null;
Index: gnu/classpath/jdwp/event/Event.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/Event.java,v
retrieving revision 1.1
diff -u -r1.1 Event.java
--- gnu/classpath/jdwp/event/Event.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/Event.java 9 Jun 2006 14:00:55 -0000
@@ -54,6 +54,41 @@
*/
public abstract class Event
{
+ /**
+ * The class of the object in which the event occurred
+ */
+ public static final int EVENT_CLASS = 1;
+
+ /**
+ * The thread where the event occurred
+ */
+ public static final int EVENT_THREAD = 2;
+
+ /**
+ * The location where an event occurred
+ */
+ public static final int EVENT_LOCATION = 3;
+
+ /**
+ * The instance of the class where the event occurred
+ */
+ public static final int EVENT_INSTANCE = 4;
+
+ /**
+ * The field acted on by an event
+ */
+ public static final int EVENT_FIELD = 5;
+
+ /**
+ * The class of the exception for ExceptionEvent
+ */
+ public static final int EVENT_EXCEPTION_CLASS = 6;
+
+ /**
+ * Whether this exception was caught (only valid for ExceptionEvents)
+ */
+ public static final int EVENT_EXCEPTION_CAUGHT = 7;
+
// The kind of event represented by this event
private byte _eventKind;
@@ -93,11 +128,11 @@
* method with <code>ThreadId.class</code> should return a
* <code>Thread</code>.
*
- * @param type the type of parameter to return
+ * @param type the type of parameter to return (see constants above)
* @returns the parameter (not the ID) or <code>null</code> if none is
* is defined for this event
*/
- public abstract Object getParameter (Class type);
+ public abstract Object getParameter (int type);
/**
* Converts this event into to a JDWP packet
Index: gnu/classpath/jdwp/event/ThreadEndEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ThreadEndEvent.java,v
retrieving revision 1.1
diff -u -r1.1 ThreadEndEvent.java
--- gnu/classpath/jdwp/event/ThreadEndEvent.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/ThreadEndEvent.java 9 Jun 2006 14:00:55 -0000
@@ -81,9 +81,9 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
return null;
Index: gnu/classpath/jdwp/event/ThreadStartEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/ThreadStartEvent.java,v
retrieving revision 1.2
diff -u -r1.2 ThreadStartEvent.java
--- gnu/classpath/jdwp/event/ThreadStartEvent.java 9 Mar 2006 23:18:29 -0000 1.2
+++ gnu/classpath/jdwp/event/ThreadStartEvent.java 9 Jun 2006 14:00:55 -0000
@@ -86,9 +86,9 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
- if (type == ThreadId.class)
+ if (type == EVENT_THREAD)
return _thread;
return null;
Index: gnu/classpath/jdwp/event/VmDeathEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/VmDeathEvent.java,v
retrieving revision 1.2
diff -u -r1.2 VmDeathEvent.java
--- gnu/classpath/jdwp/event/VmDeathEvent.java 9 Mar 2006 23:18:29 -0000 1.2
+++ gnu/classpath/jdwp/event/VmDeathEvent.java 9 Jun 2006 14:00:55 -0000
@@ -67,7 +67,7 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
return null;
}
Index: gnu/classpath/jdwp/event/VmInitEvent.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/VmInitEvent.java,v
retrieving revision 1.1
diff -u -r1.1 VmInitEvent.java
--- gnu/classpath/jdwp/event/VmInitEvent.java 30 Aug 2005 00:51:10 -0000 1.1
+++ gnu/classpath/jdwp/event/VmInitEvent.java 9 Jun 2006 14:00:55 -0000
@@ -76,7 +76,7 @@
* @param type the type of parameter desired
* @returns the desired parameter or <code>null</code>
*/
- public Object getParameter (Class type)
+ public Object getParameter (int type)
{
return null;
}
Index: gnu/classpath/jdwp/event/filters/ClassMatchFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java,v
retrieving revision 1.3
diff -u -r1.3 ClassMatchFilter.java
--- gnu/classpath/jdwp/event/filters/ClassMatchFilter.java 9 Mar 2006 19:49:59 -0000 1.3
+++ gnu/classpath/jdwp/event/filters/ClassMatchFilter.java 9 Jun 2006 14:00:55 -0000
@@ -41,7 +41,6 @@
import gnu.classpath.jdwp.event.Event;
import gnu.classpath.jdwp.exception.InvalidStringException;
-import gnu.classpath.jdwp.id.ReferenceTypeId;
/**
* An event filter which includes events matching a
@@ -91,7 +90,7 @@
*/
public boolean matches (Event event)
{
- Object type = event.getParameter (ReferenceTypeId.class);
+ Object type = event.getParameter (Event.EVENT_CLASS);
if (type != null)
{
Class eventClass = (Class) type;
Index: gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java,v
retrieving revision 1.1
diff -u -r1.1 ClassOnlyFilter.java
--- gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java 26 Aug 2005 21:52:28 -0000 1.1
+++ gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java 9 Jun 2006 14:00:55 -0000
@@ -87,7 +87,7 @@
*/
public boolean matches (Event event)
{
- Object type = event.getParameter (ReferenceTypeId.class);
+ Object type = event.getParameter (Event.EVENT_CLASS);
if (type != null)
{
try
Index: gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java,v
retrieving revision 1.1
diff -u -r1.1 InstanceOnlyFilter.java
--- gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java 26 Aug 2005 21:52:28 -0000 1.1
+++ gnu/classpath/jdwp/event/filters/InstanceOnlyFilter.java 9 Jun 2006 14:00:55 -0000
@@ -89,7 +89,7 @@
*/
public boolean matches (Event event)
{
- Object eventInstance = event.getParameter (ObjectId.class);
+ Object eventInstance = event.getParameter (Event.EVENT_INSTANCE);
if (eventInstance != null)
{
Object myInstance = _instance.getReference().get ();
Index: gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java,v
retrieving revision 1.3
diff -u -r1.3 ThreadOnlyFilter.java
--- gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java 9 Mar 2006 19:49:59 -0000 1.3
+++ gnu/classpath/jdwp/event/filters/ThreadOnlyFilter.java 9 Jun 2006 14:00:55 -0000
@@ -88,7 +88,7 @@
*/
public boolean matches (Event event)
{
- Object thread = event.getParameter (ThreadId.class);
+ Object thread = event.getParameter (Event.EVENT_THREAD);
if (thread != null)
{
Thread eventThread = (Thread) thread;
Index: gnu/classpath/jdwp/event/ExceptionEvent.java
===================================================================
RCS file: gnu/classpath/jdwp/event/ExceptionEvent.java
diff -N gnu/classpath/jdwp/event/ExceptionEvent.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/event/ExceptionEvent.java 1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,141 @@
+/* ExceptionEvent.java -- an event specifying an exception has been thrown
+ Copyright (C) 2006 Free Software Foundation, Inc.
+
+ 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., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 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
+ 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.event;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import gnu.classpath.jdwp.JdwpConstants;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ThreadId;
+import gnu.classpath.jdwp.util.Location;
+import gnu.classpath.jdwp.id.ObjectId;
+
+/**
+ * Notification from the VM that an exception has occurred along with where it
+ * occurred, and if and where it was caught.
+ *
+ * @author Kyle Galloway ([EMAIL PROTECTED])
+ */
+public class ExceptionEvent
+ extends Event
+{
+ //object instance
+ private Object _instance;
+
+ // the exception thrown
+ private Throwable _exception;
+
+ // the thread in which the exception occurred
+ private Thread _thread;
+
+ // the location where the exception was thrown
+ private Location _location;
+
+ //the location where the exception was caught
+ private Location _catchLocation;
+
+ /**
+ * Constructs a new <code>ExceptionEvent</code> where the exception was
+ * caught.
+ *
+ * @param exception the throwable object that generated the event
+ * @param thread the thread where the exception occurred
+ * @param location the location where the exception was thrown
+ * @param catchLocation the location where the exception was caught
+ */
+ public ExceptionEvent(Throwable exception, Thread thread, Location location,
+ Location catchLocation, Object instance)
+ {
+ super(JdwpConstants.EventKind.EXCEPTION);
+ _exception = exception;
+ _thread = thread;
+ _location = location;
+ _catchLocation = catchLocation;
+ _instance = instance;
+ }
+
+ /**
+ * Returns a specific filtering parameter for this event. Valid types are
+ * thread, location, and catchLocation.
+ *
+ * @param type the type of parameter desired
+ * @returns the desired parameter or null
+ */
+ public Object getParameter(int type)
+ {
+ if (type == EVENT_THREAD)
+ return _thread;
+ else if (type == EVENT_LOCATION)
+ return _location;
+ else if (type == EVENT_INSTANCE)
+ return _instance;
+ else if (type == EVENT_CLASS)
+ return _instance.getClass();
+ else if (type == EVENT_EXCEPTION_CLASS)
+ return _exception.getClass();
+ else if (type == EVENT_EXCEPTION_CAUGHT)
+ if (_catchLocation != null)
+ return new Boolean(true);
+ else
+ return new Boolean(false);
+
+ return null;
+ }
+
+ /**
+ * Writes the event to the given stream
+ *
+ * @param outStream the output stream to write the event to
+ */
+ protected void _writeData(DataOutputStream outStream) throws IOException
+ {
+ VMIdManager idm = VMIdManager.getDefault();
+ ThreadId tid = (ThreadId) idm.getObjectId(_thread);
+ ObjectId oid = idm.getObjectId(_exception);
+
+ tid.write(outStream);
+ _location.write(outStream);
+ oid.writeTagged(outStream);
+ if(_catchLocation != null)
+ _catchLocation.write(outStream);
+ else
+ outStream.write(0);
+ }
+}
