From 59294c2bdfdcd762f9c0b22378b09ac8efc293d0 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Thu, 31 Aug 2006 22:56:23 +0000 Subject: [PATCH] jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter. * jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter. Pass millis to _Jv_CondWait. From-SVN: r116611 --- libjava/ChangeLog | 3 +++ libjava/jvmti.cc | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d51ae6e4092..91a90b6a37f 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 PR libgcj/28698: diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc index c30f6f9343f..91d941a1a63 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) -- 2.30.2