''

10 files changed, 739 insertions, 598 deletions

diff --git a/Bmakefile b/Bmakefile
index 80b9bc6..7775dd1 100644
--- a/Bmakefile
+++ b/Bmakefile
@@ -6,9 +6,9 @@
 # Currently only the recommended pthreadBC.dll is built by this makefile.

 #

 

-
-DLL_VER	= 2

-
+

+DLL_VER	= 1

+

 DEVROOT	= .

 

 DLLDEST	= $(DEVROOT)\DLL

@@ -139,6 +139,7 @@ PRIVATE_SRCS	= \
 		ptw32_tkAssocDestroy.c \

 		ptw32_callUserDestroyRoutines.c \

 		ptw32_timespec.c \

+		ptw32_relmillisecs.c \

 		ptw32_throw.c \

 		ptw32_InterlockedCompareExchange.c \

 		ptw32_getprocessors.c

@@ -186,9 +187,7 @@ SEMAPHORE_SRCS = \
 		sem_getvalue.c \

 		sem_open.c \

 		sem_close.c \

-		sem_unlink.c \

-		ptw32_increase_semaphore.c \

-		ptw32_decrease_semaphore.c

+		sem_unlink.c

 

 SPIN_SRCS	= \

 		ptw32_spinlock_check_need_init.c \

diff --git a/ChangeLog b/ChangeLog
index 255f7a6..fc83060 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2005-04-25  Ross Johnson  <ross at callisto.canberra.edu.au>

+

+	* ptw32_relmillisecs.c: New module; converts future abstime to 

+	milliseconds relative to 'now'.

+	* pthread_mutex_timedlock.c: Use new ptw32_relmillisecs routine in

+	place of internal code; remove the NEED_SEM code - this routine is now

+	implemented for builds that define NEED_SEM (WinCE etc)

+	* sem_timedwait.c: Likewise; after timeout or cancellation,

+	re-attempt to acquire the semaphore in case one has been posted since

+	the timeout/cancel occurred. Thanks to 

+	* Makefile: Add ptw32_relmillisecs.c module; remove

+	ptw32_{in,de}crease_semaphore.c modules.

+	* GNUmakefile: Likewise.

+	* Bmakefile: Likewise.

+

+	* sem_init.c: Re-write the NEED_SEM code to be consistent with the

+	non-NEED_SEM code, but retaining use of an event in place of the w32 sema

+	for w32 systems that don't include semaphores (WinCE);

+	the NEED_SEM versions of semaphores has been broken for a long time but is

+	now fixed and supports all of the same routines as the non-NEED_SEM case.

+	* sem_destroy.c: Likewise.

+	* sem_wait.c: Likewise.

+	* sem_post.c: Likewise.

+	* sem_post_multple.c: Likewise.

+	* implement.h: Likewise.

+	* sem_timedwait.c: Likewise; this routine is now

+	implemented for builds that define NEED_SEM (WinCE etc).

+	* sem_trywait.c: Likewise.

+	* sem_getvalue.c: Likewise.

+

 2005-04-11  Ross Johnson  <ross at callisto.canberra.edu.au>

 

 	* pthread_once.c: Add priority boosting to prevent init_routine

diff --git a/GNUmakefile b/GNUmakefile
index 1964213..d18402a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -219,6 +219,7 @@ SMALL_STATIC_OBJS	= \
 		ptw32_new.o \

 		ptw32_reuse.o \

 		ptw32_semwait.o \

+		ptw32_relmillisecs.o \

 		ptw32_rwlock_check_need_init.o \

 		sched_get_priority_max.o \

 		sched_get_priority_min.o \

@@ -236,8 +237,6 @@ SMALL_STATIC_OBJS	= \
 		sem_open.o \

 		sem_close.o \

 		sem_unlink.o \

-		ptw32_increase_semaphore.o \

-		ptw32_decrease_semaphore.o \

 		signal.o \

 		pthread_kill.o \

 		ptw32_spinlock_check_need_init.o \

@@ -349,6 +348,7 @@ PRIVATE_SRCS	= \
 		ptw32_tkAssocDestroy.c \

 		ptw32_callUserDestroyRoutines.c \

 		ptw32_semwait.c \

+		ptw32_relmillisecs.c \

 		ptw32_timespec.c \

 		ptw32_throw.c \

 		ptw32_InterlockedCompareExchange.c \

@@ -397,9 +397,7 @@ SEMAPHORE_SRCS = \
 		sem_getvalue.c \

 		sem_open.c \

 		sem_close.c \

-		sem_unlink.c \

-		ptw32_increase_semaphore.c \

-		ptw32_decrease_semaphore.c

+		sem_unlink.c

 

 SPIN_SRCS	= \

 		ptw32_spinlock_check_need_init.c \

diff --git a/Makefile b/Makefile
index 9b6c576..c31249f 100644
--- a/Makefile
+++ b/Makefile
@@ -174,6 +174,7 @@ SMALL_STATIC_OBJS	= \
 		ptw32_cond_check_need_init.obj \

 		ptw32_mutex_check_need_init.obj \

 		ptw32_semwait.obj \

+		ptw32_relmillisecs.obj \

 		sched_get_priority_max.obj \

 		sched_get_priority_min.obj \

 		sched_setscheduler.obj \

@@ -190,8 +191,6 @@ SMALL_STATIC_OBJS	= \
 		sem_open.obj \

 		sem_close.obj \

 		sem_unlink.obj \

