OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
From-SVN: r27524
This commit is contained in:
Bryce McKinlay 1999-06-14 17:20:35 +00:00 committed by Bryce McKinlay
parent 8576f0942e
commit 00af55a292
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,8 +1,13 @@
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 @@
* 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.

11
libjava/posix-threads.cc
View File

@ -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;