An attempt to get sem_getvalue working properly.

4 files changed, 114 insertions, 3 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 6c8deed..e9266a5 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-03  Ross Johnson  <rpj@digit.ise.canberra.edu.au>

+

+	* semaphore2.c: New test.

+

 2002-03-02  Ross Johnson  <rpj@special.ise.canberra.edu.au>

 

 	* Makefile (CFLAGS): Changed /MT to /MD to link with

diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index cdae2d9..15b77b6 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -65,7 +65,7 @@ COPYFILES	= $(HDR) $(LIB) $(DLL)
 # stop.
 
 TESTS	= loadfree \
-	  semaphore1 self1 mutex5 mutex1 mutex1e mutex1n mutex1r \
+	  semaphore1 semaphore2 self1 mutex5 mutex1 mutex1e mutex1n mutex1r \
 	  condvar1 condvar1_1 condvar1_2 condvar2 condvar2_1 exit1 create1 equal1 \
 	  exit2 exit3 \
 	  join0 join1 join2 \
@@ -221,6 +221,7 @@ rwlock6_t2.pass: rwlock6_t.pass
 self1.pass:
 self2.pass: create1.pass
 semaphore1.pass:
+semaphore2.pass:
 spin1.pass:
 spin2.pass: spin1.pass
 spin3.pass: spin2.pass
diff --git a/tests/Makefile b/tests/Makefile
index a3fa7f3..014b767 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -71,7 +71,7 @@ EHFLAGS	=
 # stop.

 

 PASSES= loadfree.pass \

-	  semaphore1.pass  self1.pass  mutex5.pass  \

+	  semaphore1.pass  semaphore2.pass  self1.pass  mutex5.pass  \

 	  mutex1.pass  mutex1n.pass  mutex1e.pass  mutex1r.pass  mutex2.pass  mutex3.pass  \

 	  condvar1.pass  condvar1_1.pass  condvar1_2.pass  condvar2.pass  condvar2_1.pass  \

 	  exit1.pass  create1.pass  equal1.pass  \

@@ -286,7 +286,8 @@ rwlock6_t.pass: rwlock5_t.pass
 rwlock6_t2.pass: rwlock6_t.pass

 self1.pass:

 self2.pass: create1.pass

-semaphore.pass:

+semaphore1.pass:

+semaphore2.pass:

 spin1.pass:

 spin2.pass: spin1.pass

 spin3.pass: spin2.pass

diff --git a/tests/semaphore2.c b/tests/semaphore2.c
new file mode 100644
index 0000000..133443c
--- /dev/null
+++ b/tests/semaphore2.c
@@ -0,0 +1,105 @@
+/*
+ * File: semaphore2.c
+ *
+ *
+ * --------------------------------------------------------------------------
+ *
+ *	Pthreads-win32 - POSIX Threads Library for Win32
+ *	Copyright(C) 1998 John E. Bossom
+ *	Copyright(C) 1999,2002 Pthreads-win32 contributors
+ *
+ *	Contact Email: rpj@ise.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 sem_getvalue returns the correct value.
+ * - 
+ *
+ * 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"
+
+#define BIG_NUM 10000
+
+int
+main()
+{
+  sem_t s;
+	int value = 0;
+  int result;
+
+  assert(sem_init(&s, PTHREAD_PROCESS_PRIVATE, BIG_NUM) == 0);
+	assert((result = sem_getvalue(&s, &value)) == 0);
+	assert(value == BIG_NUM);
+
+	for (i = BIG_NUM - 1; i >= 0; i--)
+		{
+			assert(sem_wait(&s) == 0);
+			assert((result = sem_getvalue(&s, &value)) == 0);
+			assert(value == i);
+		}
+
+	for (i = 1; i <= BIG_NUM; i--)
+		{
+			assert(sem_post(&s) == 0);
+			assert((result = sem_getvalue(&s, &value)) == 0);
+			assert(value == i);
+		}
+
+  return 0;
+}
+