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

* jni.cc (call): Synchronize if required.

Browse source 
From-SVN: r47949
This commit is contained in:
Tom Tromey 2001-12-12 20:58:41 +00:00 • committed by Tom Tromey
parent 242f4945ac
commit 415791dba8
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libjava/ChangeLog
View file

@ -1,5 +1,7 @@
2001-12-12 Tom Tromey <tromey@redhat.com>
* jni.cc (call): Synchronize if required.
* gij.cc (main): Clarify --help output.
* gnu/gcj/runtime/StringBuffer.java

14
libjava/jni.cc
View file

@ -2066,6 +2066,17 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
if ((_this->self->accflags & java::lang::reflect::Modifier::STATIC))
real_args[offset++].ptr = _this->defining_class;
// In libgcj, the callee synchronizes.
jobject sync = NULL;
if ((_this->self->accflags & java::lang::reflect::Modifier::SYNCHRONIZED))
{
if ((_this->self->accflags & java::lang::reflect::Modifier::STATIC))
sync = _this->defining_class;
else
sync = (jobject) args[0].ptr;
_Jv_MonitorEnter (sync);
}
// Copy over passed-in arguments.
memcpy (&real_args[offset], args, _this->args_raw_size);
@ -2073,6 +2084,9 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function,
ret, real_args);
if (sync != NULL)
_Jv_MonitorExit (sync);
_Jv_JNI_PopSystemFrame (env);
}