From 63b61cd19ff1ae741a8c3403c1c3fa12bea1c893 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Fri, 4 May 2001 21:02:15 +0000
Subject: Revert much of previous erroneous checkin.  Add ChangeLog entry.

* pinfo.h: Correctly set __SIGOFFSET.
* path.cc (hash_path_name): Avoid calling library functions for simple copying
of characters.
* shortcut.c: Use WIN32_LEAN_AND_MEAN.
* smallprint.c: Ditto.
* environ.cc (getwinenv): Minor clarity fix.
* localtime.c: No need to include windows.h
* string.h: New file.
---
 winsup/cygwin/thread.cc | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

(limited to 'winsup/cygwin/thread.cc')

diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc
index a040b4b28..deedcae42 100644
--- a/winsup/cygwin/thread.cc
+++ b/winsup/cygwin/thread.cc
@@ -412,7 +412,7 @@ pthread_cond::BroadCast ()
   if (!verifyable_object_isvalid (mutex, PTHREAD_MUTEX_MAGIC))
     return;
   PulseEvent (win32_obj_id);
-  while (ilockdecr (&waiting) != 0)
+  while (InterlockedDecrement (&waiting) != 0)
     PulseEvent (win32_obj_id);
   mutex = NULL;
 }
@@ -798,7 +798,7 @@ __pthread_create (pthread_t * thread, const pthread_attr_t * attr,
       *thread = NULL;
       return EAGAIN;
     }
-  ilockincr (&MT_INTERFACE->threadcount);
+  InterlockedIncrement (&MT_INTERFACE->threadcount);
 
   return 0;
 }
@@ -1073,7 +1073,7 @@ __pthread_testcancel (void)
 /*
  * Races in pthread_atfork:
  * We are race safe in that any additions to the lists are made via
- * ilockexch.
+ * InterlockedExchangePointer.
  * However, if the user application doesn't perform syncronisation of some sort
  * It's not guaranteed that a near simultaneous call to pthread_atfork and fork
  * will result in the new atfork handlers being calls.
@@ -1084,7 +1084,7 @@ __pthread_testcancel (void)
  * will result in an indeterminate order for parent and child calls (what gets inserted
  * first isn't guaranteed.)
  *
- * There is one potential race... Does the result of ilockexch
+ * There is one potential race... Does the result of InterlockedExchangePointer
  * get committed to the return location _before_ any context switches can occur?
  * If yes, we're safe, if no, we're not.
  */
@@ -1123,7 +1123,7 @@ __pthread_atforkchild (void)
 
 /* FIXME: implement InterlockExchangePointer and get rid of the silly typecasts below
  */
-/*#define ilockexch ilockExchange */
+#define InterlockedExchangePointer InterlockedExchange
 
 /* Register a set of functions to run before and after fork.
  * prepare calls are called in LI-FC order.
@@ -1165,7 +1165,7 @@ __pthread_atfork (void (*prepare)(void), void (*parent)(void), void (*child)(voi
   if (prepcb)
   {
     prepcb->cb = prepare;
-    prepcb->next=(callback *)ilockexch ((LONG *) &MT_INTERFACE->pthread_prepare, (long int) prepcb);
+    prepcb->next=(callback *)InterlockedExchangePointer ((LONG *) &MT_INTERFACE->pthread_prepare, (long int) prepcb);
   }
   if (parentcb)
   {
@@ -1174,7 +1174,7 @@ __pthread_atfork (void (*prepare)(void), void (*parent)(void), void (*child)(voi
     while (*t)
       t = &(*t)->next;
     /* t = pointer to last next in the list */
-    parentcb->next=(callback *)ilockexch ((LONG *) t, (long int) parentcb);
+    parentcb->next=(callback *)InterlockedExchangePointer ((LONG *) t, (long int) parentcb);
   }
   if (childcb)
   {
@@ -1183,7 +1183,7 @@ __pthread_atfork (void (*prepare)(void), void (*parent)(void), void (*child)(voi
     while (*t)
       t = &(*t)->next;
     /* t = pointer to last next in the list */
-    childcb->next=(callback *)ilockexch ((LONG *) t, (long int) childcb);
+    childcb->next=(callback *)InterlockedExchangePointer ((LONG *) t, (long int) childcb);
   }
   return 0;
 }
@@ -1351,7 +1351,7 @@ __pthread_exit (void *value_ptr)
   MT_INTERFACE->destructors.IterateNull ();
 
   thread->return_ptr = value_ptr;
-  if (ilockdecr (&MT_INTERFACE->threadcount) == 0)
+  if (InterlockedDecrement (&MT_INTERFACE->threadcount) == 0)
     exit (0);
   else
     ExitThread (0);
@@ -1626,15 +1626,15 @@ __pthread_cond_timedwait (pthread_cond_t * cond, pthread_mutex_t * mutex,
   if ((*cond)->waiting)
     if ((*cond)->mutex && ((*cond)->mutex != (*themutex)))
       return EINVAL;
-  ilockincr (&((*cond)->waiting));
+  InterlockedIncrement (&((*cond)->waiting));
 
   (*cond)->mutex = (*themutex);
-  ilockincr (&((*themutex)->condwaits));
+  InterlockedIncrement (&((*themutex)->condwaits));
   rv = (*cond)->TimedWait (abstime->tv_sec * 1000);
   (*cond)->mutex->Lock ();
-  if (ilockdecr (&((*cond)->waiting)) == 0)
+  if (InterlockedDecrement (&((*cond)->waiting)) == 0)
     (*cond)->mutex = NULL;
-  ilockdecr (&((*themutex)->condwaits));
+  InterlockedDecrement (&((*themutex)->condwaits));
 
   return rv;
 }
@@ -1657,15 +1657,15 @@ __pthread_cond_wait (pthread_cond_t * cond, pthread_mutex_t * mutex)
   if ((*cond)->waiting)
     if ((*cond)->mutex && ((*cond)->mutex != (*themutex)))
       return EINVAL;
-  ilockincr (&((*cond)->waiting));
+  InterlockedIncrement (&((*cond)->waiting));
 
   (*cond)->mutex = (*themutex);
-  ilockincr (&((*themutex)->condwaits));
+  InterlockedIncrement (&((*themutex)->condwaits));
   rv = (*cond)->TimedWait (INFINITE);
   (*cond)->mutex->Lock ();
-  if (ilockdecr (&((*cond)->waiting)) == 0)
+  if (InterlockedDecrement (&((*cond)->waiting)) == 0)
     (*cond)->mutex = NULL;
-  ilockdecr (&((*themutex)->condwaits));
+  InterlockedDecrement (&((*themutex)->condwaits));
 
   return rv;
 }
-- 
cgit v1.2.3