link.cc (_Jv_Linker::wait_for_state): Add JVMTI CLASS_PREPARE notification.

        * link.cc (_Jv_Linker::wait_for_state): Add JVMTI
        CLASS_PREPARE notification.

From-SVN: r121157

libjava/ChangeLog

 2007-01-24  Keith Seitz  <keiths@redhat.com>
 
+	* link.cc (_Jv_Linker::wait_for_state): Add JVMTI
+	CLASS_PREPARE notification.
+
+2007-01-24  Keith Seitz  <keiths@redhat.com>
+
 	* interpret.cc: Include gnu/gcj/jvmti/Breakpoint.h,
 	gnu/gcj/jvmti/BreakpointManager.h, jvmti.h, and jvmti-int.h
 	* interpret-run.cc: Implement insn_breakpoint.

libjava/link.cc

@@ -33,6 +33,8 @@ details.  */
 #include <limits.h>
 #include <java-cpool.h>
 #include <execution.h>
+#include <jvmti.h>
+#include "jvmti-int.h"
 #include <java/lang/Class.h>
 #include <java/lang/String.h>
 #include <java/lang/StringBuffer.h>
@@ -1941,11 +1943,13 @@ _Jv_Linker::wait_for_state (jclass klass, int state)
   if (klass->state >= state)
     return;
 
+  java::lang::Thread *self = java::lang::Thread::currentThread();
+
+  {
     JvSynchronize sync (klass);
 
     // This is similar to the strategy for class initialization.  If we
     // already hold the lock, just leave.
-  java::lang::Thread *self = java::lang::Thread::currentThread();
     while (klass->state <= state
 	   && klass->thread 
 	   && klass->thread != self)
@@ -2026,4 +2030,14 @@ _Jv_Linker::wait_for_state (jclass klass, int state)
 
     if (klass->state == JV_STATE_ERROR)
       throw new java::lang::LinkageError;
+  }
+
+  if (__builtin_expect (klass->state == JV_STATE_LINKED, false)
+      && state >= JV_STATE_LINKED
+      && JVMTI_REQUESTED_EVENT (ClassPrepare))
+    {
+      JNIEnv *jni_env = _Jv_GetCurrentJNIEnv ();
+      _Jv_JVMTI_PostEvent (JVMTI_EVENT_CLASS_PREPARE, self, jni_env,
+			   klass);
+    }
 }