Commit 00af55a2 by Bryce McKinlay Committed by Bryce McKinlay

* posix-threads.cc (_Jv_CondWait): Fix currentTimeMillis() overflow.

From-SVN: r27524
parent 8576f094
1999-06-14 Bryce McKinlay <bryce@albatross.co.nz>
* posix-threads.cc (_Jv_CondWait): Fix currentTimeMillis() overflow.
1999-06-11 Warren Levy <warrenl@cygnus.com> 1999-06-11 Warren Levy <warrenl@cygnus.com>
* mauve-libgcj: Activated java.net Mauve tests. * mauve-libgcj: Activated java.net Mauve tests.
1999-06-10 Bryce McKinlay <bryce@albatross.co.nz> 1999-06-10 Bryce McKinlay <bryce@albatross.co.nz>
* java/net/natInetAddress.cc (aton): Fix typos. * java/net/natInetAddress.cc (aton): Fix typos.
(lookup): Use a bigger buffer size for gethostbyname_r on all (lookup): Use a bigger buffer size for gethostbyname_r on all
versions of glibc. Updated FIXME comment explaining this. versions of glibc. Updated FIXME comment explaining this.
...@@ -22,7 +27,7 @@ ...@@ -22,7 +27,7 @@
* java/text/DecimalFormat.java: Throw IllegalArgumentException * java/text/DecimalFormat.java: Throw IllegalArgumentException
throughout rather than ParseException. throughout rather than ParseException.
1999-06-09 Bryce McKinlay <bryce@albatross.co.nz> 1999-06-09 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/Runtime.java (exec): Convert prog name and arguments * java/lang/Runtime.java (exec): Convert prog name and arguments
to string array. to string array.
......
...@@ -85,12 +85,11 @@ _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, ...@@ -85,12 +85,11 @@ _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
r = pthread_cond_wait (cv, pmu); r = pthread_cond_wait (cv, pmu);
else else
{ {
struct timespec ts; struct timespec ts;
unsigned long m = millis + java::lang::System::currentTimeMillis (); jlong m = millis + java::lang::System::currentTimeMillis ();
ts.tv_sec = m / 1000;
ts.tv_sec = m / 1000; ts.tv_nsec = ((m % 1000) * 1000000) + nanos;
ts.tv_nsec = (m % 1000) * 1000 * 1000 + nanos;
r = pthread_cond_timedwait (cv, pmu, &ts); r = pthread_cond_timedwait (cv, pmu, &ts);
} }
return r; return r;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment