3610e0d548
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
75 lines
1.9 KiB
C++
75 lines
1.9 KiB
C++
// Object.h - Header file for java.lang.Object. -*- c++ -*-
|
|
|
|
/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef __JAVA_LANG_OBJECT_H__
|
|
#define __JAVA_LANG_OBJECT_H__
|
|
|
|
#pragma interface
|
|
|
|
#include <gcj/javaprims.h>
|
|
|
|
// This class is mainly here as a kludge to get G++ to allocate two
|
|
// extra entries in each vtable.
|
|
struct _JvObjectPrefix
|
|
{
|
|
protected:
|
|
// New ABI Compatibility Dummy, #1 and 2.
|
|
virtual void nacd_1 (void) {}; // This slot really contains the Class pointer.
|
|
virtual void nacd_2 (void) {}; // Actually the GC bitmap marking descriptor.
|
|
};
|
|
|
|
class java::lang::Object : public _JvObjectPrefix
|
|
{
|
|
protected:
|
|
virtual void finalize (void);
|
|
public:
|
|
// Order must match order in Object.java.
|
|
jclass getClass (void);
|
|
virtual jint hashCode (void);
|
|
void notify (void);
|
|
void notifyAll (void);
|
|
void wait (jlong timeout, jint nanos);
|
|
virtual jboolean equals (jobject obj);
|
|
Object (void);
|
|
virtual jstring toString (void);
|
|
void wait (void);
|
|
void wait (jlong timeout);
|
|
|
|
friend void _Jv_MonitorEnter (jobject obj);
|
|
friend void _Jv_MonitorExit (jobject obj);
|
|
friend void _Jv_InitializeSyncMutex (void);
|
|
friend void _Jv_FinalizeObject (jobject obj);
|
|
|
|
#ifdef JV_MARKOBJ_DECL
|
|
friend JV_MARKOBJ_DECL;
|
|
#endif
|
|
#ifdef JV_MARKARRAY_DECL
|
|
friend JV_MARKARRAY_DECL;
|
|
#endif
|
|
|
|
static java::lang::Class class$;
|
|
|
|
protected:
|
|
virtual jobject clone (void);
|
|
|
|
private:
|
|
// This does not actually refer to a Java object. Instead it is a
|
|
// placeholder for a piece of internal data (the synchronization
|
|
// information).
|
|
# ifndef JV_HASH_SYNCHRONIZATION
|
|
jobject sync_info;
|
|
# endif
|
|
|
|
// Initialize the sync_info field. Not called with JV_HASH_SYNCHRONIZATION.
|
|
void sync_init (void);
|
|
};
|
|
|
|
#endif /* __JAVA_LANG_OBJECT_H__ */
|