jvmti.cc (_Jv_JVMTI_RawMonitorWait): Add millis parameter.

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

From-SVN: r116611

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d51ae6e4092a79a895d239724428bb1a944d40d9..91a90b6a37fe293dbd8e772b4430f02745fc2ae6 100644 (file)
--- 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 c30f6f9343fe961eec64923d11bc538b753c0e06..91d941a1a630b9d508a22e338d391efffd8116a3 100644 (file)
--- 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)