-		ptw32_increase_semaphore.obj \

-		ptw32_decrease_semaphore.obj \

 		signal.obj \

 		pthread_kill.obj \

 		ptw32_spinlock_check_need_init.obj \

@@ -262,6 +261,7 @@ MISC_SRCS	= \
 		ptw32_calloc.c \

 		ptw32_new.c \

 		ptw32_reuse.c \

+		ptw32_relmillisecs.c \

 		w32_CancelableWait.c

 

 MUTEX_SRCS	= \

@@ -346,9 +346,7 @@ SEMAPHORE_SRCS = \
 		sem_getvalue.c \

 		sem_open.c \

 		sem_close.c \

-		sem_unlink.c \

-		ptw32_increase_semaphore.c \

-		ptw32_decrease_semaphore.c

+		sem_unlink.c

 

 SPIN_SRCS	= \

 		ptw32_spinlock_check_need_init.c \

diff --git a/WinCE-PORT b/WinCE-PORT
index 80b3bd3..f5981a9 100644
--- a/WinCE-PORT
+++ b/WinCE-PORT
@@ -1,3 +1,12 @@
+NOTE: The comments in this file relate to the original WinCE port
+done by Tristan Savatier. The semaphore routines have been 
+completely rewritten since (2005-04-25), having been progressively
+broken more and more by changes to the library. All of the semaphore
+routines implemented for W9x/WNT/2000 and up should now also work for
+WinCE. Also, pthread_mutex_timedlock should now work. [RPJ]
+
+----
+
 Some interesting news:
 
 I have been able to port pthread-win32 to Windows-CE,
diff --git a/pthread.h b/pthread.h
index b32722e..26a9a8d 100644
--- a/pthread.h
+++ b/pthread.h
@@ -37,8 +37,8 @@
  * See the README file for an explanation of the pthreads-win32 version

  * numbering scheme and how the DLL is named etc.

  */

-#define PTW32_VERSION 1,7,0,0

-#define PTW32_VERSION_STRING "1, 7, 0, 0\0"

+#define PTW32_VERSION 1,8,0,0

+#define PTW32_VERSION_STRING "1, 8, 0, 0\0"

 

 /* There are three implementations of cancel cleanup.

  * Note that pthread.h is included in both application

diff --git a/ptw32_relmillisecs.c b/ptw32_relmillisecs.c
new file mode 100644
index 0000000..2e6bc4d
--- /dev/null
+++ b/ptw32_relmillisecs.c
@@ -0,0 +1,120 @@
+/*

+ * ptw32_relmillisecs.c

+ *

+ * Description:

+ * This translation unit implements miscellaneous thread functions.

+ *

+ * --------------------------------------------------------------------------

+ *

+ *      Pthreads-win32 - POSIX Threads Library for Win32

+ *      Copyright(C) 1998 John E. Bossom

+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors

+ * 

+ *      Contact Email: rpj@callisto.canberra.edu.au

+ * 

+ *      The current list of contributors is contained

+ *      in the file CONTRIBUTORS included with the source

+ *      code distribution. The list can also be seen at the

+ *      following World Wide Web location:

+ *      http://sources.redhat.com/pthreads-win32/contributors.html

+ * 

+ *      This library is free software; you can redistribute it and/or

+ *      modify it under the terms of the GNU Lesser General Public

+ *      License as published by the Free Software Foundation; either

+ *      version 2 of the License, or (at your option) any later version.

+ * 

+ *      This library is distributed in the hope that it will be useful,

+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ *      Lesser General Public License for more details.

+ * 

+ *      You should have received a copy of the GNU Lesser General Public

+ *      License along with this library in the file COPYING.LIB;

+ *      if not, write to the Free Software Foundation, Inc.,

+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

+ */

+

+#ifndef _UWIN

+//#include <process.h>

+#endif

+#include "pthread.h"

+#include "implement.h"

+#ifndef NEED_FTIME

+#include <sys/timeb.h>

+#endif

+

+

+INLINE DWORD 

+ptw32_relmillisecs (const struct timespec * abstime)

+{

+  const int64_t NANOSEC_PER_MILLISEC = 1000000;

+  const int64_t MILLISEC_PER_SEC = 1000;

+  DWORD milliseconds;

+  int64_t tmpAbsMilliseconds;

+  int64_t tmpCurrMilliseconds;

+#ifdef NEED_FTIME

+  struct timespec currSysTime;

+  FILETIME ft;

+  SYSTEMTIME st;

+#else /* ! NEED_FTIME */

+  struct _timeb currSysTime;

+#endif /* NEED_FTIME */

+

+

+  /* 

+   * Calculate timeout as milliseconds from current system time. 

+   */

+

+  /*

+   * subtract current system time from abstime in a way that checks

+   * that abstime is never in the past, or is never equivalent to the

+   * defined INFINITE value (0xFFFFFFFF).

+   *

+   * Assume all integers are unsigned, i.e. cannot test if less than 0.

+   */

+  tmpAbsMilliseconds =  (int64_t)abstime->tv_sec * MILLISEC_PER_SEC;

+  tmpAbsMilliseconds += ((int64_t)abstime->tv_nsec + (NANOSEC_PER_MILLISEC/2)) / NANOSEC_PER_MILLISEC;

+

+  /* get current system time */

+

+#ifdef NEED_FTIME

+

+  GetSystemTime(&st);

+  SystemTimeToFileTime(&st, &ft);

+  /*

+   * GetSystemTimeAsFileTime(&ft); would be faster,

+   * but it does not exist on WinCE

+   */

+

+  ptw32_filetime_to_timespec(&ft, &currSysTime);

+

+  tmpCurrMilliseconds = (int64_t)currSysTime.tv_sec * MILLISEC_PER_SEC;

+  tmpCurrMilliseconds += ((int64_t)currSysTime.tv_nsec + (NANOSEC_PER_MILLISEC/2))

+			   / NANOSEC_PER_MILLISEC;

+

+#else /* ! NEED_FTIME */

+

+  _ftime(&currSysTime);

+

+  tmpCurrMilliseconds = (int64_t) currSysTime.time * MILLISEC_PER_SEC;

+  tmpCurrMilliseconds += (int64_t) currSysTime.millitm;

+

+#endif /* NEED_FTIME */

+

+  if (tmpAbsMilliseconds > tmpCurrMilliseconds)

+    {

+      milliseconds = (DWORD) (tmpAbsMilliseconds - tmpCurrMilliseconds);

+      if (milliseconds == INFINITE)

+        {

+          /* Timeouts must be finite */

+          milliseconds--;

+        }

+    }

+  else

+    {

+      /* The abstime given is in the past */

+      milliseconds = 0;

+    }

+

+  return milliseconds;

+}

