diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/include/jvmti-int.h | 70 | ||||
| -rw-r--r-- | libjava/jvmti.cc | 39 |
3 files changed, 79 insertions, 35 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 28a7e35..e45c9c4 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2006-10-12 Keith Seitz <keiths@redhat.com> + + * include/jvmti-int.h (JVMTI): Declare all members "extern". + * jvmti.cc (JVMTI): Define. + 2006-10-11 Tom Tromey <tromey@redhat.com> * Makefile.in: Rebuilt. diff --git a/libjava/include/jvmti-int.h b/libjava/include/jvmti-int.h index 36e0da8..f88b4ce 100644 --- a/libjava/include/jvmti-int.h +++ b/libjava/include/jvmti-int.h @@ -37,41 +37,41 @@ executable file might be covered by the GNU General Public License. */ False means no JVMTI environment requested that event type. */ namespace JVMTI { - bool VMInit; - bool VMDeath; - bool ThreadStart; - bool ThreadEnd; - bool ClassFileLoadHook; - bool ClassLoad; - bool ClassPrepare; - bool VMStart; - bool Exception; - bool ExceptionCatch; - bool SingleStep; - bool FramePop; - bool Breakpoint; - bool FieldAccess; - bool FieldModification; - bool MethodEntry; - bool MethodExit; - bool NativeMethodBind; - bool CompiledMethodLoad; - bool CompiledMethodUnload; - bool DynamicCodeGenerated; - bool DataDumpRequest; - bool reserved72; - bool MonitorWait; - bool MonitorWaited; - bool MonitorContendedEnter; - bool MonitorContendedEntered; - bool reserved77; - bool reserved78; - bool reserved79; - bool reserved80; - bool GarbageCollectionStart; - bool GarbageCollectionFinish; - bool ObjectFree; - bool VMObjectAlloc; + extern bool VMInit; + extern bool VMDeath; + extern bool ThreadStart; + extern bool ThreadEnd; + extern bool ClassFileLoadHook; + extern bool ClassLoad; + extern bool ClassPrepare; + extern bool VMStart; + extern bool Exception; + extern bool ExceptionCatch; + extern bool SingleStep; + extern bool FramePop; + extern bool Breakpoint; + extern bool FieldAccess; + extern bool FieldModification; + extern bool MethodEntry; + extern bool MethodExit; + extern bool NativeMethodBind; + extern bool CompiledMethodLoad; + extern bool CompiledMethodUnload; + extern bool DynamicCodeGenerated; + extern bool DataDumpRequest; + extern bool reserved72; + extern bool MonitorWait; + extern bool MonitorWaited; + extern bool MonitorContendedEnter; + extern bool MonitorContendedEntered; + extern bool reserved77; + extern bool reserved78; + extern bool reserved79; + extern bool reserved80; + extern bool GarbageCollectionStart; + extern bool GarbageCollectionFinish; + extern bool ObjectFree; + extern bool VMObjectAlloc; }; /* A macro to test whether an event should be posted to JVMTI.*/ diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc index 8f8304d..d1ad6e3 100644 --- a/libjava/jvmti.cc +++ b/libjava/jvmti.cc @@ -36,6 +36,45 @@ details. */ static void check_enabled_events (void); static void check_enabled_event (jvmtiEvent); +namespace JVMTI +{ + bool VMInit = false; + bool VMDeath = false; + bool ThreadStart = false; + bool ThreadEnd = false; + bool ClassFileLoadHook = false; + bool ClassLoad = false; + bool ClassPrepare = false; + bool VMStart = false; + bool Exception = false; + bool ExceptionCatch = false; + bool SingleStep = false; + bool FramePop = false; + bool Breakpoint = false; + bool FieldAccess = false; + bool FieldModification = false; + bool MethodEntry = false; + bool MethodExit = false; + bool NativeMethodBind = false; + bool CompiledMethodLoad = false; + bool CompiledMethodUnload = false; + bool DynamicCodeGenerated = false; + bool DataDumpRequest = false; + bool reserved72 = false; + bool MonitorWait = false; + bool MonitorWaited = false; + bool MonitorContendedEnter = false; + bool MonitorContendedEntered = false; + bool reserved77 = false; + bool reserved78 = false; + bool reserved79 = false; + bool reserved80 = false; + bool GarbageCollectionStart = false; + bool GarbageCollectionFinish = false; + bool ObjectFree = false; + bool VMObjectAlloc = false; +}; + extern struct JNINativeInterface _Jv_JNIFunctions; struct _Jv_rawMonitorID |