diff options
| author | Keith Seitz <keiths@redhat.com> | 2006-08-31 22:56:23 +0000 |
|---|---|---|
| committer | Keith Seitz <kseitz@gcc.gnu.org> | 2006-08-31 22:56:23 +0000 |
| commit | 59294c2bdfdcd762f9c0b22378b09ac8efc293d0 (patch) | |
| tree | 6b01125ba866dd07d4a09d8f06e0eb57d5240f11 /libjava | |
| parent | 9d5941eea8e55d27b8c4f2b1916ca7272d5c16cc (diff) | |
| download | gcc-59294c2bdfdcd762f9c0b22378b09ac8efc293d0.zip gcc-59294c2bdfdcd762f9c0b22378b09ac8efc293d0.tar.gz gcc-59294c2bdfdcd762f9c0b22378b09ac8efc293d0.tar.bz2 | |
jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
* jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.
Pass millis to _Jv_CondWait.
From-SVN: r116611
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 3 | ||||
| -rw-r--r-- | libjava/jvmti.cc | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d51ae6e..91a90b6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -2,6 +2,9 @@ * 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> PR libgcj/28698: diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc index c30f6f9..91d941a 100644 --- a/libjava/jvmti.cc +++ b/libjava/jvmti.cc @@ -156,11 +156,12 @@ _Jv_JVMTI_RawMonitorExit (MAYBE_UNUSED jvmtiEnv *env, jrawMonitorID monitor) } 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) 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) return JVMTI_ERROR_NOT_MONITOR_OWNER; if (r == _JV_INTERRUPTED) |