[kaffe] CVS kaffe (dalibor): Really fix the netbsd jthread compilation problem this time around
Kaffe CVS
cvs-commits at kaffe.org
Sun Sep 5 05:58:50 PDT 2004
PatchSet 5144
Date: 2004/09/05 12:49:53
Author: dalibor
Branch: HEAD
Tag: (none)
Log:
Really fix the netbsd jthread compilation problem this time around
2004-09-05 jrandom <jrandom at i2p.net>
* kaffe/kaffevm/systems/unix-jthreads/jthread.c
(handleIO) Declare local variables before use.
Reported by: Kiyo Inaba <inaba at src.ricoh.co.jp>
Members:
ChangeLog:1.2700->1.2701
kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.120->1.121
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2700 kaffe/ChangeLog:1.2701
--- kaffe/ChangeLog:1.2700 Sun Sep 5 12:24:46 2004
+++ kaffe/ChangeLog Sun Sep 5 12:49:53 2004
@@ -1,3 +1,10 @@
+2004-09-05 jrandom <jrandom at i2p.net>
+
+ * kaffe/kaffevm/systems/unix-jthreads/jthread.c
+ (handleIO) Declare local variables before use.
+
+ Reported by: Kiyo Inaba <inaba at src.ricoh.co.jp>
+
2004-09-05 Dalibor Topic <robilad at kaffe.org>
* kaffe/kaffevm/baseClasses.c:
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.120 kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.121
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.120 Sat Sep 4 12:04:56 2004
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c Sun Sep 5 12:49:55 2004
@@ -2106,6 +2106,10 @@
handleIO(int canSleep)
{
int r;
+ /** the wake-up time of the next thread on the alarm queue */
+ jlong firstAlarm;
+ /** how long do we want to sleep, at most */
+ jlong maxWait;
/* NB: both pollarray and rd, wr are thread-local */
#if USE_POLL
/* for poll(2) */
@@ -2181,13 +2185,13 @@
* poll / select
*
*/
- jlong firstAlarm = -1;
+ firstAlarm = -1;
if (alarmList != 0) {
// sorted
firstAlarm = JTHREADQ(alarmList)->time;
}
- jlong maxWait = (canSleep ? -1 : 0);
+ maxWait = (canSleep ? -1 : 0);
if ( (firstAlarm != -1) && (canSleep) ) {
jlong curTime = currentTime();
if (curTime >= firstAlarm) {
More information about the kaffe
mailing list