diff options
| author | Bryce McKinlay <mckinlay@redhat.com> | 2004-07-13 21:03:03 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2004-07-13 22:03:03 +0100 |
| commit | 6187fd28ad121ea6a3adabdcf106df70d9ea0429 (patch) | |
| tree | 9e450f9a46004f388b904ee291f197c06e3c7f8a /libjava/interpret.cc | |
| parent | b6fa4f6e162650a0dfddbefb0104ca7d0224920d (diff) | |
| download | gcc-6187fd28ad121ea6a3adabdcf106df70d9ea0429.zip gcc-6187fd28ad121ea6a3adabdcf106df70d9ea0429.tar.gz gcc-6187fd28ad121ea6a3adabdcf106df70d9ea0429.tar.bz2 | |
re PR libgcj/7587 (direct threaded interpreter not thread-safe)
2004-07-13 Bryce McKinlay <mckinlay@redhat.com>
PR libgcj/7587
* interpret.cc (compile_mutex): New.
(_Jv_InitInterpreter): New. Initialize compile_mutex.
(run): Lock compile_mutex before calling compile() if compilation is
required.
* prims.cc (_Jv_CreateJavaVM): Call _Jv_InitInterpreter().
* include/java-interp.h (_Jv_InitInterpreter): Declare.
From-SVN: r84644
Diffstat (limited to 'libjava/interpret.cc')
| -rw-r--r-- | libjava/interpret.cc | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/libjava/interpret.cc b/libjava/interpret.cc index 7ec83a2..40c7cba 100644 --- a/libjava/interpret.cc +++ b/libjava/interpret.cc @@ -54,6 +54,21 @@ static void throw_null_pointer_exception () __attribute__ ((__noreturn__)); #endif +#ifdef DIRECT_THREADED +// Lock to ensure that methods are not compiled concurrently. +// We could use a finer-grained lock here, however it is not safe to use +// the Class monitor as user code in another thread could hold it. +static _Jv_Mutex_t compile_mutex; + +void +_Jv_InitInterpreter() +{ + _Jv_MutexInit (&compile_mutex); +} +#else +void _Jv_InitInterpreter() {} +#endif + extern "C" double __ieee754_fmod (double,double); // This represents a single slot in the "compiled" form of the @@ -1032,9 +1047,14 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args) #define PCVAL(unionval) unionval.p #define AMPAMP(label) &&label - // Compile if we must. + // Compile if we must. NOTE: Double-check locking. if (prepared == NULL) - compile (insn_target); + { + _Jv_MutexLock (&compile_mutex); + if (prepared == NULL) + compile (insn_target); + _Jv_MutexUnlock (&compile_mutex); + } pc = (insn_slot *) prepared; #else |