projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-07-21 14:33:19 by simonmar]
[ghc-hetmet.git]
/
ghc
/
rts
/
Select.c
diff --git
a/ghc/rts/Select.c
b/ghc/rts/Select.c
index
a2ad455
..
677fdd2
100644
(file)
--- a/
ghc/rts/Select.c
+++ b/
ghc/rts/Select.c
@@
-1,5
+1,5
@@
/* -----------------------------------------------------------------------------
/* -----------------------------------------------------------------------------
- * $Id: Select.c,v 1.23 2003/01/25 15:54:50 wolfgang Exp $
+ * $Id: Select.c,v 1.29 2003/06/26 12:22:59 stolz Exp $
*
* (c) The GHC Team 1995-2002
*
*
* (c) The GHC Team 1995-2002
*
@@
-7,6
+7,7
@@
*
* ---------------------------------------------------------------------------*/
*
* ---------------------------------------------------------------------------*/
+
/* we're outside the realms of POSIX here... */
/* #include "PosixSource.h" */
/* we're outside the realms of POSIX here... */
/* #include "PosixSource.h" */
@@
-14,6
+15,7
@@
#include "Schedule.h"
#include "RtsUtils.h"
#include "RtsFlags.h"
#include "Schedule.h"
#include "RtsUtils.h"
#include "RtsFlags.h"
+#include "Timer.h"
#include "Itimer.h"
#include "Signals.h"
#include "Capability.h"
#include "Itimer.h"
#include "Signals.h"
#include "Capability.h"
@@
-26,24
+28,22
@@
# include <sys/time.h>
# endif
# include <sys/time.h>
# endif
-# ifdef mingw32_TARGET_OS
-# include <windows.h>
-# endif
-
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
/* last timestamp */
nat timestamp = 0;
#ifdef RTS_SUPPORTS_THREADS
static rtsBool isWorkerBlockedInAwaitEvent = rtsFalse;
static rtsBool workerWakeupPending = rtsFalse;
/* last timestamp */
nat timestamp = 0;
#ifdef RTS_SUPPORTS_THREADS
static rtsBool isWorkerBlockedInAwaitEvent = rtsFalse;
static rtsBool workerWakeupPending = rtsFalse;
-#ifndef mingw32_TARGET_OS
static int workerWakeupPipe[2];
static rtsBool workerWakeupInited = rtsFalse;
#endif
static int workerWakeupPipe[2];
static rtsBool workerWakeupInited = rtsFalse;
#endif
-#endif
/* There's a clever trick here to avoid problems when the time wraps
* around. Since our maximum delay is smaller than 31 bits of ticks
/* There's a clever trick here to avoid problems when the time wraps
* around. Since our maximum delay is smaller than 31 bits of ticks
@@
-94,10
+94,8
@@
awaitEvent(rtsBool wait)
StgTSO *tso, *prev, *next;
rtsBool ready;
fd_set rfd,wfd;
StgTSO *tso, *prev, *next;
rtsBool ready;
fd_set rfd,wfd;
-#ifndef mingw32_TARGET_OS
int numFound;
int maxfd = -1;
int numFound;
int maxfd = -1;
-#endif
rtsBool select_succeeded = rtsTrue;
rtsBool unblock_all = rtsFalse;
struct timeval tv;
rtsBool select_succeeded = rtsTrue;
rtsBool unblock_all = rtsFalse;
struct timeval tv;
@@
-135,7
+133,6
@@
awaitEvent(rtsBool wait)
min = 0x7ffffff;
}
min = 0x7ffffff;
}
-#ifndef mingw32_TARGET_OS
/*
* Collect all of the fd's that we're interested in
*/
/*
* Collect all of the fd's that we're interested in
*/
@@
-229,25
+226,17
@@
awaitEvent(rtsBool wait)
barf("select failed");
}
}
barf("select failed");
}
}
-#else /* on mingwin */
-#ifdef RTS_SUPPORTS_THREADS
- isWorkerBlockedInAwaitEvent = rtsTrue;
-#endif
- RELEASE_LOCK(&sched_mutex);
- while (1) {
- Sleep(0); /* don't busy wait */
-#endif /* mingw32_TARGET_OS */
ACQUIRE_LOCK(&sched_mutex);
#ifdef RTS_SUPPORTS_THREADS
isWorkerBlockedInAwaitEvent = rtsFalse;
#endif
ACQUIRE_LOCK(&sched_mutex);
#ifdef RTS_SUPPORTS_THREADS
isWorkerBlockedInAwaitEvent = rtsFalse;
#endif
-#ifndef mingw32_TARGET_OS
/* We got a signal; could be one of ours. If so, we need
* to start up the signal handler straight away, otherwise
* we could block for a long time before the signal is
* serviced.
*/
/* We got a signal; could be one of ours. If so, we need
* to start up the signal handler straight away, otherwise
* we could block for a long time before the signal is
* serviced.
*/
+#if defined(RTS_USER_SIGNALS)
if (signals_pending()) {
RELEASE_LOCK(&sched_mutex); /* ToDo: kill */
startSignalHandlers();
if (signals_pending()) {
RELEASE_LOCK(&sched_mutex); /* ToDo: kill */
startSignalHandlers();
@@
-331,7
+320,7
@@
awaitEvent(rtsBool wait)
}
}
}
}
-#if defined(RTS_SUPPORTS_THREADS) && !defined(mingw32_TARGET_OS)
+#if defined(RTS_SUPPORTS_THREADS)
// if we were woken up by wakeBlockedWorkerThread,
// read the dummy byte from the pipe
if(select_succeeded && FD_ISSET(workerWakeupPipe[0], &rfd)) {
// if we were woken up by wakeBlockedWorkerThread,
// read the dummy byte from the pipe
if(select_succeeded && FD_ISSET(workerWakeupPipe[0], &rfd)) {
@@
-351,11
+340,9
@@
awaitEvent(rtsBool wait)
* wake it.
* Must be called with sched_mutex held.
*/
* wake it.
* Must be called with sched_mutex held.
*/
-
void
wakeBlockedWorkerThread()
{
void
wakeBlockedWorkerThread()
{
-#ifndef mingw32_TARGET_OS
if(isWorkerBlockedInAwaitEvent && !workerWakeupPending) {
unsigned char dummy = 42; // Any value will do here
if(isWorkerBlockedInAwaitEvent && !workerWakeupPending) {
unsigned char dummy = 42; // Any value will do here
@@
-363,10
+350,5
@@
wakeBlockedWorkerThread()
write(workerWakeupPipe[1],&dummy,1);
workerWakeupPending = rtsTrue;
}
write(workerWakeupPipe[1],&dummy,1);
workerWakeupPending = rtsTrue;
}
-#else
- // The Win32 implementation currently uses a polling loop,
- // so there is no need to explicitly wake it
-#endif
}
}
-
#endif
#endif