diff --git a/tests/benchtest1.c b/tests/benchtest1.c
index c8f7f41..453ebcc 100644
--- a/tests/benchtest1.c
+++ b/tests/benchtest1.c
@@ -1,248 +1,249 @@
-/*
- * benchtest1.c
- *
- *
- * --------------------------------------------------------------------------
- *
- *      Pthreads-win32 - POSIX Threads Library for Win32
- *      Copyright(C) 1998 John E. Bossom
- *      Copyright(C) 1999,2005 Pthreads-win32 contributors
- * 
- *      Contact Email: rpj@callisto.canberra.edu.au
- * 
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *      http://sources.redhat.com/pthreads-win32/contributors.html
- * 
- *      This library is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU Lesser General Public
- *      License as published by the Free Software Foundation; either
- *      version 2 of the License, or (at your option) any later version.
- * 
- *      This library is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *      Lesser General Public License for more details.
- * 
- *      You should have received a copy of the GNU Lesser General Public
- *      License along with this library in the file COPYING.LIB;
- *      if not, write to the Free Software Foundation, Inc.,
- *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- * --------------------------------------------------------------------------
- *
- * Measure time taken to complete an elementary operation.
- *
- * - Mutex
- *   Single thread iteration over lock/unlock for each mutex type.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-#ifdef __GNUC__
-#include <stdlib.h>
-#endif
-
-#include "benchtest.h"
-
-#define PTW32_MUTEX_TYPES
-#define ITERATIONS      10000000L
-
-pthread_mutex_t mx;
-pthread_mutexattr_t ma;
-struct _timeb currSysTimeStart;
-struct _timeb currSysTimeStop;
-long durationMilliSecs;
-long overHeadMilliSecs = 0;
-int one = 1;
-int zero = 0;
-
-#define GetDurationMilliSecs(_TStart, _TStop) ((_TStop.time*1000+_TStop.millitm) \
-                                               - (_TStart.time*1000+_TStart.millitm))
-
-/*
- * Dummy use of j, otherwise the loop may be removed by the optimiser
- * when doing the overhead timing with an empty loop.
- */
-#define TESTSTART \
-  { int i, j = 0, k = 0; _ftime(&currSysTimeStart); for (i = 0; i < ITERATIONS; i++) { j++;
-
-#define TESTSTOP \
-  }; _ftime(&currSysTimeStop); if (j + k == i) j++; }
-
-
-void
-runTest (char * testNameString, int mType)
-{
-#ifdef PTW32_MUTEX_TYPES
-  assert(pthread_mutexattr_settype(&ma, mType) == 0);
-#endif
-  assert(pthread_mutex_init(&mx, &ma) == 0);
-
-  TESTSTART
-  assert(pthread_mutex_lock(&mx) == zero);
-  assert(pthread_mutex_unlock(&mx) == zero);
-  TESTSTOP
-
-  assert(pthread_mutex_destroy(&mx) == 0);
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    testNameString,
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  int i = 0;
-  CRITICAL_SECTION cs;
-  old_mutex_t ox;
-  pthread_mutexattr_init(&ma);
-
-  printf( "=============================================================================\n");
-  printf( "\nLock plus unlock on an unlocked mutex.\n%ld iterations\n\n",
-          ITERATIONS);
-  printf( "%-45s %15s %15s\n",
-	    "Test",
-	    "Total(msec)",
-	    "average(usec)");
-  printf( "-----------------------------------------------------------------------------\n");
-
-  /*
-   * Time the loop overhead so we can subtract it from the actual test times.
-   */
-
-  TESTSTART
-  assert(1 == one);
-  assert(1 == one);
-  TESTSTOP
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-  overHeadMilliSecs = durationMilliSecs;
-
-
-  TESTSTART
-  assert((dummy_call(&i), 1) == one);
-  assert((dummy_call(&i), 1) == one);
-  TESTSTOP
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    "Dummy call x 2",
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-
-
-  TESTSTART
-  assert((interlocked_inc_with_conditionals(&i), 1) == one);
-  assert((interlocked_dec_with_conditionals(&i), 1) == one);
-  TESTSTOP
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    "Dummy call -> Interlocked with cond x 2",
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-
-
-  TESTSTART
-  assert((InterlockedIncrement(&i), 1) == one);
-  assert((InterlockedDecrement(&i), 1) == one);
-  TESTSTOP
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    "InterlockedOp x 2",
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-
-
-  InitializeCriticalSection(&cs);
-
-  TESTSTART
-  assert((EnterCriticalSection(&cs), 1) == one);
-  assert((LeaveCriticalSection(&cs), 1) == one);
-  TESTSTOP
-
-  DeleteCriticalSection(&cs);
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    "Simple Critical Section",
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-
-
-  old_mutex_use = OLD_WIN32CS;
-  assert(old_mutex_init(&ox, NULL) == 0);
-
-  TESTSTART
-  assert(old_mutex_lock(&ox) == zero);
-  assert(old_mutex_unlock(&ox) == zero);
-  TESTSTOP
-
-  assert(old_mutex_destroy(&ox) == 0);
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    "Old PT Mutex using a Critical Section (WNT)",
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-
-
-  old_mutex_use = OLD_WIN32MUTEX;
-  assert(old_mutex_init(&ox, NULL) == 0);
-
-  TESTSTART
-  assert(old_mutex_lock(&ox) == zero);
-  assert(old_mutex_unlock(&ox) == zero);
-  TESTSTOP
-
-  assert(old_mutex_destroy(&ox) == 0);
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    "Old PT Mutex using a Win32 Mutex (W9x)",
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-
-  printf( ".............................................................................\n");
-
-  /*
-   * Now we can start the actual tests
-   */
-#ifdef PTW32_MUTEX_TYPES
-  runTest("PTHREAD_MUTEX_DEFAULT (W9x,WNT)", PTHREAD_MUTEX_DEFAULT);
-
-  runTest("PTHREAD_MUTEX_NORMAL (W9x,WNT)", PTHREAD_MUTEX_NORMAL);
-
-  runTest("PTHREAD_MUTEX_ERRORCHECK (W9x,WNT)", PTHREAD_MUTEX_ERRORCHECK);
-
-  runTest("PTHREAD_MUTEX_RECURSIVE (W9x,WNT)", PTHREAD_MUTEX_RECURSIVE);
-#else
-  runTest("Non-blocking lock", 0);
-#endif
-
-  printf( "=============================================================================\n");
-
-  /*
-   * End of tests.
-   */
-
-  pthread_mutexattr_destroy(&ma);
-
-  return 0;
-}
+/*

+ * benchtest1.c

+ *

+ *

+ * --------------------------------------------------------------------------

+ *

+ *      Pthreads-win32 - POSIX Threads Library for Win32

+ *      Copyright(C) 1998 John E. Bossom

+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors

+ * 

+ *      Contact Email: rpj@callisto.canberra.edu.au

+ * 

+ *      The current list of contributors is contained

+ *      in the file CONTRIBUTORS included with the source

+ *      code distribution. The list can also be seen at the

+ *      following World Wide Web location:

+ *      http://sources.redhat.com/pthreads-win32/contributors.html

+ * 

+ *      This library is free software; you can redistribute it and/or

+ *      modify it under the terms of the GNU Lesser General Public

+ *      License as published by the Free Software Foundation; either

+ *      version 2 of the License, or (at your option) any later version.

+ * 

+ *      This library is distributed in the hope that it will be useful,

+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ *      Lesser General Public License for more details.

+ * 

+ *      You should have received a copy of the GNU Lesser General Public

+ *      License along with this library in the file COPYING.LIB;

+ *      if not, write to the Free Software Foundation, Inc.,

+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

+ *

+ * --------------------------------------------------------------------------

+ *

+ * Measure time taken to complete an elementary operation.

+ *

+ * - Mutex

+ *   Single thread iteration over lock/unlock for each mutex type.

+ */

+

+#include "test.h"

+#include <sys/timeb.h>

+

+#ifdef __GNUC__

+#include <stdlib.h>

+#endif

+

+#include "benchtest.h"

+

+#define PTW32_MUTEX_TYPES

+#define ITERATIONS      10000000L

+

+pthread_mutex_t mx;

+pthread_mutexattr_t ma;

+struct _timeb currSysTimeStart;

+struct _timeb currSysTimeStop;

+long durationMilliSecs;

+long overHeadMilliSecs = 0;

+int one = 1;

+int zero = 0;

+

+#define GetDurationMilliSecs(_TStart, _TStop) ((_TStop.time*1000+_TStop.millitm) \

+                                               - (_TStart.time*1000+_TStart.millitm))

+

+/*

+ * Dummy use of j, otherwise the loop may be removed by the optimiser

+ * when doing the overhead timing with an empty loop.

+ */

+#define TESTSTART \

+  { int i, j = 0, k = 0; _ftime(&currSysTimeStart); for (i = 0; i < ITERATIONS; i++) { j++;

+

+#define TESTSTOP \

+  }; _ftime(&currSysTimeStop); if (j + k == i) j++; }

+

+

+void

+runTest (char * testNameString, int mType)

