diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-19 18:29:31 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-07-19 18:29:31 +0000 |
| commit | d3dcef523dc4306338e31b9d4053d32e8711441e (patch) | |
| tree | 597d2c3053a8c38dbe90a83d42c5d5788337fa93 /libjava/java/lang/natClassLoader.cc | |
| parent | 030c91c8b17c278a78a75cc403239be78b44a86e (diff) | |
| download | ppe42-gcc-d3dcef523dc4306338e31b9d4053d32e8711441e.tar.gz ppe42-gcc-d3dcef523dc4306338e31b9d4053d32e8711441e.zip | |
Print -verbose:message on "loading", not initialization.
* java/lang/Class.h (JV_STATE_LOADED, JV_STATE_COMPILED): Swap order.
* defineclass.cc (_Jv_ClassReader::parse): Print message if
gcj::verbose_class_flag.
* java/lang/natClass.cc (initializeClass): Don't print message here.
* java/lang/natClassLoader.cc (_Jv_WaitForState): If state was
_JV_STATE_COMPILED, set to JV_STATE_LOADED and may print message.
(_Jv_PrepareCompiledClass): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84926 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/lang/natClassLoader.cc')
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index ec48352c792..b38c2db1625 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -48,6 +48,12 @@ _Jv_WaitForState (jclass klass, int state) _Jv_MonitorEnter (klass) ; + if (klass->state == JV_STATE_COMPILED) + { + klass->state = JV_STATE_LOADED; + if (gcj::verbose_class_flag) + fprintf (stderr, "[Loaded (pre-compiled) %s]\n", (const char*)(klass->name->data)); + } if (state == JV_STATE_LINKED) { // Must call _Jv_PrepareCompiledClass while holding the class @@ -86,7 +92,8 @@ typedef unsigned int uaddr __attribute__ ((mode (pointer))); void _Jv_PrepareCompiledClass (jclass klass) { - if (klass->state >= JV_STATE_LINKED) + jint state = klass->state; + if (state >= JV_STATE_LINKED) return; // Short-circuit, so that mutually dependent classes are ok. @@ -173,6 +180,10 @@ _Jv_PrepareCompiledClass (jclass klass) if (klass->isInterface ()) _Jv_LayoutInterfaceMethods (klass); + if (state == JV_STATE_COMPILED && gcj::verbose_class_flag) + fprintf (stderr, "[Loaded (pre-compiled) %s]\n", + (const char*)(klass->name->data)); + klass->notifyAll (); _Jv_PushClass (klass); |
