FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jni.cc (ClassClass): Removed; updated all users.

Browse source 
* jni.cc (ClassClass): Removed; updated all users.
	(ObjectClass): Likewise.
	(ThrowableClass): Likewise.
	(MethodClass): Likewise.
	(ThreadGroupClass): Likewise.
	(local_ref_table): Renamed from `ref_table'.
	(global_ref_table): New global.
	(_Jv_JNI_Init): Initialize both ref tables.
	(mark_for_gc): Added `ref_table' parameter.
	(unmark_for_gc): Likewise.  Also, fail if we unreferenced too many
	times.
	(_Jv_JNI_NewGlobalRef): Updated for new mark function.
	(_Jv_JNI_DeleteGlobalRef): Likewise.
	(_Jv_JNI_DeleteLocalRef): Likewise.
	(_Jv_JNI_NewLocalRef): Likewise.
	(_Jv_JNI_PopLocalFrame): Likewise.
	(_Jv_JNI_GetStringChars): Likewise.
	(_Jv_JNI_ReleaseStringChars): Likewise.
	(_Jv_JNI_GetPrimitiveArrayElements): Likewise.
	(_Jv_JNI_ReleasePrimitiveArrayElements): Likewise.

From-SVN: r43409
This commit is contained in:
Tom Tromey 2001-06-15 22:09:10 +00:00 • committed by Tom Tromey
parent b927dc2237
commit 39986dd5ee
2 changed files with 51 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libjava/ChangeLog
View file

@ -1,3 +1,26 @@
2001-06-15 Tom Tromey <tromey@redhat.com>
* jni.cc (ClassClass): Removed; updated all users.
(ObjectClass): Likewise.
(ThrowableClass): Likewise.
(MethodClass): Likewise.
(ThreadGroupClass): Likewise.
(local_ref_table): Renamed from `ref_table'.
(global_ref_table): New global.
(_Jv_JNI_Init): Initialize both ref tables.
(mark_for_gc): Added `ref_table' parameter.
(unmark_for_gc): Likewise. Also, fail if we unreferenced too many
times.
(_Jv_JNI_NewGlobalRef): Updated for new mark function.
(_Jv_JNI_DeleteGlobalRef): Likewise.
(_Jv_JNI_DeleteLocalRef): Likewise.
(_Jv_JNI_NewLocalRef): Likewise.
(_Jv_JNI_PopLocalFrame): Likewise.
(_Jv_JNI_GetStringChars): Likewise.
(_Jv_JNI_ReleaseStringChars): Likewise.
(_Jv_JNI_GetPrimitiveArrayElements): Likewise.
(_Jv_JNI_ReleasePrimitiveArrayElements): Likewise.
2001-06-14 Tom Tromey <tromey@redhat.com> 2001-06-14 Tom Tromey <tromey@redhat.com>
Fix for PR libgcj/3144: Fix for PR libgcj/3144:

58
libjava/jni.cc
View file