+{

+#ifdef PTW32_MUTEX_TYPES

+  assert(pthread_mutexattr_settype(&ma, mType) == 0);

+#endif

+  assert(pthread_mutex_init(&mx, &ma) == 0);

+

+  TESTSTART

+  assert(pthread_mutex_lock(&mx) == zero);

+  assert(pthread_mutex_unlock(&mx) == zero);

+  TESTSTOP

+

+  assert(pthread_mutex_destroy(&mx) == 0);

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    testNameString,

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+}

+

+

+int

+main (int argc, char *argv[])

+{

+  int i = 0;

+  CRITICAL_SECTION cs;

+  old_mutex_t ox;

+  pthread_mutexattr_init(&ma);

+

+  printf( "=============================================================================\n");

+  printf( "\nLock plus unlock on an unlocked mutex.\n%ld iterations\n\n",

+          ITERATIONS);

+  printf( "%-45s %15s %15s\n",

+	    "Test",

+	    "Total(msec)",

+	    "average(usec)");

+  printf( "-----------------------------------------------------------------------------\n");

+

+  /*

+   * Time the loop overhead so we can subtract it from the actual test times.

+   */

+

+  TESTSTART

+  assert(1 == one);

+  assert(1 == one);

+  TESTSTOP

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+  overHeadMilliSecs = durationMilliSecs;

+

+

+  TESTSTART

+  assert((dummy_call(&i), 1) == one);

+  assert((dummy_call(&i), 1) == one);

+  TESTSTOP

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    "Dummy call x 2",

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+

+

+  TESTSTART

+  assert((interlocked_inc_with_conditionals(&i), 1) == one);

+  assert((interlocked_dec_with_conditionals(&i), 1) == one);

+  TESTSTOP

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    "Dummy call -> Interlocked with cond x 2",

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+

+

+  TESTSTART

+  assert((InterlockedIncrement((LPLONG)&i), 1) == (LONG)one);

+  assert((InterlockedDecrement((LPLONG)&i), 1) == (LONG)one);

+  TESTSTOP

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    "InterlockedOp x 2",

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+

+

+  InitializeCriticalSection(&cs);

+

+  TESTSTART

+  assert((EnterCriticalSection(&cs), 1) == one);

+  assert((LeaveCriticalSection(&cs), 1) == one);

+  TESTSTOP

+

+  DeleteCriticalSection(&cs);

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    "Simple Critical Section",

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+

+

+  old_mutex_use = OLD_WIN32CS;

+  assert(old_mutex_init(&ox, NULL) == 0);

+

+  TESTSTART

+  assert(old_mutex_lock(&ox) == zero);

+  assert(old_mutex_unlock(&ox) == zero);

+  TESTSTOP

+

+  assert(old_mutex_destroy(&ox) == 0);

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    "Old PT Mutex using a Critical Section (WNT)",

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+

+

+  old_mutex_use = OLD_WIN32MUTEX;

+  assert(old_mutex_init(&ox, NULL) == 0);

+

+  TESTSTART

+  assert(old_mutex_lock(&ox) == zero);

+  assert(old_mutex_unlock(&ox) == zero);

+  TESTSTOP

+

+  assert(old_mutex_destroy(&ox) == 0);

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    "Old PT Mutex using a Win32 Mutex (W9x)",

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+

+  printf( ".............................................................................\n");

+

+  /*

+   * Now we can start the actual tests

+   */

+#ifdef PTW32_MUTEX_TYPES

+  runTest("PTHREAD_MUTEX_DEFAULT (W9x,WNT)", PTHREAD_MUTEX_DEFAULT);

+

+  runTest("PTHREAD_MUTEX_NORMAL (W9x,WNT)", PTHREAD_MUTEX_NORMAL);

+

+  runTest("PTHREAD_MUTEX_ERRORCHECK (W9x,WNT)", PTHREAD_MUTEX_ERRORCHECK);

+

+  runTest("PTHREAD_MUTEX_RECURSIVE (W9x,WNT)", PTHREAD_MUTEX_RECURSIVE);

+#else

+  runTest("Non-blocking lock", 0);

+#endif

+

+  printf( "=============================================================================\n");

+

+  /*

+   * End of tests.

+   */

+

+  pthread_mutexattr_destroy(&ma);

+

+  one = i;

+  return 0;

+}

diff --git a/tests/benchtest5.c b/tests/benchtest5.c
index 0a8a0b2..2fba9e3 100644
--- a/tests/benchtest5.c
+++ b/tests/benchtest5.c
@@ -1,175 +1,159 @@
-/*
- * benchtest5.c
- *
- *
- * --------------------------------------------------------------------------
- *
- *      Pthreads-win32 - POSIX Threads Library for Win32
- *      Copyright(C) 1998 John E. Bossom
- *      Copyright(C) 1999,2005 Pthreads-win32 contributors
- * 
- *      Contact Email: rpj@callisto.canberra.edu.au
- * 
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *      http://sources.redhat.com/pthreads-win32/contributors.html
- * 
- *      This library is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU Lesser General Public
- *      License as published by the Free Software Foundation; either
- *      version 2 of the License, or (at your option) any later version.
- * 
- *      This library is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *      Lesser General Public License for more details.
- * 
- *      You should have received a copy of the GNU Lesser General Public
- *      License along with this library in the file COPYING.LIB;
- *      if not, write to the Free Software Foundation, Inc.,
- *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- * --------------------------------------------------------------------------
- *
- * Measure time taken to complete an elementary operation.
- *
- * - Semaphore
- *   Single thread iteration over post/wait for a semaphore.
- */
-
-#include "test.h"
-#include <sys/timeb.h>
-
-#ifdef __GNUC__
-#include <stdlib.h>
-#endif
-
-#include "benchtest.h"
-
-#define ITERATIONS      10000000L
-
-sem_t sema;
-
-struct _timeb currSysTimeStart;
-struct _timeb currSysTimeStop;
-long durationMilliSecs;
-long overHeadMilliSecs = 0;
-int one = 1;
-int zero = 0;
-
-#define GetDurationMilliSecs(_TStart, _TStop) ((_TStop.time*1000+_TStop.millitm) \
-                                               - (_TStart.time*1000+_TStart.millitm))
-
-/*
- * Dummy use of j, otherwise the loop may be removed by the optimiser
- * when doing the overhead timing with an empty loop.
- */
-#define TESTSTART \
-  { int i, j = 0, k = 0; _ftime(&currSysTimeStart); for (i = 0; i < ITERATIONS; i++) { j++;
-
-#define TESTSTOP \
-  }; _ftime(&currSysTimeStop); if (j + k == i) j++; }
-
-
-void
-reportTest (char * testNameString)
-{
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-
-  printf( "%-45s %15ld %15.3f\n",
-	    testNameString,
-          durationMilliSecs,
-          (float) durationMilliSecs * 1E3 / ITERATIONS);
-}
-
-
-int
-main (int argc, char *argv[])
-{
-  printf( "=============================================================================\n");
-  printf( "\nOperations on a semaphore.\n%ld iterations\n\n",
-          ITERATIONS);
-  printf( "%-45s %15s %15s\n",
-	    "Test",
-	    "Total(msec)",
-	    "average(usec)");
-  printf( "-----------------------------------------------------------------------------\n");
-
-  /*
-   * Time the loop overhead so we can subtract it from the actual test times.
-   */
-
-  TESTSTART
-  assert(1 == one);
-  TESTSTOP
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-  overHeadMilliSecs = durationMilliSecs;
-
-
-  /*
-   * Now we can start the actual tests
-   */
-  assert(sem_init(&sema, 0, 0) == 0);
-  TESTSTART
-  assert(sem_post(&sema) == zero);
-  TESTSTOP
-  assert(sem_destroy(&sema) == 0);
-
-  reportTest("Post");
-
-
-  assert(sem_init(&sema, 0, ITERATIONS) == 0);
-  TESTSTART
-  assert(sem_wait(&sema) == zero);
-  TESTSTOP
-  assert(sem_destroy(&sema) == 0);
-
-  reportTest("Wait without blocking");
-
-
-  /*
-   * Time the loop overhead so we can subtract it from the actual test times.
-   */
-
-  TESTSTART
-  assert(1 == one);
-  assert(1 == one);
-  TESTSTOP
-
-  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;
-  overHeadMilliSecs = durationMilliSecs;
-
-
-  /*
-   * Now we can start the actual tests
-   */
-  assert(sem_init(&sema, 0, 0) == 0);
-  TESTSTART
-  assert(sem_post(&sema) == zero);
-  assert(sem_wait(&sema) == zero);
-  TESTSTOP
-  assert(sem_destroy(&sema) == 0);
-
-  reportTest("Post then Wait without blocking");
-
-
-  assert(sem_init(&sema, 0, 1) == 0);
-  TESTSTART
-  assert(sem_wait(&sema) == zero);
-  assert(sem_post(&sema) == zero);
-  TESTSTOP
-  assert(sem_destroy(&sema) == 0);
-
-  reportTest("Wait then Post without blocking");
-
-  printf( "=============================================================================\n");
-
-  /*
-   * End of tests.
-   */
-
-  return 0;
-}
+/*

+ * benchtest5.c

+ *

+ *

+ * --------------------------------------------------------------------------

+ *

+ *      Pthreads-win32 - POSIX Threads Library for Win32

+ *      Copyright(C) 1998 John E. Bossom

+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors

+ * 

+ *      Contact Email: rpj@callisto.canberra.edu.au

+ * 

+ *      The current list of contributors is contained

+ *      in the file CONTRIBUTORS included with the source

+ *      code distribution. The list can also be seen at the

+ *      following World Wide Web location:

+ *      http://sources.redhat.com/pthreads-win32/contributors.html

+ * 

+ *      This library is free software; you can redistribute it and/or

+ *      modify it under the terms of the GNU Lesser General Public

+ *      License as published by the Free Software Foundation; either

+ *      version 2 of the License, or (at your option) any later version.

+ * 

+ *      This library is distributed in the hope that it will be useful,

+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ *      Lesser General Public License for more details.

+ * 

+ *      You should have received a copy of the GNU Lesser General Public

+ *      License along with this library in the file COPYING.LIB;

+ *      if not, write to the Free Software Foundation, Inc.,

+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

+ *

+ * --------------------------------------------------------------------------

+ *

+ * Measure time taken to complete an elementary operation.

+ *

+ * - Semaphore

+ *   Single thread iteration over post/wait for a semaphore.

+ */

+

+#include "test.h"

+#include <sys/timeb.h>

+

+#ifdef __GNUC__

+#include <stdlib.h>

+#endif

+

+#include "benchtest.h"

+

+#define ITERATIONS      1000000L

+

+sem_t sema;

+HANDLE w32sema;

+

+struct _timeb currSysTimeStart;

+struct _timeb currSysTimeStop;

+long durationMilliSecs;

+long overHeadMilliSecs = 0;

+int one = 1;

+int zero = 0;

+

+#define GetDurationMilliSecs(_TStart, _TStop) ((_TStop.time*1000+_TStop.millitm) \

+                                               - (_TStart.time*1000+_TStart.millitm))

+

+/*

+ * Dummy use of j, otherwise the loop may be removed by the optimiser

+ * when doing the overhead timing with an empty loop.

+ */

+#define TESTSTART \

+  { int i, j = 0, k = 0; _ftime(&currSysTimeStart); for (i = 0; i < ITERATIONS; i++) { j++;

+

+#define TESTSTOP \

+  }; _ftime(&currSysTimeStop); if (j + k == i) j++; }

+

+

+void

+reportTest (char * testNameString)

+{

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+

+  printf( "%-45s %15ld %15.3f\n",

+	    testNameString,

+          durationMilliSecs,

+          (float) durationMilliSecs * 1E3 / ITERATIONS);

+}

+

+

+int

+main (int argc, char *argv[])

+{

+  printf( "=============================================================================\n");

+  printf( "\nOperations on a semaphore.\n%ld iterations\n\n",

+          ITERATIONS);

+  printf( "%-45s %15s %15s\n",

+	    "Test",

+	    "Total(msec)",

+	    "average(usec)");

+  printf( "-----------------------------------------------------------------------------\n");

+

+  /*

+   * Time the loop overhead so we can subtract it from the actual test times.

+   */

+

+  TESTSTART

+  assert(1 == one);

+  TESTSTOP

+

+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop) - overHeadMilliSecs;

+  overHeadMilliSecs = durationMilliSecs;

+

+

+  /*

+   * Now we can start the actual tests

+   */

+  assert((w32sema = CreateSemaphore(NULL, (long) 0, (long) ITERATIONS, NULL)) != 0);

+  TESTSTART

+  assert(ReleaseSemaphore(w32sema, 1, NULL) != zero);

+  TESTSTOP

+  assert(CloseHandle(w32sema) != 0);

+

+  reportTest("W32 Post with no waiters");

+

+

+  assert((w32sema = CreateSemaphore(NULL, (long) ITERATIONS, (long) ITERATIONS, NULL)) != 0);

+  TESTSTART

+  assert(WaitForSingleObject(w32sema, INFINITE) == WAIT_OBJECT_0);

+  TESTSTOP

+  assert(CloseHandle(w32sema) != 0);

+

+  reportTest("W32 Wait without blocking");

+

+

+  assert(sem_init(&sema, 0, 0) == 0);

+  TESTSTART

+  assert(sem_post(&sema) == zero);

+  TESTSTOP

+  assert(sem_destroy(&sema) == 0);

+

+  reportTest("POSIX Post with no waiters");

+

+

+  assert(sem_init(&sema, 0, ITERATIONS) == 0);

+  TESTSTART

+  assert(sem_wait(&sema) == zero);

+  TESTSTOP

+  assert(sem_destroy(&sema) == 0);

+

+  reportTest("POSIX Wait without blocking");

+

+

+  printf( "=============================================================================\n");

+

+  /*

+   * End of tests.

+   */

+

+  return 0;

+}

diff --git a/tests/semaphore1.c b/tests/semaphore1.c
index b11de0d..8ebf365 100644
--- a/tests/semaphore1.c
+++ b/tests/semaphore1.c
@@ -1,157 +1,159 @@
-/*
- * File: semaphore1.c
- *
- *
- * --------------------------------------------------------------------------
- *
- *      Pthreads-win32 - POSIX Threads Library for Win32
- *      Copyright(C) 1998 John E. Bossom
- *      Copyright(C) 1999,2005 Pthreads-win32 contributors
- * 
- *      Contact Email: rpj@callisto.canberra.edu.au
- * 
- *      The current list of contributors is contained
- *      in the file CONTRIBUTORS included with the source
- *      code distribution. The list can also be seen at the
- *      following World Wide Web location:
- *      http://sources.redhat.com/pthreads-win32/contributors.html
- * 
- *      This library is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU Lesser General Public
- *      License as published by the Free Software Foundation; either
- *      version 2 of the License, or (at your option) any later version.
- * 
- *      This library is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *      Lesser General Public License for more details.
- * 
- *      You should have received a copy of the GNU Lesser General Public
- *      License along with this library in the file COPYING.LIB;
- *      if not, write to the Free Software Foundation, Inc.,
- *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- *
- * --------------------------------------------------------------------------
- *
- * Test Synopsis: Verify trywait() returns -1 and sets EAGAIN.
- * - 
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - 
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-void *
-thr(void * arg)
-{
-  sem_t s;
-  int result;
-
-  assert(sem_init(&s, PTHREAD_PROCESS_PRIVATE, 0) == 0);
-
-  assert((result = sem_trywait(&s)) == -1);
-
-  if ( result == -1 )
-  {
-    perror("thread: sem_trywait 1: expected error"); // No error
-    assert(errno == EAGAIN);
-  }
-  else
-  {
-    printf("thread: ok 1\n");
-  }
-
-  assert((result = sem_post(&s)) == 0);
-
-  assert((result = sem_trywait(&s)) == 0);
-
-  if ( result == -1 )
-  {
-    perror("thread: sem_trywait 2");
-  }
-  else
-  {
-    printf("thread: ok 2\n");
-  }
-
-  assert(sem_post(&s) == 0);
-
-  return 0;
-}
-
-
-int
-main()
-{
-  pthread_t t;
-  sem_t s;
-  int result;
-
-  assert(pthread_create(&t, NULL, thr, NULL) == 0);
-  assert(pthread_join(t, (void **)&result) == 0);
-  assert(result == 0);
-
-  assert(sem_init(&s, PTHREAD_PROCESS_PRIVATE, 0) == 0);
-
-  assert((result = sem_trywait(&s)) == -1);
-
-  if ( result == -1 )
-  {
-    perror("main: sem_trywait 1: expected error"); // No error
-    assert(errno == EAGAIN);
-  }
-  else
-  {
-    printf("main: ok 1\n");
-  }
-
-  assert((result = sem_post(&s)) == 0);
-
-  assert((result = sem_trywait(&s)) == 0);
-
-  if ( result == -1 )
-  {
-    perror("main: sem_trywait 2");
-  }
-  else
-  {
-    printf("main: ok 2\n");
-  }
-
-  assert(sem_post(&s) == 0);
-
-  return 0;
-}
-
+/*

+ * File: semaphore1.c

+ *

+ *

+ * --------------------------------------------------------------------------

+ *

+ *      Pthreads-win32 - POSIX Threads Library for Win32

+ *      Copyright(C) 1998 John E. Bossom

+ *      Copyright(C) 1999,2005 Pthreads-win32 contributors

+ * 

+ *      Contact Email: rpj@callisto.canberra.edu.au

+ * 

+ *      The current list of contributors is contained

+ *      in the file CONTRIBUTORS included with the source

+ *      code distribution. The list can also be seen at the

+ *      following World Wide Web location:

+ *      http://sources.redhat.com/pthreads-win32/contributors.html

+ * 

+ *      This library is free software; you can redistribute it and/or

+ *      modify it under the terms of the GNU Lesser General Public

+ *      License as published by the Free Software Foundation; either

+ *      version 2 of the License, or (at your option) any later version.

+ * 

+ *      This library is distributed in the hope that it will be useful,

+ *      but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ *      Lesser General Public License for more details.

+ * 

+ *      You should have received a copy of the GNU Lesser General Public

+ *      License along with this library in the file COPYING.LIB;

+ *      if not, write to the Free Software Foundation, Inc.,

+ *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA

+ *

+ * --------------------------------------------------------------------------

+ *

+ * Test Synopsis: Verify trywait() returns -1 and sets EAGAIN.

+ * - 

+ *

+ * Test Method (Validation or Falsification):

+ * - Validation

+ *

+ * Requirements Tested:

+ * - 

+ *

+ * Features Tested:

+ * - 

+ *

+ * Cases Tested:

+ * - 

+ *

+ * Description:

+ * - 

+ *

+ * Environment:

+ * - 

+ *

+ * Input:

+ * - None.

+ *

+ * Output:

+ * - File name, Line number, and failed expression on failure.

+ * - No output on success.

+ *

+ * Assumptions:

+ * - 

+ *

+ * Pass Criteria:

+ * - Process returns zero exit status.

+ *

+ * Fail Criteria:

+ * - Process returns non-zero exit status.

+ */

+

+#include "test.h"

+

+void *

+thr(void * arg)

+{

+  sem_t s;

+  int result;

+

+  assert(sem_init(&s, PTHREAD_PROCESS_PRIVATE, 0) == 0);

+

+  assert((result = sem_trywait(&s)) == -1);

+

+  if ( result == -1 )

+  {

+    int err = errno;

+    perror("thread: sem_trywait 1: expected error"); // No error

+    assert(err == EAGAIN);

+  }

+  else

+  {

+    printf("thread: ok 1\n");

+  }

+

+  assert((result = sem_post(&s)) == 0);

+

+  assert((result = sem_trywait(&s)) == 0);

+

+  if ( result == -1 )

+  {

+    perror("thread: sem_trywait 2");

+  }

+  else

+  {

+    printf("thread: ok 2\n");

+  }

+

+  assert(sem_post(&s) == 0);

+

+  return 0;

+}

+

+

+int

+main()

+{

+  pthread_t t;

+  sem_t s;

+  int result;

+

+  assert(pthread_create(&t, NULL, thr, NULL) == 0);

+  assert(pthread_join(t, (void **)&result) == 0);

+  assert(result == 0);

+

+  assert(sem_init(&s, PTHREAD_PROCESS_PRIVATE, 0) == 0);

+

+  assert((result = sem_trywait(&s)) == -1);

+

+  if ( result == -1 )

+  {

+    int err = errno;

+    perror("main: sem_trywait 1: expected error"); // No error

+    assert(err == EAGAIN);

+  }

+  else

+  {

+    printf("main: ok 1\n");

+  }

+

+  assert((result = sem_post(&s)) == 0);

+

+  assert((result = sem_trywait(&s)) == 0);

+

+  if ( result == -1 )

+  {

+    perror("main: sem_trywait 2");

+  }

+  else

+  {

+    printf("main: ok 2\n");

+  }

+

+  assert(sem_post(&s) == 0);

+

+  return 0;

+}

+