+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>
Fix for PR libgcj/3144:
#include <java-interp.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
// the invocation code.
enum invocation_type
jobject vec[0];
};
-// This holds a reference count for all local and global references.
-static java::util::Hashtable *ref_table;
+// This holds a reference count for all local references.
+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.
static JavaVM *the_vm;
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
_Jv_JVMPI_Interface.version = 1;
_Jv_JVMPI_Interface.EnableEvent = &jvmpiEnableEvent;
// Tell the GC that a certain pointer is live.
static void
-mark_for_gc (jobject obj)
+mark_for_gc (jobject obj, java::util::Hashtable *ref_table)
{
JvSynchronize sync (ref_table);
// Unmark a pointer.
static void
-unmark_for_gc (jobject obj)
+unmark_for_gc (jobject obj, java::util::Hashtable *ref_table)
{
JvSynchronize sync (ref_table);
Integer *refcount = (Integer *) ref_table->get (obj);
JvAssert (refcount);
jint val = refcount->intValue () - 1;
+ JvAssert (val >= 0);
if (val == 0)
ref_table->remove (obj);
else
static jobject
_Jv_JNI_NewGlobalRef (JNIEnv *, jobject obj)
{
- mark_for_gc (obj);
+ mark_for_gc (obj, global_ref_table);
return obj;
}
static void
_Jv_JNI_DeleteGlobalRef (JNIEnv *, jobject obj)
{
- unmark_for_gc (obj);
+ unmark_for_gc (obj, global_ref_table);
}
static void
if (frame->vec[i] == obj)
{
frame->vec[i] = NULL;
- unmark_for_gc (obj);
+ unmark_for_gc (obj, local_ref_table);
return;
}
}
env->locals->vec[0] = obj;
}
- mark_for_gc (obj);
+ mark_for_gc (obj, local_ref_table);
return obj;
}
{
for (int i = 0; i < rf->size; ++i)
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.
done = (rf->marker == stop);
_Jv_JNI_Throw (JNIEnv *env, jthrowable obj)
{
// 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;
return 0;
}
{
using namespace java::lang::reflect;
- JvAssert ((&ThrowableClass)->isAssignableFrom (clazz));
+ JvAssert (java::lang::Throwable::class$.isAssignableFrom (clazz));
int r = JNI_OK;
try
{
JArray<jclass> *argtypes
- = (JArray<jclass> *) JvNewObjectArray (1, &ClassClass, NULL);
+ = (JArray<jclass> *) JvNewObjectArray (1, &java::lang::Class::class$,
+ NULL);
jclass *elts = elements (argtypes);
elts[0] = &StringClass;
jmethodID id, va_list args)
{
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);
}
T result;
JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
- JvAssert ((&ClassClass)->isInstance (klass));
+ JvAssert (java::lang::Class::class$.isInstance (klass));
va_start (args, id);
result = _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass,
jvalue *args)
{
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);
}
_Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy)
{
jchar *result = _Jv_GetStringChars (string);
- mark_for_gc (string);
+ mark_for_gc (string, global_ref_table);
if (isCopy)
*isCopy = false;
return (const jchar *) result;
static void
_Jv_JNI_ReleaseStringChars (JNIEnv *, jstring string, const jchar *)
{
- unmark_for_gc (string);
+ unmark_for_gc (string, global_ref_table);
}
static jstring
// We elect never to copy.
*isCopy = false;
}
- mark_for_gc (array);
+ mark_for_gc (array, global_ref_table);
return elts;
}
// Note that we ignore MODE. We can do this because we never copy
// the array elements. My reading of the JNI documentation is that
// this is an option for the implementor.
- unmark_for_gc (array);
+ unmark_for_gc (array, global_ref_table);
}
template<typename T>
_Jv_JNI_FromReflectedMethod (JNIEnv *, jobject method)
{
using namespace java::lang::reflect;
- if ((&MethodClass)->isInstance (method))
+ if (Method::class$.isInstance (method))
return _Jv_FromReflectedMethod (reinterpret_cast<Method *> (method));
return
_Jv_FromReflectedConstructor (reinterpret_cast<Constructor *> (method));
&& attach->version != JNI_VERSION_1_1)
return JNI_EVERSION;
- JvAssert ((&ThreadGroupClass)->isInstance (attach->group));
+ JvAssert (java::lang::ThreadGroup::class$.isInstance (attach->group));
group = reinterpret_cast<java::lang::ThreadGroup *> (attach->group);
}
OSDN Git Service
