[multiple changes]
2001-05-23 Tom Tromey <tromey@redhat.com> * posix-threads.cc (_Jv_self_cache): Renamed from self_cache. * gcj/Makefile.in: Rebuilt. * gcj/Makefile.am (gcj_HEADERS): Added libgcj-config.h. * gcj/javaprims.h: Include gcj/libgcj-config.h. * gcj/libgcj-config.h.in: New file. * libgcj.spec.in (*jc1): Added @HASH_SYNC_SPEC@. * configure: Rebuilt. * configure.in: Enable hash synchronization by default on some platforms. (HASH_SYNC_SPEC): New subst. (AC_CONFIG_HEADER): Added gcj/libgcj-config.h. Correctly use `test -z' instead of `test -n' in a couple places. (JV_HASH_SYNCHRONIZATION): Use AC_DEFINE; don't add to LIBGCJ_CXXFLAGS. * configure.host (enable_java_net_default): Initialize. (enable_hash_synchronization_default): New variable. 2001-05-23 Hans Boehm <Hans_Boehm@hp.com> * boehm.cc (_Jv_MarkObj): Don't mark sync_info when hash synchronization in use. (_Jv_MarkArray): Likewise. (_Jv_AllocBytes): Don't check return result. (handle_out_of_memory): New function. (_Jv_InitGC): Set GC_oom_fn. (trace_one_vtable): New global. (_Jv_AllocTraceOne): New function. * configure.in: Added --enable-hash-synchronization. * defineclass.cc, prims.cc, resolve.cc, java/lang/natString.cc, java/net/natInetAddress.cc: Remove _Jv_AllocBytesChecked. * nogc.cc (_Jv_AllocObj): Throw out-of-memory. (_Jv_AllocArray): Likewise. (_Jv_AllocBytes): Likewise. (_Jv_AllocPtrFreeObject): New function. (_Jv_AllocTraceOne): Likewise. * posix-threads.cc (_Jv_ThreadRegister): Handle slow pthread_self(). (self_cache): New global. (_Jv_ThreadSelf_out_of_line): New function. * prims.cc (_Jv_AllocBytesChecked): Removed. (_Jv_ThrowNoMemory): New function. (_Jv_AllocObject): Don't check for null return from allocator. (_Jv_NewObjectArray): Likewise. (_Jv_AllocPtrFreeObject): New function. (_Jv_NewPrimArray): Allocate pointer-free object if possible. * include/javaprims.h (_Jv_AllocPtrFreeObject): Declare. (_Jv_MonitorEnter, _Jv_MonitorExit): Don't return value. * include/boehm-gc.h (_Jv_AllocObj): Define. (_Jv_AllocPtrFreeObj): Define. * include/jvm.h (_Jv_AllocPtrFreeObj): Declare. (_Jv_ThrowNoMemory): Declare. (_Jv_AllocTraceOne): Declare. (_Jv_AllocBytesChecked): Removed. * include/posix-threads.h (_Jv_MutexInit, _Jv_MutexLock, _Jv_MutexUnlock): Handle LOCK_DEBUG. (_Jv_ThreadSelf): Handle case where system pthread_self() is slow. * java/lang/Class.h (Class): Declare _Jv_AllocPtrFreeObj as friend. * java/lang/Object.h (sync_info): Conditional upon presence of hash synchronization. * java/lang/natObject.cc: Much new code to handle thin locks and hash synchronization. * java/lang/natString.cc (_Jv_AllocString): Allocate pointer-free object if possible. From-SVN: r42519
This commit is contained in:
parent
865e0a8389
commit
3610e0d548
25 changed files with 1924 additions and 462 deletions
|
@ -1,6 +1,6 @@
|
|||
// javaprims.h - Main external header file for libgcj. -*- c++ -*-
|
||||
|
||||
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
|
||||
/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
|
||||
|
||||
This file is part of libgcj.
|
||||
|
||||
|
@ -14,6 +14,8 @@ details. */
|
|||
// Force C++ compiler to use Java-style exceptions.
|
||||
#pragma GCC java_exceptions
|
||||
|
||||
#include <gcj/libgcj-config.h>
|
||||
|
||||
// FIXME: this is a hack until we get a proper gcjh.
|
||||
// It is needed to work around system header files that define TRUE
|
||||
// and FALSE.
|
||||
|
@ -367,14 +369,24 @@ typedef struct _Jv_Field *jfieldID;
|
|||
typedef struct _Jv_Method *jmethodID;
|
||||
|
||||
extern "C" jobject _Jv_AllocObject (jclass, jint) __attribute__((__malloc__));
|
||||
#ifdef JV_HASH_SYNCHRONIZATION
|
||||
extern "C" jobject _Jv_AllocPtrFreeObject (jclass, jint)
|
||||
__attribute__((__malloc__));
|
||||
#else
|
||||
// Collector still needs to scan sync_info
|
||||
static inline jobject _Jv_AllocPtrFreeObject (jclass klass, jint sz)
|
||||
{
|
||||
return _Jv_AllocObject(klass, sz);
|
||||
}
|
||||
#endif
|
||||
extern "C" jboolean _Jv_IsInstanceOf(jobject, jclass);
|
||||
extern "C" jstring _Jv_AllocString(jsize) __attribute__((__malloc__));
|
||||
extern "C" jstring _Jv_NewString (const jchar*, jsize)
|
||||
__attribute__((__malloc__));
|
||||
extern jint _Jv_FormatInt (jchar* bufend, jint num);
|
||||
extern "C" jchar* _Jv_GetStringChars (jstring str);
|
||||
extern "C" jint _Jv_MonitorEnter (jobject);
|
||||
extern "C" jint _Jv_MonitorExit (jobject);
|
||||
extern "C" void _Jv_MonitorEnter (jobject);
|
||||
extern "C" void _Jv_MonitorExit (jobject);
|
||||
extern "C" jstring _Jv_NewStringLatin1(const char*, jsize)
|
||||
__attribute__((__malloc__));
|
||||
extern "C" jsize _Jv_GetStringUTFLength (jstring);
|
||||
|
@ -400,4 +412,5 @@ struct _Jv_Utf8Const
|
|||
char data[1]; /* In Utf8 format, with final '\0'. */
|
||||
};
|
||||
|
||||
|
||||
#endif /* __JAVAPRIMS_H__ */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue