jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.

* jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
        Pass millis to _Jv_CondWait.

From-SVN: r116611
This commit is contained in:
Keith Seitz 2006-08-31 22:56:23 +00:00 committed by Keith Seitz
parent 9d5941eea8
commit 59294c2bdf
2 changed files with 6 additions and 2 deletions

View File

@ -2,6 +2,9 @@
* include/jvmti_md.h: New file. * include/jvmti_md.h: New file.
* jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
Pass millis to _Jv_CondWait.
2006-08-31 Tom Tromey <tromey@redhat.com> 2006-08-31 Tom Tromey <tromey@redhat.com>
PR libgcj/28698: PR libgcj/28698:

View File

@ -156,11 +156,12 @@ _Jv_JVMTI_RawMonitorExit (MAYBE_UNUSED jvmtiEnv *env, jrawMonitorID monitor)
} }
static jvmtiError JNICALL static jvmtiError JNICALL
_Jv_JVMTI_RawMonitorWait (MAYBE_UNUSED jvmtiEnv *env, jrawMonitorID monitor) _Jv_JVMTI_RawMonitorWait (MAYBE_UNUSED jvmtiEnv *env, jrawMonitorID monitor,
jlong millis)
{ {
if (monitor == NULL) if (monitor == NULL)
return JVMTI_ERROR_INVALID_MONITOR; return JVMTI_ERROR_INVALID_MONITOR;
int r = _Jv_CondWait (&monitor->condition, &monitor->mutex, 0, 0); int r = _Jv_CondWait (&monitor->condition, &monitor->mutex, millis, 0);
if (r == _JV_NOT_OWNER) if (r == _JV_NOT_OWNER)
return JVMTI_ERROR_NOT_MONITOR_OWNER; return JVMTI_ERROR_NOT_MONITOR_OWNER;
if (r == _JV_INTERRUPTED) if (r == _JV_INTERRUPTED)