X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FOSThreads.c;h=01e0a251a1b6afccece1f98e32f7932a35955f33;hb=6e5df3a4551b8d8b83e936b3f7b52edfc778ca8a;hp=b7fcb49b4fc035f8843e4ab5cd3df72ccaa25744;hpb=3b9c5eb29bbb47a5733e37c9940789342d9d6f49;p=ghc-hetmet.git

diff --git a/ghc/rts/OSThreads.c b/ghc/rts/OSThreads.c
index b7fcb49..01e0a25 100644
--- a/ghc/rts/OSThreads.c
+++ b/ghc/rts/OSThreads.c
@@ -10,7 +10,7 @@
 #include "Rts.h"
 #if defined(RTS_SUPPORTS_THREADS)
 #include "OSThreads.h"
-
+#include "RtsUtils.h"
 
 #if defined(HAVE_PTHREAD_H) && !defined(WANT_NATIVE_WIN32_THREADS)
 /*
@@ -20,119 +20,189 @@
  *
  */
 
-void initCondVar( CondVar* pCond )
+void
+initCondition( Condition* pCond )
 {
   pthread_cond_init(pCond, NULL);
   return;
 }
 
-void closeCondVar( CondVar* pCond )
+void
+closeCondition( Condition* pCond )
 {
   pthread_cond_destroy(pCond);
   return;
 }
 
 rtsBool
-broadcastCondVar ( CondVar* pCond )
+broadcastCondition ( Condition* pCond )
 {
   return (pthread_cond_broadcast(pCond) == 0);
 }
 
 rtsBool
-signalCondVar ( CondVar* pCond )
+signalCondition ( Condition* pCond )
 {
   return (pthread_cond_signal(pCond) == 0);
 }
 
 rtsBool
-waitCondVar ( CondVar* pCond, MutexVar* pMut )
+waitCondition ( Condition* pCond, Mutex* pMut )
 {
   return (pthread_cond_wait(pCond,pMut) == 0);
 }
 
-void shutdownThread()
+void
+yieldThread()
+{
+  sched_yield();
+  return;
+}
+
+void
+shutdownThread()
 {
   pthread_exit(NULL);
 }
 
-int createOSThread ( OSThreadId* pId, void *(*startProc)(void*))
+/* Don't need the argument nor the result, at least not yet. */
+static void* startProcWrapper(void* pProc);
+static void*
+startProcWrapper(void* pProc)
+{
+  ((void (*)(void))pProc)();
+  return NULL;
+}
+
+
+int
+createOSThread ( OSThreadId* pId, void (*startProc)(void))
 {
-  return pthread_create(pId, NULL, startProc, NULL);
+  return pthread_create(pId, NULL, startProcWrapper, (void*)startProc);
 }
 
-OSThreadId osThreadId()
+OSThreadId
+osThreadId()
 {
   return pthread_self();
 }
 
-void initMutexVar (MutexVar* pMut)
+void
+initMutex(Mutex* pMut)
 {
   pthread_mutex_init(pMut,NULL);
   return;
 }
 
 #elif defined(HAVE_WINDOWS_H)
+#include <process.h>
+
 /* Win32 threads and synchronisation objects */
 
-/* A CondVar is represented by a Win32 Event object,
- * a MutexVar by a Mutex kernel object.
+/* A Condition is represented by a Win32 Event object;
+ * a Mutex by a Mutex kernel object.
+ *
+ * ToDo: go through the defn and usage of these to
+ * make sure the semantics match up with that of 
+ * the (assumed) pthreads behaviour. This is really
+ * just a first pass at getting something compilable.
  */
 
-void initCondVar( CondVar* pCond )
+void
+initCondition( Condition* pCond )
 {
   HANDLE h =  CreateEvent(NULL, 
-			  TRUE,  /* manual reset */
-			  TRUE,  /* initially signalled */
+			  FALSE,  /* auto reset */
+			  FALSE,  /* initially not signalled */
 			  NULL); /* unnamed => process-local. */
   
-
-
-  pthread_cond_init(pCond, NULL);
+  if ( h == NULL ) {
+    belch("initCondition: unable to create");
+  }
+  *pCond = h;
   return;
 }
 
-void closeCondVar( CondVar* pCond )
+void
+closeCondition( Condition* pCond )
 {
-  pthread_cond_destroy(pCond);
+  if ( CloseHandle(*pCond) == 0 ) {
+    belch("closeCondition: failed to close");
+  }
   return;
 }
 
 rtsBool
-broadcastCondVar ( CondVar* pCond )
+broadcastCondition ( Condition* pCond )
 {
-  return (pthread_cond_broadcast(pCond) == 0);
+  PulseEvent(*pCond);
+  return rtsTrue;
 }
 
 rtsBool
-signalCondVar ( CondVar* pCond )
+signalCondition ( Condition* pCond )
 {
-  return (pthread_cond_signal(pCond) == 0);
+  SetEvent(*pCond);
+  return rtsTrue;
 }
 
 rtsBool
-waitCondVar ( CondVar* pCond, MutexVar* pMut )
+waitCondition ( Condition* pCond, Mutex* pMut )
 {
-  return (pthread_cond_wait(pCond,pMut) == 0);
+  ReleaseMutex(*pMut);
+  WaitForSingleObject(*pCond, INFINITE);
+  /* Hmm..use WaitForMultipleObjects() ? */
+  WaitForSingleObject(*pMut, INFINITE);
+  return rtsTrue;
 }
 
-void shutdownThread()
+void
+yieldThread()
 {
-  pthread_exit(NULL);
+  Sleep(0);
+  return;
 }
 
-int createOSThread ( OSThreadId* pId, void *(*startProc)(void*))
+void
+shutdownThread()
 {
-  return pthread_create(pId, NULL, startProc, NULL);
+  _endthreadex(0);
 }
 
-OSThreadId osThreadId()
+static unsigned __stdcall startProcWrapper(void* pReal);
+static unsigned __stdcall
+startProcWrapper(void* pReal)
 {
-  return pthread_self();
+  ((void (*)(void))pReal)();
+  return 0;
+}
+
+int
+createOSThread ( OSThreadId* pId, void (*startProc)(void))
+{
+  
+  return (_beginthreadex ( NULL,  /* default security attributes */
+			   0,
+			   startProcWrapper,
+			   (void*)startProc,
+			   0,
+			   (unsigned*)pId) == 0);
+}
+
+OSThreadId
+osThreadId()
+{
+  return GetCurrentThreadId();
 }
 
-void initMutexVar (MutexVar* pMut)
+void
+initMutex (Mutex* pMut)
 {
-  pthread_mutex_init(pMut);
+  HANDLE h = CreateMutex ( NULL,  /* default sec. attributes */
+			   FALSE, /* not owned => initially signalled */
+			   NULL
+			   );
+  *pMut = h;
   return;
 }