@ -48,13 +48,6 @@ details. */
#include <java-interp.h> #include <java-interp.h>
#include <java-threads.h> #include <java-threads.h>
// FIXME: remove these defines.
#define ClassClass java::lang::Class::class$
#define ObjectClass java::lang::Object::class$
#define ThrowableClass java::lang::Throwable::class$
#define MethodClass java::lang::reflect::Method::class$
#define ThreadGroupClass java::lang::ThreadGroup::class$
// This enum is used to select different template instantiations in // This enum is used to select different template instantiations in
// the invocation code. // the invocation code.
enum invocation_type enum invocation_type
@ -97,8 +90,10 @@ struct _Jv_JNI_LocalFrame
jobject vec[0]; jobject vec[0];
}; };
// This holds a reference count for all local and global references. // This holds a reference count for all local references.
static java::util::Hashtable *ref_table; static java::util::Hashtable *local_ref_table;
// This holds a reference count for all global references.
static java::util::Hashtable *global_ref_table;
// The only VM. // The only VM.
static JavaVM *the_vm; static JavaVM *the_vm;
@ -153,8 +148,9 @@ jvmpiDisableEvent (jint event_type, void *)
void void
_Jv_JNI_Init (void) _Jv_JNI_Init (void)
{ {
ref_table = new java::util::Hashtable; local_ref_table = new java::util::Hashtable;
global_ref_table = new java::util::Hashtable;
#ifdef ENABLE_JVMPI #ifdef ENABLE_JVMPI
_Jv_JVMPI_Interface.version = 1; _Jv_JVMPI_Interface.version = 1;
_Jv_JVMPI_Interface.EnableEvent = &jvmpiEnableEvent; _Jv_JVMPI_Interface.EnableEvent = &jvmpiEnableEvent;
@ -167,7 +163,7 @@ _Jv_JNI_Init (void)
// Tell the GC that a certain pointer is live. // Tell the GC that a certain pointer is live.
static void static void
mark_for_gc (jobject obj) mark_for_gc (jobject obj, java::util::Hashtable *ref_table)
{ {
JvSynchronize sync (ref_table); JvSynchronize sync (ref_table);
@ -180,7 +176,7 @@ mark_for_gc (jobject obj)
// Unmark a pointer. // Unmark a pointer.
static void static void
unmark_for_gc (jobject obj) unmark_for_gc (jobject obj, java::util::Hashtable *ref_table)
{ {
JvSynchronize sync (ref_table); JvSynchronize sync (ref_table);
@ -188,6 +184,7 @@ unmark_for_gc (jobject obj)
Integer *refcount = (Integer *) ref_table->get (obj); Integer *refcount = (Integer *) ref_table->get (obj);
JvAssert (refcount); JvAssert (refcount);
jint val = refcount->intValue () - 1; jint val = refcount->intValue () - 1;
JvAssert (val >= 0);
if (val == 0) if (val == 0)
ref_table->remove (obj); ref_table->remove (obj);
else else
@ -200,14 +197,14 @@ unmark_for_gc (jobject obj)
static jobject static jobject
_Jv_JNI_NewGlobalRef (JNIEnv *, jobject obj) _Jv_JNI_NewGlobalRef (JNIEnv *, jobject obj)
{ {
mark_for_gc (obj); mark_for_gc (obj, global_ref_table);
return obj; return obj;
} }
static void static void
_Jv_JNI_DeleteGlobalRef (JNIEnv *, jobject obj) _Jv_JNI_DeleteGlobalRef (JNIEnv *, jobject obj)
{ {
unmark_for_gc (obj); unmark_for_gc (obj, global_ref_table);
} }
static void static void
@ -222,7 +219,7 @@ _Jv_JNI_DeleteLocalRef (JNIEnv *env, jobject obj)
if (frame->vec[i] == obj) if (frame->vec[i] == obj)
{ {
frame->vec[i] = NULL; frame->vec[i] = NULL;
unmark_for_gc (obj); unmark_for_gc (obj, local_ref_table);
return; return;
} }
} }
@ -302,7 +299,7 @@ _Jv_JNI_NewLocalRef (JNIEnv *env, jobject obj)
env->locals->vec[0] = obj; env->locals->vec[0] = obj;
} }
mark_for_gc (obj); mark_for_gc (obj, local_ref_table);
return obj; return obj;
} }
@ -316,7 +313,7 @@ _Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result, int stop)
{ {
for (int i = 0; i < rf->size; ++i) for (int i = 0; i < rf->size; ++i)
if (rf->vec[i] != NULL) if (rf->vec[i] != NULL)
unmark_for_gc (rf->vec[i]); unmark_for_gc (rf->vec[i], local_ref_table);
// If the frame we just freed is the marker frame, we are done. // If the frame we just freed is the marker frame, we are done.
done = (rf->marker == stop); done = (rf->marker == stop);
@ -467,7 +464,7 @@ static jint
_Jv_JNI_Throw (JNIEnv *env, jthrowable obj) _Jv_JNI_Throw (JNIEnv *env, jthrowable obj)
{ {
// We check in case the user did some funky cast. // We check in case the user did some funky cast.
JvAssert (obj != NULL && (&ThrowableClass)->isInstance (obj)); JvAssert (obj != NULL && java::lang::Throwable::class$.isInstance (obj));
env->ex = obj; env->ex = obj;
return 0; return 0;
} }
@ -477,13 +474,14 @@ _Jv_JNI_ThrowNew (JNIEnv *env, jclass clazz, const char *message)
{ {
using namespace java::lang::reflect; using namespace java::lang::reflect;
JvAssert ((&ThrowableClass)->isAssignableFrom (clazz)); JvAssert (java::lang::Throwable::class$.isAssignableFrom (clazz));
int r = JNI_OK; int r = JNI_OK;
try try
{ {
JArray<jclass> *argtypes JArray<jclass> *argtypes
= (JArray<jclass> *) JvNewObjectArray (1, &ClassClass, NULL); = (JArray<jclass> *) JvNewObjectArray (1, &java::lang::Class::class$,
NULL);
jclass *elts = elements (argtypes); jclass *elts = elements (argtypes);
elts[0] = &StringClass; elts[0] = &StringClass;
@ -922,7 +920,7 @@ _Jv_JNI_CallStaticMethodV (JNIEnv *env, jclass klass,
jmethodID id, va_list args) jmethodID id, va_list args)
{ {
JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC)); JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
JvAssert ((&ClassClass)->isInstance (klass)); JvAssert (java::lang::Class::class$.isInstance (klass));
return _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass, id, args); return _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass, id, args);
} }
@ -937,7 +935,7 @@ _Jv_JNI_CallStaticMethod (JNIEnv *env, jclass klass, jmethodID id, ...)
T result; T result;
JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC)); JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
JvAssert ((&ClassClass)->isInstance (klass)); JvAssert (java::lang::Class::class$.isInstance (klass));
va_start (args, id); va_start (args, id);
result = _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass, result = _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass,
@ -955,7 +953,7 @@ _Jv_JNI_CallStaticMethodA (JNIEnv *env, jclass klass, jmethodID id,
jvalue *args) jvalue *args)
{ {
JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC)); JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
JvAssert ((&ClassClass)->isInstance (klass)); JvAssert (java::lang::Class::class$.isInstance (klass));
return _Jv_JNI_CallAnyMethodA<T, static_type> (env, NULL, klass, id, args); return _Jv_JNI_CallAnyMethodA<T, static_type> (env, NULL, klass, id, args);
} }
@ -1155,7 +1153,7 @@ static const jchar *
_Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy) _Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy)
{ {
jchar *result = _Jv_GetStringChars (string); jchar *result = _Jv_GetStringChars (string);
mark_for_gc (string); mark_for_gc (string, global_ref_table);
if (isCopy) if (isCopy)
*isCopy = false; *isCopy = false;
return (const jchar *) result; return (const jchar *) result;
@ -1164,7 +1162,7 @@ _Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy)
static void static void
_Jv_JNI_ReleaseStringChars (JNIEnv *, jstring string, const jchar *) _Jv_JNI_ReleaseStringChars (JNIEnv *, jstring string, const jchar *)
{ {
unmark_for_gc (string); unmark_for_gc (string, global_ref_table);
} }
static jstring static jstring
@ -1343,7 +1341,7 @@ _Jv_JNI_GetPrimitiveArrayElements (JNIEnv *, JArray<T> *array,
// We elect never to copy. // We elect never to copy.
*isCopy = false; *isCopy = false;
} }
mark_for_gc (array); mark_for_gc (array, global_ref_table);
return elts; return elts;
} }
@ -1355,7 +1353,7 @@ _Jv_JNI_ReleasePrimitiveArrayElements (JNIEnv *, JArray<T> *array,
// Note that we ignore MODE. We can do this because we never copy // Note that we ignore MODE. We can do this because we never copy
// the array elements. My reading of the JNI documentation is that // the array elements. My reading of the JNI documentation is that
// this is an option for the implementor. // this is an option for the implementor.
unmark_for_gc (array); unmark_for_gc (array, global_ref_table);
} }
template<typename T> template<typename T>
@ -1532,7 +1530,7 @@ static jmethodID
_Jv_JNI_FromReflectedMethod (JNIEnv *, jobject method) _Jv_JNI_FromReflectedMethod (JNIEnv *, jobject method)
{ {
using namespace java::lang::reflect; using namespace java::lang::reflect;
if ((&MethodClass)->isInstance (method)) if (Method::class$.isInstance (method))
return _Jv_FromReflectedMethod (reinterpret_cast<Method *> (method)); return _Jv_FromReflectedMethod (reinterpret_cast<Method *> (method));
return return
_Jv_FromReflectedConstructor (reinterpret_cast<Constructor *> (method)); _Jv_FromReflectedConstructor (reinterpret_cast<Constructor *> (method));
@ -1831,7 +1829,7 @@ _Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args)
&& attach->version != JNI_VERSION_1_1) && attach->version != JNI_VERSION_1_1)
return JNI_EVERSION; return JNI_EVERSION;
JvAssert ((&ThreadGroupClass)->isInstance (attach->group)); JvAssert (java::lang::ThreadGroup::class$.isInstance (attach->group));
group = reinterpret_cast<java::lang::ThreadGroup *> (attach->group); group = reinterpret_cast<java::lang::ThreadGroup *> (attach->group);
} }