2001-06-25 Ross Johnson <rpj@setup1.ise.canberra.edu.au>

        * create.c (pthread_create): Add priority inheritance
        attributes.
        * mutex.c (pthread_mutex_lock): Remove some overhead for
        PTHREAD_MUTEX_NORMAL mutex types. Specifically, avoid
        calling pthread_self() and pthread_equal() to check/set
        the mutex owner. Introduce a new pseudo owner for this
        type. Test results suggest increases in speed of up to
        90% for non-blocking locks.
        This is the default type of mutex used internally by other
        synchronising objects, ie. condition variables and
        read-write locks. The test rwlock7.c shows about a
        30-35% speed increase over snapshot 2001-06-06. The
        price of this is that the application developer
        must ensure correct behaviour, or explicitly set the
        mutex to a safer type such as PTHREAD_MUTEX_ERRORCHECK.
        For example, PTHREAD_MUTEX_NORMAL (or PTHREAD_MUTEX_DEFAULT)
        type mutexes will not return an error if a thread which is not
        the owner calls pthread_mutex_unlock. The call will succeed
        in unlocking the mutex if it is currently locked, but a
        subsequent unlock by the true owner will then fail with EPERM.
        This is however consistent with some other implementations.
        (pthread_mutex_unlock): Likewise.
        (pthread_mutex_trylock): Likewise.
        (pthread_mutex_destroy): Likewise.
        * attr.c (pthread_attr_init): PTHREAD_EXPLICIT_SCHED is the
        default inheritance attribute; THREAD_PRIORITY_NORMAL is
        the default priority for new threads.
        * sched.c (pthread_attr_setschedpolicy): Added routine.
        (pthread_attr_getschedpolicy): Added routine.
        (pthread_attr_setinheritsched): Added routine.
        (pthread_attr_getinheritsched): Added routine.
        * pthread.h (sched_rr_set_interval): Added as a macro;
        returns -1 with errno set to ENOSYS.

2001-06-23  Ross Johnson  <rpj@setup1.ise.canberra.edu.au>

        *sched.c (pthread_attr_setschedparam): Add priority range
        check.
        (sched_setscheduler): New function; checks for a valid
        pid and policy; checks for permission to set information
        in the target process; expects pid to be a Win32 process ID,
        not a process handle; the only scheduler policy allowed is
        SCHED_OTHER.
        (sched_getscheduler): Likewise, but checks for permission
        to query.
        * pthread.h (SCHED_*): Moved to sched.h as defined in the
        POSIX standard.
        * sched.h (SCHED_*): Moved from pthread.h.
        (pid_t): Defined if necessary.
        (sched_setscheduler): Defined.
        (sched_getscheduler): Defined.
        * pthread.def (sched_setscheduler): Exported.
        (sched_getscheduler): Likewise.

2001-06-23  Ross Johnson  <rpj@setup1.ise.canberra.edu.au>

        Contributed by -  Ralf Brese <Ralf.Brese@pdb4.siemens.de>

        * create.c (pthread_create): Set thread priority from
        thread attributes.

13 files changed, 1547 insertions, 948 deletions

diff --git a/tests/ChangeLog b/tests/ChangeLog
index 27f8dfe..231d9fe 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,504 +1,513 @@
-2001-06-8  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* mutex5.c: Insert inert change to quell compiler warnings.

-	* condvar3_2.c: Remove unused variable.

-	

-2001-06-3  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* condvar2_1.c: New test.

-	* condvar3_1.c: New test.

-	* condvar3_2.c: New test.

-

-2001-05-30  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* mutex1n.c: New test.

-	* mutex1e.c: New test.

-	* mutex1r.c: New test.

-	* mutex4.c: Now locks and unlocks a mutex.

-	* mutex5.c: New test.

-	* mutex6.c: New test.

-	* mutex6n.c: New test.

-	* mutex6e.c: New test.

-	* mutex6r.c: New test.

-	* Makefile: Added new tests; reorganised.

-	* GNUmakefile: Likewise.

-	* rwlock6.c: Fix to properly prove read-while-write locking

-	and single writer locking.

-

-2001-05-29  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* Makefile: Reorganisation.

-	* GNUmakefile: Likewise.

-	- Thomas Pfaff <tpfaff@gmx.net>

-

-	* exception1.c: Add stdio.h include to define fprintf and stderr

-	in non-exception C version of main().

-	* exception2.c: Likewise.

-	* exception3.c: Likewise.

-

-	* Makefile (rwlock7): Add new test.

-	* GNUmakefile (rwlock7): Add new test.

-	* rwlock7.c: New test.

-	* rwlock6.c: Changed to test that writer has priority.

-

-	* eyal1.c (main): Unlock each mutex_start lock before destroying

-	it.

-

-2000-12-29  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* GNUmakefile: Add mutex4 test; ensure libpthreadw32.a is

-	removed for "clean" target.

-	* Makefile: Add mutex4 test.

-

-	* exception3.c: Remove SEH code; automatically pass the test

-	under SEH (which is an N/A environment).

-

-	* mutex4.c: New test.

-

-	* eyal1.c (do_work_unit): Add a dummy "if" to force the

-	optimiser to retain code; reduce thread work loads.

-

-	* condvar8.c (main): Add an additional "assert" for debugging;

-	increase pthread_cond_signal timeout.

-

-2000-12-28  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* eyal1.c: Increase thread work loads.

-	* exception2.c: New test.

-	* exception3.c: New test.

-	* Makefile: Add new tests exception2.c and exception3.c.

-	* GNUmakefile: Likewise.

-

-2000-12-11  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* cleanup3.c: Remove unused variable.

-	* cleanup2.c: Likewise.

-	* exception1.c: Throw an exception rather than use

-	a deliberate zero divide so that catch(...) will

-	handle it under Mingw32. Mingw32 now builds the

-	library correctly to pass all tests - see Thomas

-	Pfaff's detailed instructions re needed changes

-	to Mingw32 in the Pthreads-Win32 FAQ.

-

-2000-09-08  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* cancel5.c: New; tests calling pthread_cancel()

-	from the main thread without first creating a

-	POSIX thread struct for the non-POSIX main thread

-	- this forces pthread_cancel() to create one via

-	pthread_self().

-	* Makefile (cancel5): Add new test.

-	* GNUmakefile (cancel5): Likewise.

-

-2000-08-17  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* create2.c: New; Test that pthread_t contains

-	the W32 HANDLE before it calls the thread routine

-	proper.

-

-2000-08-13  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* condvar3.c: Minor change to eliminate compiler

-	warning.

-

-	* condvar4.c: ditto.

-

-	* condvar5.c: ditto.

-

-	* condvar6.c: ditto.

-

-	* condvar7.c: ditto.

-

-	* condvar8.c: ditto.

-

-	* condvar9.c: ditto.

-

-	* exit1.c: Function needed return statement.

-

-	* cleanup1.c: Remove unnecessary printf arg.

-

-	* cleanup2.c: Fix cast.

-

-	* rwlock6.c: Fix casts.

-

-	* exception1.c (PtW32CatchAll): Had the wrong name;

-	fix casts.

-

-	* cancel3.c: Remove unused waitLock variable.

-

-	* GNUmakefile: Change library/dll naming; add new tests;

-	general minor changes.

-

-	* Makefile: Change library/dll naming; add targets for

-	testing each of the two VC++ EH scheme versions;

-	default target now issues help message; compile warnings

-	now interpreted as errors to stop the make; add new

-	tests; restructure to remove prerequisites needed

-	otherwise.

-

-	* README: Updated.

-

-

-2000-08-10  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* eyal1.c (main): Change implicit cast to explicit

-	cast when passing "print_server" function pointer;

-	G++ no longer allows implicit func parameter casts.

-

-	* cleanup1.c: Remove unused "waitLock".

-	(main): Fix implicit parameter cast.

-

-	* cancel2.c (main): Fix implicit parameter cast.

-

-	* cancel4.c (main): Fix implicit parameter cast.

-

-	* cancel3.c (main): Fix implicit parameter cast.

-

-	* GNUmakefile: Renamed from Makefile; Add missing

-	cancel1 and cancel2 test targets.

-

-	* Makefile: Converted for use with MS nmake.

-

-2000-08-06  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* ccl.bat: Add /nologo to remove extraneous output.

-

-	* exception1.c (exceptionedThread): Init 'dummy';

-	put expression into if condition to prevent optimising away;

-	remove unused variable.

-

-	* cancel4.c (mythread): Cast return value to avoid warnings.

-

-	* cancel2.c (mythread): Missing #endif.

-

-	* condvar9.c (mythread): Cast return value to avoid warnings.

-

-	* condvar8.c (mythread): Cast return value to avoid warnings.

-

-	* condvar7.c (mythread): Cast return value to avoid warnings.

-

-	* cleanup3.c (mythread): Cast return value to avoid warnings.

-

-	* cleanup2.c (mythread): Cast return value to avoid warnings.

-

-	* cleanup1.c (mythread): Cast return value to avoid warnings.

-

-	* condvar5.c (mythread): Cast return value to avoid warnings.

-

-	* condvar3.c (mythread): Cast return value to avoid warnings.

-

-	* condvar6.c (mythread): Cast return value to avoid warnings.

-

-	* condvar4.c (mythread): Cast return value to avoid warnings.

-

-2000-08-05  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* cancel2.c: Use PtW32CatchAll macro if defined.

-

-	* exception1.c: Use PtW32CatchAll macro if defined.

-

-2000-08-02  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* tsd1.c: Fix typecasts of &result [g++ is now very fussy].

-	

-	* test.h (assert): Return 0's explicitly to allay

-	g++ errors.

-	

-	* join2.c: Add explicit typecasts.

-	

-	* join1.c: Add explicit typecasts.

-	

-	* join0.c: Add explicit typecasts.

-	

-	* eyal1.c: Add explicit typecasts.

-	

-	* count1.c (main): Add type cast to remove g++ parse warning

-	[gcc-2.95.2 seems to have tightened up on this].

-

-	* Makefile (GLANG): Use c++ explicitly.

-	Remove MSVC sections (was commented out).

-	Add target to generate cpp output.

-

-2000-07-25  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* runtest.bat: modified to work under W98.

-	

-	* runall.bat: Add new tests; modified to work under W98.

-	It was ok under NT.

-

-	* Makefile: Add new tests.

-

-	* exception1.c: New; Test passing exceptions back to the

-	application and retaining library internal exceptions.

-

-	* join0.c: New; Test a single join.

-

-2000-01-06  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* cleanup1.c: New; Test cleanup handler executes (when thread is

-	canceled).

-

-	* cleanup2.c: New; Test cleanup handler executes (when thread is

-	not canceled).

-

-	* cleanup3.c: New; Test cleanup handler does not execute

-	(when thread is not canceled).

-

-2000-01-04  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* cancel4.c: New; Test cancelation does not occur in deferred

-	cancelation threads with no cancelation points.

-

-	* cancel3.c: New; Test asynchronous cancelation.

-

-	* context1.c: New; Test context switching method for async

-	cancelation.

-

-1999-11-23  Ross Johnson  <rpj@special.ise.canberra.edu.au>

-

-	* test.h: Add header includes; include local header versions rather

-	than system versions; rearrange the assert macro defines.

-

-1999-11-07  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* loadfree.c: New. Test loading and freeing the library (DLL).

-

-1999-10-30  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* cancel1.c: New. Test pthread_setcancelstate and

-	pthread_setcanceltype functions.

-	* eyal1.c (waste_time): Change calculation to avoid FP exception

-	on Aplhas

-	- Rich Peters <rpeters@micro-magic.com>

-

-Oct 14 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* condvar7.c: New. Test broadcast after waiting thread is canceled.

-	* condvar8.c: New. Test multiple broadcasts.

-	* condvar9.c: New. Test multiple broadcasts with thread

-	cancelation.

-	

-Sep 16 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* rwlock6.c: New test.

-

-Sep 15 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* rwlock1.c: New test.

-	* rwlock2.c: New test.

-	* rwlock3.c: New test.

-	* rwlock4.c: New test.

-	* rwlock5.c: New test.

-

-Aug 22 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* runall.bat (join2): Add test.

-

-Aug 19 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* join2.c: New test.

-

-Wed Aug 12 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* Makefile (LIBS): Add -L.

-

-Mon May 31 10:25:01 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* Makefile (GLANG): Add GCC language option.

-

-Sat May 29 23:29:04 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* runall.bat (condvar5): Add new test.

-

-	* runall.bat (condvar6): Add new test.

-

-	* Makefile (condvar5) : Add new test.

-	

-	* Makefile (condvar6) : Add new test.

-	

-	* condvar5.c: New test for pthread_cond_broadcast().

-

-	* condvar6.c: New test for pthread_cond_broadcast().

-

-Sun Apr  4 12:04:28 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* tsd1.c (mythread): Change Sleep(0) to sched_yield().

-	(sched.h): Include.

-

-	* condvar3.c (mythread): Remove redundant Sleep().

-

-	* runtest.bat: Re-organised to make more informative.

-

-Fri Mar 19 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* *.bat: redirect unwanted output to nul:

-

-	* runall.bat: new.

-

-	* cancel1.c: new. Not part of suite yet.

-	

-Mon Mar 15 00:17:55 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* mutex1.c: only test mutex init and destroy; add assertions.

-

-	* count1.c: raise number of spawned threads to 60 (appears to

-	be the limit under Win98).

-

-Sun Mar 14 21:31:02 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* test.h (assert): add assertion trace option.

-	Use:

-	"#define ASSERT_TRACE 1" to turn it on,

-	"#define ASSERT_TRACE 0" to turn it off (default).

-

-	* condvar3.c (main): add more assertions.

-

-	* condvar4.c (main): add more assertions.

-

-	* condvar1.c (main): add more assertions.

-

-Fri Mar 12 08:34:15 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* condvar4.c (cvthing): switch the order of the INITIALIZERs.

-

-	* eyal1.c (main): Fix trylock loop; was not waiting for thread to lock

-	the "started" mutex.

-

-Wed Mar 10 10:41:52 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* tryentercs.c: Apply typo patch from bje.

-

-	* tryentercs2.c: Ditto.

-

-Sun Mar  7 10:41:52 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* Makefile (condvar3, condvar4): Add tests.

-

-	* condvar4.c (General): Reduce to simple test case; prerequisite

-	is condvar3.c; add description.

-

-	* condvar3.c (General): Reduce to simple test case; prerequisite

-	is condvar2.c; add description.

-

-	* condvar2.c (General): Reduce to simple test case; prerequisite

-	is condvar1.c; add description.

-

-	* condvar1.c (General): Reduce to simple test case; add

-	description.

-

-	* Template.c (Comments): Add generic test detail.

-

-1999-02-23  Ross Johnson  <rpj@ise.canberra.edu.au>

-

-        * Template.c: Revamp.

-

-        * condvar1.c: Add.

-

-        * condvar2.c: Add.

-

-        * Makefile: Add condvar1 condvar2 tests.

-

-        * exit1.c, exit2.c, exit3.c: Cosmetic changes.

-

-1999-02-23  Ross Johnson  <rpj@ise.canberra.edu.au>

-

-	* Makefile: Some refinement.

-

-	* *.c: More exhaustive checking through assertions; clean up;

-	add some more tests.

-

-	* Makefile: Now actually runs the tests.

-

-	* tests.h: Define our own assert macro. The Mingw32

-	version pops up a dialog but we want to run non-interactively.

-

-	* equal1.c: use assert a little more directly so that it

-	prints the actual call statement.

-

-	* exit1.c: Modify to return 0 on success, 1 on failure.

-

-1999-02-22  Ross Johnson  <rpj@ise.canberra.edu.au>

-

-	* self2.c: Bring up to date.

-

-	* self3.c: Ditto.

-

-1999-02-21  Ben Elliston  <bje@cygnus.com>

-

-	* README: Update.

-

-	* Makefile: New file. Run all tests automatically. Primitive tests

-	are run first; more complex tests are run last.

-

-	* count1.c: New test. Validate the thread count.

-

-	* exit2.c: Perform a simpler test.

-	

-	* exit3.c: New test. Replaces exit2.c, since exit2.c needs to

-	perform simpler checking first.

-

-	* create1.c: Update to use the new testsuite exiting convention.

-	

-	* equal1.c: Likewise.

-

-	* mutex1.c: Likewise.

-

-	* mutex2.c: Likewise.

-

-	* once1.c: Likewise.

-

-	* self2.c: Likewise.

-

-	* self3.c: Likewise.

-

-	* tsd1.c: Likewise.

-

-1999-02-20  Ross Johnson  <rpj@ise.canberra.edu.au>

-

-	* mutex2.c: Test static mutex initialisation.

-

-	* test.h: New. Declares a table mapping error numbers to

-	error names.

-

-1999-01-17  Ross Johnson  <rpj@ise.canberra.edu.au>

-

-	* runtest: New script to build and run a test in the tests directory.

-

-Wed Dec 30 11:22:44 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* tsd1.c: Re-written. See comments at start of file.

-	* Template.c: New. Contains skeleton code and comment template

-	intended to fully document the test.

-

-Fri Oct 16 17:59:49 1998  Ross Johnson  <rpj@swan.canberra.edu.au>

-

-	* tsd1.c (destroy_key): Add function. Change diagnostics.

-

-Thu Oct 15 17:42:37 1998  Ross Johnson  <rpj@swan.canberra.edu.au>

-

-	* tsd1.c (mythread): Fix some casts and add some message

-	output. Fix inverted conditional.

-

-Mon Oct 12 02:12:29 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>

-

-	* tsd1.c: New. Test TSD using 1 key and 2 threads.

-

-1998-09-13  Ben Elliston  <bje@cygnus.com>

-

-	* eyal1.c: New file; contributed by Eyal Lebedinsky

-	<eyal@eyal.emu.id.au>.

-

-1998-09-12  Ben Elliston  <bje@cygnus.com>

-

-	* exit2.c (func): Return a value.

-	(main): Call the right thread entry function.

-

-1998-07-22  Ben Elliston  <bje@cygnus.com>

-

-	* exit2.c (main): Fix size of pthread_t array.

-

-1998-07-10  Ben Elliston  <bje@cygnus.com>

-

-	* exit2.c: New file; test pthread_exit() harder.

-

-	* exit1.c: New file; test pthread_exit().

+2001-06-25  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	priority1.c: New test.
+	priority2.c: New test.
+	inherit1.c: New test.
+	benchtest1.c: New; timing mutexes.
+	benchtest2.c: New; timing mutexes.
+	mutex4.c: Modified to test all mutex types.
+
+2001-06-8  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* mutex5.c: Insert inert change to quell compiler warnings.
+	* condvar3_2.c: Remove unused variable.
+	
+2001-06-3  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* condvar2_1.c: New test.
+	* condvar3_1.c: New test.
+	* condvar3_2.c: New test.
+
+2001-05-30  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* mutex1n.c: New test.
+	* mutex1e.c: New test.
+	* mutex1r.c: New test.
+	* mutex4.c: Now locks and unlocks a mutex.
+	* mutex5.c: New test.
+	* mutex6.c: New test.
+	* mutex6n.c: New test.
+	* mutex6e.c: New test.
+	* mutex6r.c: New test.
+	* Makefile: Added new tests; reorganised.
+	* GNUmakefile: Likewise.
+	* rwlock6.c: Fix to properly prove read-while-write locking
+	and single writer locking.
+
+2001-05-29  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* Makefile: Reorganisation.
+	* GNUmakefile: Likewise.
+	- Thomas Pfaff <tpfaff@gmx.net>
+
+	* exception1.c: Add stdio.h include to define fprintf and stderr
+	in non-exception C version of main().
+	* exception2.c: Likewise.
+	* exception3.c: Likewise.
+
+	* Makefile (rwlock7): Add new test.
+	* GNUmakefile (rwlock7): Add new test.
+	* rwlock7.c: New test.
+	* rwlock6.c: Changed to test that writer has priority.
+
+	* eyal1.c (main): Unlock each mutex_start lock before destroying
+	it.
+
+2000-12-29  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* GNUmakefile: Add mutex4 test; ensure libpthreadw32.a is
+	removed for "clean" target.
+	* Makefile: Add mutex4 test.
+
+	* exception3.c: Remove SEH code; automatically pass the test
+	under SEH (which is an N/A environment).
+
+	* mutex4.c: New test.
+
+	* eyal1.c (do_work_unit): Add a dummy "if" to force the
+	optimiser to retain code; reduce thread work loads.
+
+	* condvar8.c (main): Add an additional "assert" for debugging;
+	increase pthread_cond_signal timeout.
+
+2000-12-28  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* eyal1.c: Increase thread work loads.
+	* exception2.c: New test.
+	* exception3.c: New test.
+	* Makefile: Add new tests exception2.c and exception3.c.
+	* GNUmakefile: Likewise.
+
+2000-12-11  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* cleanup3.c: Remove unused variable.
+	* cleanup2.c: Likewise.
+	* exception1.c: Throw an exception rather than use
+	a deliberate zero divide so that catch(...) will
+	handle it under Mingw32. Mingw32 now builds the
+	library correctly to pass all tests - see Thomas
+	Pfaff's detailed instructions re needed changes
+	to Mingw32 in the Pthreads-Win32 FAQ.
+
+2000-09-08  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* cancel5.c: New; tests calling pthread_cancel()
+	from the main thread without first creating a
+	POSIX thread struct for the non-POSIX main thread
+	- this forces pthread_cancel() to create one via
+	pthread_self().
+	* Makefile (cancel5): Add new test.
+	* GNUmakefile (cancel5): Likewise.
+
+2000-08-17  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* create2.c: New; Test that pthread_t contains
+	the W32 HANDLE before it calls the thread routine
+	proper.
+
+2000-08-13  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* condvar3.c: Minor change to eliminate compiler
+	warning.
+
+	* condvar4.c: ditto.
+
+	* condvar5.c: ditto.
+
+	* condvar6.c: ditto.
+
+	* condvar7.c: ditto.
+
+	* condvar8.c: ditto.
+
+	* condvar9.c: ditto.
+
+	* exit1.c: Function needed return statement.
+
+	* cleanup1.c: Remove unnecessary printf arg.
+
+	* cleanup2.c: Fix cast.
+
+	* rwlock6.c: Fix casts.
+
+	* exception1.c (PtW32CatchAll): Had the wrong name;
+	fix casts.
+
+	* cancel3.c: Remove unused waitLock variable.
+
+	* GNUmakefile: Change library/dll naming; add new tests;
+	general minor changes.
+
+	* Makefile: Change library/dll naming; add targets for
+	testing each of the two VC++ EH scheme versions;
+	default target now issues help message; compile warnings
+	now interpreted as errors to stop the make; add new
+	tests; restructure to remove prerequisites needed
+	otherwise.
+
+	* README: Updated.
+
+
+2000-08-10  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* eyal1.c (main): Change implicit cast to explicit
+	cast when passing "print_server" function pointer;
+	G++ no longer allows implicit func parameter casts.
+
+	* cleanup1.c: Remove unused "waitLock".
+	(main): Fix implicit parameter cast.
+
+	* cancel2.c (main): Fix implicit parameter cast.
+
+	* cancel4.c (main): Fix implicit parameter cast.
+
+	* cancel3.c (main): Fix implicit parameter cast.
+
+	* GNUmakefile: Renamed from Makefile; Add missing
+	cancel1 and cancel2 test targets.
+
+	* Makefile: Converted for use with MS nmake.
+
+2000-08-06  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* ccl.bat: Add /nologo to remove extraneous output.
+
+	* exception1.c (exceptionedThread): Init 'dummy';
+	put expression into if condition to prevent optimising away;
+	remove unused variable.
+
+	* cancel4.c (mythread): Cast return value to avoid warnings.
+
+	* cancel2.c (mythread): Missing #endif.
+
+	* condvar9.c (mythread): Cast return value to avoid warnings.
+
+	* condvar8.c (mythread): Cast return value to avoid warnings.
+
+	* condvar7.c (mythread): Cast return value to avoid warnings.
+
+	* cleanup3.c (mythread): Cast return value to avoid warnings.
+
+	* cleanup2.c (mythread): Cast return value to avoid warnings.
+
+	* cleanup1.c (mythread): Cast return value to avoid warnings.
+
+	* condvar5.c (mythread): Cast return value to avoid warnings.
+
+	* condvar3.c (mythread): Cast return value to avoid warnings.
+
+	* condvar6.c (mythread): Cast return value to avoid warnings.
+
+	* condvar4.c (mythread): Cast return value to avoid warnings.
+
+2000-08-05  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* cancel2.c: Use PtW32CatchAll macro if defined.
+
+	* exception1.c: Use PtW32CatchAll macro if defined.
+
+2000-08-02  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* tsd1.c: Fix typecasts of &result [g++ is now very fussy].
+	
+	* test.h (assert): Return 0's explicitly to allay
+	g++ errors.
+	
+	* join2.c: Add explicit typecasts.
+	
+	* join1.c: Add explicit typecasts.
+	
+	* join0.c: Add explicit typecasts.
+	
+	* eyal1.c: Add explicit typecasts.
+	
+	* count1.c (main): Add type cast to remove g++ parse warning
+	[gcc-2.95.2 seems to have tightened up on this].
+
+	* Makefile (GLANG): Use c++ explicitly.
+	Remove MSVC sections (was commented out).
+	Add target to generate cpp output.
+
+2000-07-25  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* runtest.bat: modified to work under W98.
+	
+	* runall.bat: Add new tests; modified to work under W98.
+	It was ok under NT.
+
+	* Makefile: Add new tests.
+
+	* exception1.c: New; Test passing exceptions back to the
+	application and retaining library internal exceptions.
+
+	* join0.c: New; Test a single join.
+
+2000-01-06  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* cleanup1.c: New; Test cleanup handler executes (when thread is
+	canceled).
+
+	* cleanup2.c: New; Test cleanup handler executes (when thread is
+	not canceled).
+
+	* cleanup3.c: New; Test cleanup handler does not execute
+	(when thread is not canceled).
+
+2000-01-04  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* cancel4.c: New; Test cancelation does not occur in deferred
+	cancelation threads with no cancelation points.
+
+	* cancel3.c: New; Test asynchronous cancelation.
+
+	* context1.c: New; Test context switching method for async
+	cancelation.
+
+1999-11-23  Ross Johnson  <rpj@special.ise.canberra.edu.au>
+
+	* test.h: Add header includes; include local header versions rather
+	than system versions; rearrange the assert macro defines.
+
+1999-11-07  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* loadfree.c: New. Test loading and freeing the library (DLL).
+
+1999-10-30  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* cancel1.c: New. Test pthread_setcancelstate and
+	pthread_setcanceltype functions.
+	* eyal1.c (waste_time): Change calculation to avoid FP exception
+	on Aplhas
+	- Rich Peters <rpeters@micro-magic.com>
+
+Oct 14 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* condvar7.c: New. Test broadcast after waiting thread is canceled.
+	* condvar8.c: New. Test multiple broadcasts.
+	* condvar9.c: New. Test multiple broadcasts with thread
+	cancelation.
+	
+Sep 16 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* rwlock6.c: New test.
+
+Sep 15 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* rwlock1.c: New test.
+	* rwlock2.c: New test.
+	* rwlock3.c: New test.
+	* rwlock4.c: New test.
+	* rwlock5.c: New test.
+
+Aug 22 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* runall.bat (join2): Add test.
+
+Aug 19 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* join2.c: New test.
+
+Wed Aug 12 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* Makefile (LIBS): Add -L.
+
+Mon May 31 10:25:01 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* Makefile (GLANG): Add GCC language option.
+
+Sat May 29 23:29:04 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* runall.bat (condvar5): Add new test.
+
+	* runall.bat (condvar6): Add new test.
+
+	* Makefile (condvar5) : Add new test.
+	
+	* Makefile (condvar6) : Add new test.
+	
+	* condvar5.c: New test for pthread_cond_broadcast().
+
+	* condvar6.c: New test for pthread_cond_broadcast().
+
+Sun Apr  4 12:04:28 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* tsd1.c (mythread): Change Sleep(0) to sched_yield().
+	(sched.h): Include.
+
+	* condvar3.c (mythread): Remove redundant Sleep().
+
+	* runtest.bat: Re-organised to make more informative.
+
+Fri Mar 19 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* *.bat: redirect unwanted output to nul:
+
+	* runall.bat: new.
+
+	* cancel1.c: new. Not part of suite yet.
+	
+Mon Mar 15 00:17:55 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* mutex1.c: only test mutex init and destroy; add assertions.
+
+	* count1.c: raise number of spawned threads to 60 (appears to
+	be the limit under Win98).
+
+Sun Mar 14 21:31:02 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* test.h (assert): add assertion trace option.
+	Use:
+	"#define ASSERT_TRACE 1" to turn it on,
+	"#define ASSERT_TRACE 0" to turn it off (default).
+
+	* condvar3.c (main): add more assertions.
+
+	* condvar4.c (main): add more assertions.
+
+	* condvar1.c (main): add more assertions.
+
+Fri Mar 12 08:34:15 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* condvar4.c (cvthing): switch the order of the INITIALIZERs.
+
+	* eyal1.c (main): Fix trylock loop; was not waiting for thread to lock
+	the "started" mutex.
+
+Wed Mar 10 10:41:52 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* tryentercs.c: Apply typo patch from bje.
+
+	* tryentercs2.c: Ditto.
+
+Sun Mar  7 10:41:52 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* Makefile (condvar3, condvar4): Add tests.
+
+	* condvar4.c (General): Reduce to simple test case; prerequisite
+	is condvar3.c; add description.
+
+	* condvar3.c (General): Reduce to simple test case; prerequisite
+	is condvar2.c; add description.
+
+	* condvar2.c (General): Reduce to simple test case; prerequisite
+	is condvar1.c; add description.
+
+	* condvar1.c (General): Reduce to simple test case; add
+	description.
+
+	* Template.c (Comments): Add generic test detail.
+
+1999-02-23  Ross Johnson  <rpj@ise.canberra.edu.au>
+
+        * Template.c: Revamp.
+
+        * condvar1.c: Add.
+
+        * condvar2.c: Add.
+
+        * Makefile: Add condvar1 condvar2 tests.
+
+        * exit1.c, exit2.c, exit3.c: Cosmetic changes.
+
+1999-02-23  Ross Johnson  <rpj@ise.canberra.edu.au>
+
+	* Makefile: Some refinement.
+
+	* *.c: More exhaustive checking through assertions; clean up;
+	add some more tests.
+
+	* Makefile: Now actually runs the tests.
+
+	* tests.h: Define our own assert macro. The Mingw32
+	version pops up a dialog but we want to run non-interactively.
+
+	* equal1.c: use assert a little more directly so that it
+	prints the actual call statement.
+
+	* exit1.c: Modify to return 0 on success, 1 on failure.
+
+1999-02-22  Ross Johnson  <rpj@ise.canberra.edu.au>
+
+	* self2.c: Bring up to date.
+
+	* self3.c: Ditto.
+
+1999-02-21  Ben Elliston  <bje@cygnus.com>
+
+	* README: Update.
+
+	* Makefile: New file. Run all tests automatically. Primitive tests
+	are run first; more complex tests are run last.
+
+	* count1.c: New test. Validate the thread count.
+
+	* exit2.c: Perform a simpler test.
+	
+	* exit3.c: New test. Replaces exit2.c, since exit2.c needs to
+	perform simpler checking first.
+
+	* create1.c: Update to use the new testsuite exiting convention.
+	
+	* equal1.c: Likewise.
+
+	* mutex1.c: Likewise.
+
+	* mutex2.c: Likewise.
+
+	* once1.c: Likewise.
+
+	* self2.c: Likewise.
+
+	* self3.c: Likewise.
+
+	* tsd1.c: Likewise.
+
+1999-02-20  Ross Johnson  <rpj@ise.canberra.edu.au>
+
+	* mutex2.c: Test static mutex initialisation.
+
+	* test.h: New. Declares a table mapping error numbers to
+	error names.
+
+1999-01-17  Ross Johnson  <rpj@ise.canberra.edu.au>
+
+	* runtest: New script to build and run a test in the tests directory.
+
+Wed Dec 30 11:22:44 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* tsd1.c: Re-written. See comments at start of file.
+	* Template.c: New. Contains skeleton code and comment template
+	intended to fully document the test.
+
+Fri Oct 16 17:59:49 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
+
+	* tsd1.c (destroy_key): Add function. Change diagnostics.
+
+Thu Oct 15 17:42:37 1998  Ross Johnson  <rpj@swan.canberra.edu.au>
+
+	* tsd1.c (mythread): Fix some casts and add some message
+	output. Fix inverted conditional.
+
+Mon Oct 12 02:12:29 1998  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
+
+	* tsd1.c: New. Test TSD using 1 key and 2 threads.
+
+1998-09-13  Ben Elliston  <bje@cygnus.com>
+
+	* eyal1.c: New file; contributed by Eyal Lebedinsky
+	<eyal@eyal.emu.id.au>.
+
+1998-09-12  Ben Elliston  <bje@cygnus.com>
+
+	* exit2.c (func): Return a value.
+	(main): Call the right thread entry function.
+
+1998-07-22  Ben Elliston  <bje@cygnus.com>
+
+	* exit2.c (main): Fix size of pthread_t array.
+
+1998-07-10  Ben Elliston  <bje@cygnus.com>
+
+	* exit2.c: New file; test pthread_exit() harder.
+
+	* exit1.c: New file; test pthread_exit().
diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index b14db76..2eabdae 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -46,7 +46,10 @@ TESTS	= loadfree \
 	  rwlock1 rwlock2 rwlock3 rwlock4 rwlock5 rwlock6 rwlock7 \
 	  context1 cancel3 cancel4 cancel5 \
 	  cleanup0 cleanup1 cleanup2 cleanup3 \
-	  exception1 exception2 exception3
+	  priority1 priority2 inherit1 \
+	  exception1 exception2 \
+	  benchtest1 benchtest2 \
+	  exception3
 
 PASSES	= $(TESTS:%=%.pass)
 
@@ -71,6 +74,8 @@ all-GC: $(PASSES)
 all-GCE: $(PASSES)
 	@ $(ECHO) ALL TESTS PASSED! Congratulations!
 
+benchtest1.pass: mutex3.pass
+benchtest2.pass: benchtest1.pass
 cancel1.pass: create1.pass
 cancel2.pass: cancel1.pass
 cancel2_1.pass: cancel2.pass
@@ -105,6 +110,7 @@ exit1.pass:
 exit2.pass: create1.pass
 exit3.pass: create1.pass
 eyal1.pass: tsd1.pass
+inherit1.pass: join1.pass
 join0.pass: create1.pass
 join1.pass: create1.pass
 join2.pass: create1.pass
@@ -118,6 +124,8 @@ mutex3.pass: create1.pass
 mutex4.pass: mutex3.pass
 mutex5.pass:
 once1.pass: create1.pass
+priority1.pass: join1.pass
+priority2.pass: priority1.pass
 rwlock1.pass: condvar6.pass
 rwlock2.pass: rwlock1.pass
 rwlock3.pass: rwlock2.pass
diff --git a/tests/Makefile b/tests/Makefile
index afcc156..d7b36b0 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -55,7 +55,9 @@ PASSES= loadfree.pass \
 	  context1.pass  \

 	  cancel3.pass  cancel4.pass  cancel5.pass  \

 	  cleanup0.pass  cleanup1.pass  cleanup2.pass  cleanup3.pass  \

-	  exception1.pass  exception2.pass  exception3.pass

+	  priority1.pass priority2.pass inherit1.pass  \

+	  exception1.pass  exception2.pass  \

+	  benchtest1.pass benchtest2.pass exception3.pass  \

 

 all:

 	@ $(ECHO) Run one of the following command lines:

@@ -114,6 +116,8 @@ clean:
 	- $(RM) *.exe

 	- $(RM) *.pass

 

+benchtest1.pass: mutex3.pass

+benchtest2.pass: benchtest1.pass

 cancel1.pass: create1.pass

 cancel2.pass: cancel1.pass

 cancel3.pass: context1.pass

@@ -147,6 +151,7 @@ exit1.pass:
 exit2.pass: create1.pass

 exit3.pass: create1.pass

 eyal1.pass: tsd1.pass

+inherit1.pass: join1.pass

 join0.pass: create1.pass

 join1.pass: create1.pass

 join2.pass: create1.pass

@@ -160,6 +165,8 @@ mutex3.pass: create1.pass
 mutex4.pass: mutex3.pass

 mutex5.pass:

 once1.pass: create1.pass

+priority1.pass: join1.pass

+priority2.pass: priority1.pass

 rwlock1.pass: condvar6.pass

 rwlock2.pass: rwlock1.pass

 rwlock3.pass: rwlock2.pass

diff --git a/tests/benchtest1.c b/tests/benchtest1.c
new file mode 100644
index 0000000..883c24f
--- /dev/null
+++ b/tests/benchtest1.c
@@ -0,0 +1,117 @@
+/*
+ * benchtest1.c
+ *
+ * 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
+
+#define ITERATIONS      10000000L
+
+pthread_mutex_t mx;
+pthread_mutexattr_t ma;
+struct _timeb currSysTimeStart;
+struct _timeb currSysTimeStop;
+long durationMilliSecs;
+long overHeadMilliSecs = 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 PTHREAD_MUTEX_DEFAULT
+  pthread_mutexattr_settype(&ma, mType);
+#endif
+  pthread_mutex_init(&mx, &ma);
+
+  TESTSTART
+  (void) pthread_mutex_lock(&mx);
+  (void) pthread_mutex_unlock(&mx);
+  TESTSTOP
+
+  pthread_mutex_destroy(&mx);
+
+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop)
+    - overHeadMilliSecs;
+
+  printf( "%-25s %15ld %15ld %15.3f\n",
+          testNameString,
+          ITERATIONS,
+          durationMilliSecs,
+          (float) durationMilliSecs * 1E3 / ITERATIONS);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  pthread_mutexattr_init(&ma);
+
+  printf( "Single thread, non-blocking mutex locks/unlocks.\n\n");
+  printf( "%-25s %15s %15s %15s\n",
+          "Test",
+          "Iterations",
+          "Total(msec)",
+          "lock/unlock(usec)");
+
+  /*
+   * Time the loop overhead so we can subtract it from the actual test times.
+   */
+
+  TESTSTART
+  TESTSTOP
+
+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop)
+    - overHeadMilliSecs;
+
+  printf( "%-25s %15ld %15ld\n",
+          "Overhead",
+          ITERATIONS,
+          durationMilliSecs);
+
+  overHeadMilliSecs = durationMilliSecs;
+
+  /*
+   * Now we can start the actual tests
+   */
+#ifdef PTHREAD_MUTEX_DEFAULT
+  runTest("PTHREAD_MUTEX_DEFAULT", PTHREAD_MUTEX_DEFAULT);
+
+  runTest("PTHREAD_MUTEX_NORMAL", PTHREAD_MUTEX_NORMAL);
+
+  runTest("PTHREAD_MUTEX_ERRORCHECK", PTHREAD_MUTEX_ERRORCHECK);
+
+  runTest("PTHREAD_MUTEX_RECURSIVE", PTHREAD_MUTEX_RECURSIVE);
+#else
+  runTest("Non-blocking lock", 0);
+#endif
+
+  /*
+   * End of tests.
+   */
+
+  pthread_mutexattr_destroy(&ma);
+
+  return 0;
+}
diff --git a/tests/benchtest2.c b/tests/benchtest2.c
new file mode 100644
index 0000000..f2932b9
--- /dev/null
+++ b/tests/benchtest2.c
@@ -0,0 +1,183 @@
+/*
+ * benchtest1.c
+ *
+ * Measure time taken to complete an elementary operation.
+ *
+ * - Mutex
+ *   Two threads iterate over lock/unlock for each mutex type.
+ *   The two threads are forced into lock-step using two mutexes,
+ *   forcing the threads to block on each lock operation. The
+ *   time measured is therefore the worst case senario.
+ */
+
+#include "test.h"
+#include <sys/timeb.h>
+
+#ifdef __GNUC__
+#include <stdlib.h>
+#endif
+
+#define ITERATIONS      100000L
+
+pthread_mutex_t gate1, gate2;
+pthread_mutexattr_t ma;
+long durationMilliSecs;
+long overHeadMilliSecs = 0;
+struct _timeb currSysTimeStart;
+struct _timeb currSysTimeStop;
+pthread_t worker;
+int running = 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 *
+overheadThread(void * arg)
+{
+  do
+    {
+      sched_yield();
+    }
+  while (running);
+
+  return NULL;
+}
+
+
+void *
+workerThread(void * arg)
+{
+  do
+    {
+      (void) pthread_mutex_lock(&gate1);
+      (void) pthread_mutex_lock(&gate2);
+      (void) pthread_mutex_unlock(&gate1);
+      sched_yield();
+      (void) pthread_mutex_unlock(&gate2);
+    }
+  while (running);
+
+  return NULL;
+}
+
+void
+runTest (char * testNameString, int mType)
+{
+#ifdef PTHREAD_MUTEX_DEFAULT
+  pthread_mutexattr_settype(&ma, mType);
+#endif
+  pthread_mutex_init(&gate1, &ma);
+  pthread_mutex_init(&gate2, &ma);
+
+  (void) pthread_mutex_lock(&gate1);
+  (void) pthread_mutex_lock(&gate2);
+
+  running = 1;
+
+  (void) pthread_create(&worker, NULL, workerThread, NULL);
+
+  TESTSTART
+  (void) pthread_mutex_unlock(&gate1);
+  sched_yield();
+  (void) pthread_mutex_unlock(&gate2);
+  (void) pthread_mutex_lock(&gate1);
+  (void) pthread_mutex_lock(&gate2);
+  TESTSTOP
+
+  running = 0;
+
+  (void) pthread_mutex_unlock(&gate2);
+  (void) pthread_mutex_unlock(&gate1);
+
+  (void) pthread_join(worker, NULL);
+
+  pthread_mutex_destroy(&gate2);
+  pthread_mutex_destroy(&gate1);
+
+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop)
+    - overHeadMilliSecs;
+
+  printf( "%-25s %15ld %15ld %15.3f\n",
+          testNameString,
+          ITERATIONS,
+          durationMilliSecs,
+          (float) durationMilliSecs * 1E3 / ITERATIONS / 4   /* Four locks/unlocks per iteration */);
+}
+
+
+int
+main (int argc, char *argv[])
+{
+  pthread_mutexattr_init(&ma);
+
+  printf( "Two threads, blocking mutex locks/unlocks.\n\n");
+
+  printf( "%-25s %15s %15s %15s\n",
+          "Test",
+          "Iterations",
+          "Total(msec)",
+          "lock/unlock(usec)");
+
+  /*
+   * Time the loop overhead so we can subtract it from the actual test times.
+   */
+
+  running = 1;
+
+  (void) pthread_create(&worker, NULL, overheadThread, NULL);
+
+  TESTSTART
+  sched_yield();
+  TESTSTOP
+
+  running = 0;
+
+  (void) pthread_join(worker, NULL);
+
+  pthread_mutex_destroy(&gate2);
+  pthread_mutex_destroy(&gate1);
+
+  durationMilliSecs = GetDurationMilliSecs(currSysTimeStart, currSysTimeStop)
+    - overHeadMilliSecs;
+
+  printf( "%-25s %15ld %15ld\n",
+          "Overhead",
+          ITERATIONS,
+          durationMilliSecs);
+
+  overHeadMilliSecs = durationMilliSecs;
+
+  /*
+   * Now we can start the actual tests
+   */
+#ifdef PTHREAD_MUTEX_DEFAULT
+  runTest("PTHREAD_MUTEX_DEFAULT", PTHREAD_MUTEX_DEFAULT);
+
+  runTest("PTHREAD_MUTEX_NORMAL", PTHREAD_MUTEX_NORMAL);
+
+  runTest("PTHREAD_MUTEX_ERRORCHECK", PTHREAD_MUTEX_ERRORCHECK);
+
+  runTest("PTHREAD_MUTEX_RECURSIVE", PTHREAD_MUTEX_RECURSIVE);
+#else
+  runTest("Blocking locks", 0);
+#endif
+
+  /*
+   * End of tests.
+   */
+
+  pthread_mutexattr_destroy(&ma);
+
+  return 0;
+}
diff --git a/tests/cancel5.c b/tests/cancel5.c
index 7d7262a..b12cc1c 100644
--- a/tests/cancel5.c
+++ b/tests/cancel5.c
@@ -1,177 +1,177 @@
-/*

- * File: cancel5.c

- *

- * Test Synopsis: Test calling pthread_cancel from the main thread

- *                without calling pthread_self() in main.

- *

- * Test Method (Validation or Falsification):

- * - 

- *

- * 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:

- * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock

- *   pthread_testcancel, pthread_cancel, pthread_join

- *

- * Pass Criteria:

- * - Process returns zero exit status.

- *

- * Fail Criteria:

- * - Process returns non-zero exit status.

- */

-

-#if defined(_MSC_VER) || defined(__cplusplus)

-

-#include "test.h"

-

-/*

- * Create NUMTHREADS threads in addition to the Main thread.

- */

-enum {

-  NUMTHREADS = 4

-};

-

-typedef struct bag_t_ bag_t;

-struct bag_t_ {

-  int threadnum;

-  int started;

-  /* Add more per-thread state variables here */

-  int count;

-};

-

-static bag_t threadbag[NUMTHREADS + 1];

-

-void *

-mythread(void * arg)

-{

-  int result = ((int)PTHREAD_CANCELED + 1);

-  bag_t * bag = (bag_t *) arg;

-

-  assert(bag == &threadbag[bag->threadnum]);

-  assert(bag->started == 0);

-  bag->started = 1;

-

-  /* Set to known state and type */

-

-  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);

-

-  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);

-

-  /*

-   * We wait up to 10 seconds, waking every 0.1 seconds,

-   * for a cancelation to be applied to us.

-   */

-  for (bag->count = 0; bag->count < 100; bag->count++)

-    Sleep(100);

-

-  return (void *) result;

-}

-

-int

-main()

-{

-  int failed = 0;

-  int i;

-  pthread_t t[NUMTHREADS + 1];

-

-  for (i = 1; i <= NUMTHREADS; i++)

-    {

-      threadbag[i].started = 0;

-      threadbag[i].threadnum = i;

-      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);

-    }

-

-  /*

-   * Code to control or munipulate child threads should probably go here.

-   */

-  Sleep(500);

-

-  for (i = 1; i <= NUMTHREADS; i++)

-    {

-      assert(pthread_cancel(t[i]) == 0);

-    }

-

-  /*

-   * Give threads time to run.

-   */

-  Sleep(NUMTHREADS * 100);

-

-  /*

-   * Standard check that all threads started.

-   */

-  for (i = 1; i <= NUMTHREADS; i++)

-    { 

-      if (!threadbag[i].started)

-	{

-	  failed |= !threadbag[i].started;

-	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);

-	}

-    }

-

-  assert(!failed);

-

-  /*

-   * Check any results here. Set "failed" and only print output on failure.

-   */

-  failed = 0;

-  for (i = 1; i <= NUMTHREADS; i++)

-    {

-      int fail = 0;

-      int result = 0;

-

-      /*

-       * The thread does not contain any cancelation points, so

-       * a return value of PTHREAD_CANCELED confirms that async

-       * cancelation succeeded.

-       */

-      assert(pthread_join(t[i], (void **) &result) == 0);

-

-      fail = (result != (int) PTHREAD_CANCELED);

-

-      if (fail)

-	{

-	  fprintf(stderr, "Thread %d: started %d: count %d\n",

-		  i,

-		  threadbag[i].started,

-		  threadbag[i].count);

-	}

-      failed = (failed || fail);

-    }

-

-  assert(!failed);

-

-  /*

-   * Success.

-   */

-  return 0;

-}

-

-#else /* defined(_MSC_VER) || defined(__cplusplus) */

-

-int

-main()

-{

-  return 0;

-}

-

-#endif /* defined(_MSC_VER) || defined(__cplusplus) */

+/*
+ * File: cancel5.c
+ *
+ * Test Synopsis: Test calling pthread_cancel from the main thread
+ *                without calling pthread_self() in main.
+ *
+ * Test Method (Validation or Falsification):
+ * - 
+ *
+ * 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:
+ * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock
+ *   pthread_testcancel, pthread_cancel, pthread_join
+ *
+ * Pass Criteria:
+ * - Process returns zero exit status.
+ *
+ * Fail Criteria:
+ * - Process returns non-zero exit status.
+ */
+
+#if defined(_MSC_VER) || defined(__cplusplus)
+
+#include "test.h"
+
+/*
+ * Create NUMTHREADS threads in addition to the Main thread.
+ */
+enum {
+  NUMTHREADS = 4
+};
+
+typedef struct bag_t_ bag_t;
+struct bag_t_ {
+  int threadnum;
+  int started;
+  /* Add more per-thread state variables here */
+  int count;
+};
+
+static bag_t threadbag[NUMTHREADS + 1];
+
+void *
+mythread(void * arg)
+{
+  int result = ((int)PTHREAD_CANCELED + 1);
+  bag_t * bag = (bag_t *) arg;
+
+  assert(bag == &threadbag[bag->threadnum]);
+  assert(bag->started == 0);
+  bag->started = 1;
+
+  /* Set to known state and type */
+
+  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);
+
+  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);
+
+  /*
+   * We wait up to 10 seconds, waking every 0.1 seconds,
+   * for a cancelation to be applied to us.
+   */
+  for (bag->count = 0; bag->count < 100; bag->count++)
+    Sleep(100);
+
+  return (void *) result;
+}
+
+int
+main()
+{
+  int failed = 0;
+  int i;
+  pthread_t t[NUMTHREADS + 1];
+
+  for (i = 1; i <= NUMTHREADS; i++)
+    {
+      threadbag[i].started = 0;
+      threadbag[i].threadnum = i;
+      assert(pthread_create(&t[i], NULL, mythread, (void *) &threadbag[i]) == 0);
+    }
+
+  /*
+   * Code to control or munipulate child threads should probably go here.
+   */
+  Sleep(500);
+
+  for (i = 1; i <= NUMTHREADS; i++)
+    {
+      assert(pthread_cancel(t[i]) == 0);
+    }
+
+  /*
+   * Give threads time to run.
+   */
+  Sleep(NUMTHREADS * 100);
+
+  /*
+   * Standard check that all threads started.
+   */
+  for (i = 1; i <= NUMTHREADS; i++)
+    { 
+      if (!threadbag[i].started)
+	{
+	  failed |= !threadbag[i].started;
+	  fprintf(stderr, "Thread %d: started %d\n", i, threadbag[i].started);
+	}
+    }
+
+  assert(!failed);
+
+  /*
+   * Check any results here. Set "failed" and only print output on failure.
+   */
+  failed = 0;
+  for (i = 1; i <= NUMTHREADS; i++)
+    {
+      int fail = 0;
+      int result = 0;
+
+      /*
+       * The thread does not contain any cancelation points, so
+       * a return value of PTHREAD_CANCELED confirms that async
+       * cancelation succeeded.
+       */
+      assert(pthread_join(t[i], (void **) &result) == 0);
+
+      fail = (result != (int) PTHREAD_CANCELED);
+
+      if (fail)
+	{
+	  fprintf(stderr, "Thread %d: started %d: count %d\n",
+		  i,
+		  threadbag[i].started,
+		  threadbag[i].count);
+	}
+      failed = (failed || fail);
+    }
+
+  assert(!failed);
+
+  /*
+   * Success.
+   */
+  return 0;
+}
+
+#else /* defined(_MSC_VER) || defined(__cplusplus) */
+
+int
+main()
+{
+  return 0;
+}
+
+#endif /* defined(_MSC_VER) || defined(__cplusplus) */
diff --git a/tests/exception1.c b/tests/exception1.c
index 60038cd..e6ca461 100644
--- a/tests/exception1.c
+++ b/tests/exception1.c
@@ -1,231 +1,231 @@
-/*

- * File: exception1.c

- *

- * Test Synopsis: Test passing of exceptions back to the application.

- *

- * Test Method (Validation or Falsification):

- * - 

- *

- * 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:

- * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock

- *   pthread_testcancel, pthread_cancel, pthread_join

- *

- * Pass Criteria:

- * - Process returns zero exit status.

- *

- * Fail Criteria:

- * - Process returns non-zero exit status.

- */

-

-#if defined(_MSC_VER) || defined(__cplusplus)

-

-#include "test.h"

-

-/*

- * Create NUMTHREADS threads in addition to the Main thread.

- */

-enum {

-  NUMTHREADS = 4

-};

-

-void *

-exceptionedThread(void * arg)

-{

-  int dummy = 0;

-  int result = ((int)PTHREAD_CANCELED + 1);

-  /* Set to async cancelable */

-

-  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);

-

-  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);

-

-  Sleep(100);

-

-#if defined(_MSC_VER) && !defined(__cplusplus)

-  __try

-  {

-    int zero = 0;

-    int one = 1;

-    /*

-     * The deliberate exception condition (zero devide) is

-     * in an "if" to avoid being optimised out.

-     */

-    if (dummy == one/zero)

-      Sleep(0);

-  }

-  __except (EXCEPTION_EXECUTE_HANDLER)

-  {

-    /* Should get into here. */

-    result = ((int)PTHREAD_CANCELED + 2);

-  }

-#elif defined(__cplusplus)

-  try

-  {

-    /*

-     * I had a zero divide exception here but it

-     * wasn't being caught by the catch(...)

-     * below under Mingw32. That could be a problem.

-     */

-    throw dummy;

-  }

-#if defined(PtW32CatchAll)

-  PtW32CatchAll

-#else

-  catch (...)

-#endif

-  {

-    /* Should get into here. */

-    result = ((int)PTHREAD_CANCELED + 2);

-  }

-#endif

-

-  return (void *) result;

-}

-

-void *

-canceledThread(void * arg)

-{

-  int result = ((int)PTHREAD_CANCELED + 1);

-  int count;

-

-  /* Set to async cancelable */

-

-  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);

-

-  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);

-

-#if defined(_MSC_VER) && !defined(__cplusplus)

-  __try

-  {

-    /*

-     * We wait up to 10 seconds, waking every 0.1 seconds,

-     * for a cancelation to be applied to us.

-     */

-    for (count = 0; count < 100; count++)

-      Sleep(100);

-  }

-  __except (EXCEPTION_EXECUTE_HANDLER)

-  {

-    /* Should NOT get into here. */

-    result = ((int)PTHREAD_CANCELED + 2);

-  }

-#elif defined(__cplusplus)

-  try

-  {

-    /*

-     * We wait up to 10 seconds, waking every 0.1 seconds,

-     * for a cancelation to be applied to us.

-     */

-    for (count = 0; count < 100; count++)

-      Sleep(100);

-  }

-#if defined(PtW32CatchAll)

-  PtW32CatchAll

-#else

-  catch (...)

-#endif

-  {

-    /* Should NOT get into here. */

-    result = ((int)PTHREAD_CANCELED + 2);

-  }

-#endif

-

-  return (void *) result;

-}

-

-int

-main()

-{

-  int failed = 0;

-  int i;

-  pthread_t mt;

-  pthread_t et[NUMTHREADS];

-  pthread_t ct[NUMTHREADS];

-

-  assert((mt = pthread_self()) != NULL);

-

-  for (i = 0; i < NUMTHREADS; i++)

-    {

-      assert(pthread_create(&et[i], NULL, exceptionedThread, NULL) == 0);

-      assert(pthread_create(&ct[i], NULL, canceledThread, NULL) == 0);

-    }

-

-  /*

-   * Code to control or munipulate child threads should probably go here.

-   */

-  Sleep(1000);

-

-  for (i = 0; i < NUMTHREADS; i++)

-    {

-      assert(pthread_cancel(ct[i]) == 0);

-    }

-

-  /*

-   * Give threads time to run.

-   */

-  Sleep(NUMTHREADS * 1000);

-

-  /*

-   * Check any results here. Set "failed" and only print output on failure.

-   */

-  failed = 0;

-  for (i = 0; i < NUMTHREADS; i++)

-    {

-      int fail = 0;

-      int result = 0;

-

-	/* Canceled thread */

-      assert(pthread_join(ct[i], (void **) &result) == 0);

-      assert(!(fail = (result != (int) PTHREAD_CANCELED)));

-

-      failed = (failed || fail);

-

-      /* Exceptioned thread */

-      assert(pthread_join(et[i], (void **) &result) == 0);

-      assert(!(fail = (result != ((int) PTHREAD_CANCELED + 2))));

-

-      failed = (failed || fail);

-    }

-

-  assert(!failed);

-

-  /*

-   * Success.

-   */

-  return 0;

-}

-

-#else /* defined(_MSC_VER) || defined(__cplusplus) */

-

-#include <stdio.h>

-

-int

-main()

-{

-  fprintf(stderr, "Test N/A for this compiler environment.\n");

-  return 0;

-}

-

-#endif /* defined(_MSC_VER) || defined(__cplusplus) */

+/*
+ * File: exception1.c
+ *
+ * Test Synopsis: Test passing of exceptions back to the application.
+ *
+ * Test Method (Validation or Falsification):
+ * - 
+ *
+ * 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:
+ * - have working pthread_create, pthread_self, pthread_mutex_lock/unlock
+ *   pthread_testcancel, pthread_cancel, pthread_join
+ *
+ * Pass Criteria:
+ * - Process returns zero exit status.
+ *
+ * Fail Criteria:
+ * - Process returns non-zero exit status.
+ */
+
+#if defined(_MSC_VER) || defined(__cplusplus)
+
+#include "test.h"
+
+/*
+ * Create NUMTHREADS threads in addition to the Main thread.
+ */
+enum {
+  NUMTHREADS = 4
+};
+
+void *
+exceptionedThread(void * arg)
+{
+  int dummy = 0;
+  int result = ((int)PTHREAD_CANCELED + 1);
+  /* Set to async cancelable */
+
+  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);
+
+  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);
+
+  Sleep(100);
+
+#if defined(_MSC_VER) && !defined(__cplusplus)
+  __try
+  {
+    int zero = 0;
+    int one = 1;
+    /*
+     * The deliberate exception condition (zero devide) is
+     * in an "if" to avoid being optimised out.
+     */
+    if (dummy == one/zero)
+      Sleep(0);
+  }
+  __except (EXCEPTION_EXECUTE_HANDLER)
+  {
+    /* Should get into here. */
+    result = ((int)PTHREAD_CANCELED + 2);
+  }
+#elif defined(__cplusplus)
+  try
+  {
+    /*
+     * I had a zero divide exception here but it
+     * wasn't being caught by the catch(...)
+     * below under Mingw32. That could be a problem.
+     */
+    throw dummy;
+  }
+#if defined(PtW32CatchAll)
+  PtW32CatchAll
+#else
+  catch (...)
+#endif
+  {
+    /* Should get into here. */
+    result = ((int)PTHREAD_CANCELED + 2);
+  }
+#endif
+
+  return (void *) result;
+}
+
+void *
+canceledThread(void * arg)
+{
+  int result = ((int)PTHREAD_CANCELED + 1);
+  int count;
+
+  /* Set to async cancelable */
+
+  assert(pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL) == 0);
+
+  assert(pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL) == 0);
+
+#if defined(_MSC_VER) && !defined(__cplusplus)
+  __try
+  {
+    /*
+     * We wait up to 10 seconds, waking every 0.1 seconds,
+     * for a cancelation to be applied to us.
+     */
+    for (count = 0; count < 100; count++)
+      Sleep(100);
+  }
+  __except (EXCEPTION_EXECUTE_HANDLER)
+  {
+    /* Should NOT get into here. */
+    result = ((int)PTHREAD_CANCELED + 2);
+  }
+#elif defined(__cplusplus)
+  try
+  {
+    /*
+     * We wait up to 10 seconds, waking every 0.1 seconds,
+     * for a cancelation to be applied to us.
+     */
+    for (count = 0; count < 100; count++)
+      Sleep(100);
+  }
+#if defined(PtW32CatchAll)
+  PtW32CatchAll
+#else
+  catch (...)
+#endif
+  {
+    /* Should NOT get into here. */
+    result = ((int)PTHREAD_CANCELED + 2);
+  }
+#endif
+
+  return (void *) result;
+}
+
+int
+main()
+{
+  int failed = 0;
+  int i;
+  pthread_t mt;
+  pthread_t et[NUMTHREADS];
+  pthread_t ct[NUMTHREADS];
+
+  assert((mt = pthread_self()) != NULL);
+
+  for (i = 0; i < NUMTHREADS; i++)
+    {
+      assert(pthread_create(&et[i], NULL, exceptionedThread, NULL) == 0);
+      assert(pthread_create(&ct[i], NULL, canceledThread, NULL) == 0);
+    }
+
+  /*
+   * Code to control or munipulate child threads should probably go here.
+   */
+  Sleep(1000);
+
+  for (i = 0; i < NUMTHREADS; i++)
+    {
+      assert(pthread_cancel(ct[i]) == 0);
+    }
+
+  /*
+   * Give threads time to run.
+   */
+  Sleep(NUMTHREADS * 1000);
+
+  /*
+   * Check any results here. Set "failed" and only print output on failure.
+   */
+  failed = 0;
+  for (i = 0; i < NUMTHREADS; i++)
+    {
+      int fail = 0;
+      int result = 0;
+
+	/* Canceled thread */
+      assert(pthread_join(ct[i], (void **) &result) == 0);
+      assert(!(fail = (result != (int) PTHREAD_CANCELED)));
+
+      failed = (failed || fail);
+
+      /* Exceptioned thread */
+      assert(pthread_join(et[i], (void **) &result) == 0);
+      assert(!(fail = (result != ((int) PTHREAD_CANCELED + 2))));
+
+      failed = (failed || fail);
+    }
+
+  assert(!failed);
+
+  /*
+   * Success.
+   */
+  return 0;
+}
+
+#else /* defined(_MSC_VER) || defined(__cplusplus) */
+
+#include <stdio.h>
+
+int
+main()
+{
+  fprintf(stderr, "Test N/A for this compiler environment.\n");
+  return 0;
+}
+
+#endif /* defined(_MSC_VER) || defined(__cplusplus) */
diff --git a/tests/inherit1.c b/tests/inherit1.c
new file mode 100644
index 0000000..a909eb7
--- /dev/null
+++ b/tests/inherit1.c
@@ -0,0 +1,99 @@
+/*
+ * File: inherit1.c
+ *
+ * Test Synopsis:
+ * - Test thread priority inheritance.
+ *
+ * Test Method (Validation or Falsification):
+ * - 
+ *
+ * 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 * func(void * arg)
+{
+  int policy;
+  struct sched_param param;
+
+  assert(pthread_getschedparam(pthread_self(), &policy, &param) == 0);
+  return (void *) param.sched_priority;
+}
+
+int
+main()
+{
+  pthread_t t;
+  pthread_t mainThread = pthread_self();
+  pthread_attr_t attr;
+  void * result = NULL;
+  struct sched_param param;
+  struct sched_param mainParam;
+  int maxPrio;
+  int minPrio;
+  int prio;
+  int policy;
+  int inheritsched = -1;
+
+  assert((maxPrio = sched_get_priority_max(SCHED_OTHER)) != -1);
+  assert((minPrio = sched_get_priority_min(SCHED_OTHER)) != -1);
+
+  assert(pthread_attr_init(&attr) == 0);
+  assert(pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED) == 0);
+  assert(pthread_attr_getinheritsched(&attr, &inheritsched) == 0);
+  assert(inheritsched == PTHREAD_INHERIT_SCHED);
+
+  for (prio = minPrio; prio < maxPrio; prio++)
+    {
+      mainParam.sched_priority = prio;
+
+      /* Change the main thread priority */
+      assert(pthread_setschedparam(mainThread, SCHED_OTHER, &mainParam) == 0);
+      assert(pthread_getschedparam(mainThread, &policy, &mainParam) == 0);
+      assert(policy == SCHED_OTHER);
+      assert(mainParam.sched_priority == prio);
+
+      for (param.sched_priority = prio;
+           param.sched_priority <= maxPrio;
+           param.sched_priority++)
+        {
+          /* The new thread create should ignore this new priority */
+          assert(pthread_attr_setschedparam(&attr, &param) == 0);
+          assert(pthread_create(&t, &attr, func, NULL) == 0);
+          pthread_join(t, &result);
+          assert((int) result == mainParam.sched_priority);
+        }
+    }
+
+  return 0;
+}
diff --git a/tests/mutex3.c b/tests/mutex3.c
index 26cb070..07e75b1 100644
--- a/tests/mutex3.c
+++ b/tests/mutex3.c
@@ -33,8 +33,7 @@ main()
   assert(pthread_mutex_lock(&mutex1) == 0);
 
   assert(pthread_create(&t, NULL, func, NULL) == 0);
-
-  Sleep(2000);
+  assert(pthread_join(t, NULL) == 0);
 
   assert(pthread_mutex_unlock(&mutex1) == 0);
 
diff --git a/tests/mutex4.c b/tests/mutex4.c
index 7b989d0..1bf236b 100644
--- a/tests/mutex4.c
+++ b/tests/mutex4.c
@@ -13,42 +13,61 @@
 
 static int wasHere = 0;
 
-static pthread_mutex_t mutex1 = PTHREAD_MUTEX_INITIALIZER;
-
-void * locker(void * arg)
-{
-  wasHere++;
-  assert(pthread_mutex_lock(&mutex1) == 0);
-  Sleep(1000);
-  assert(pthread_mutex_unlock(&mutex1) == 0);
-
-  wasHere++;
-  return 0;
-}
+static pthread_mutex_t mutex1;
  
 void * unlocker(void * arg)
 {
-  wasHere++;
-
-  /* Wait for locker to lock mutex1 */
-  Sleep(500);
-
-  assert(pthread_mutex_unlock(&mutex1) == EPERM);
+  int expectedResult = (int) arg;
 
   wasHere++;
-  return 0;
+  assert(pthread_mutex_unlock(&mutex1) == expectedResult);
+  wasHere++;
+  return NULL;
 }
  
 int
 main()
 {
   pthread_t t;
+  pthread_mutexattr_t ma;
 
-  assert(pthread_create(&t, NULL, locker, NULL) == 0);
-  assert(pthread_create(&t, NULL, unlocker, NULL) == 0);
-  Sleep(2000);
+  assert(pthread_mutexattr_init(&ma) == 0);
 
-  assert(wasHere == 4);
+  wasHere = 0;
+  assert(pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_DEFAULT) == 0);
+  assert(pthread_mutex_init(&mutex1, &ma) == 0);
+  assert(pthread_mutex_lock(&mutex1) == 0);
+  assert(pthread_create(&t, NULL, unlocker, (void *) 0) == 0);
+  assert(pthread_join(t, NULL) == 0);
+  assert(pthread_mutex_unlock(&mutex1) == EPERM);
+  assert(wasHere == 2);
+
+  wasHere = 0;
+  assert(pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_NORMAL) == 0);
+  assert(pthread_mutex_init(&mutex1, &ma) == 0);
+  assert(pthread_mutex_lock(&mutex1) == 0);
+  assert(pthread_create(&t, NULL, unlocker, (void *) 0) == 0);
+  assert(pthread_join(t, NULL) == 0);
+  assert(pthread_mutex_unlock(&mutex1) == EPERM);
+  assert(wasHere == 2);
+
+  wasHere = 0;
+  assert(pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_ERRORCHECK) == 0);
+  assert(pthread_mutex_init(&mutex1, &ma) == 0);
+  assert(pthread_mutex_lock(&mutex1) == 0);
+  assert(pthread_create(&t, NULL, unlocker, (void *) EPERM) == 0);
+  assert(pthread_join(t, NULL) == 0);
+  assert(pthread_mutex_unlock(&mutex1) == 0);
+  assert(wasHere == 2);
+
+  wasHere = 0;
+  assert(pthread_mutexattr_settype(&ma, PTHREAD_MUTEX_RECURSIVE) == 0);
+  assert(pthread_mutex_init(&mutex1, &ma) == 0);
+  assert(pthread_mutex_lock(&mutex1) == 0);
+  assert(pthread_create(&t, NULL, unlocker, (void *) EPERM) == 0);
+  assert(pthread_join(t, NULL) == 0);
+  assert(pthread_mutex_unlock(&mutex1) == 0);
+  assert(wasHere == 2);
 
   return 0;
 }
diff --git a/tests/mutex5.c b/tests/mutex5.c
index d7b9064..1f90e19 100644
--- a/tests/mutex5.c
+++ b/tests/mutex5.c
@@ -13,18 +13,18 @@ int
 main()
 {
   int mxType = -1;
-  int bool = 0;   /* Use to quell GNU compiler warnings. */
+  int success = 0;   /* Use to quell GNU compiler warnings. */
 
-  assert(bool = PTHREAD_MUTEX_DEFAULT == PTHREAD_MUTEX_NORMAL);
-  assert(bool = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_ERRORCHECK);
-  assert(bool = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_RECURSIVE);
-  assert(bool = PTHREAD_MUTEX_RECURSIVE != PTHREAD_MUTEX_ERRORCHECK);
+  assert(success = PTHREAD_MUTEX_DEFAULT == PTHREAD_MUTEX_NORMAL);
+  assert(success = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_ERRORCHECK);
+  assert(success = PTHREAD_MUTEX_DEFAULT != PTHREAD_MUTEX_RECURSIVE);
+  assert(success = PTHREAD_MUTEX_RECURSIVE != PTHREAD_MUTEX_ERRORCHECK);
 
-  assert(bool = PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_FAST_NP);
-  assert(bool = PTHREAD_MUTEX_RECURSIVE == PTHREAD_MUTEX_RECURSIVE_NP);
-  assert(bool = PTHREAD_MUTEX_ERRORCHECK == PTHREAD_MUTEX_ERRORCHECK_NP);
+  assert(success = PTHREAD_MUTEX_NORMAL == PTHREAD_MUTEX_FAST_NP);
+  assert(success = PTHREAD_MUTEX_RECURSIVE == PTHREAD_MUTEX_RECURSIVE_NP);
+  assert(success = PTHREAD_MUTEX_ERRORCHECK == PTHREAD_MUTEX_ERRORCHECK_NP);
 
-  if (bool == bool)
+  if (success == success)
     {
       assert(pthread_mutexattr_init(&mxAttr) == 0);
       assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0);
diff --git a/tests/priority1.c b/tests/priority1.c
new file mode 100644
index 0000000..a311028
--- /dev/null
+++ b/tests/priority1.c
@@ -0,0 +1,78 @@
+/*
+ * File: priority1.c
+ *
+ * Test Synopsis:
+ * - Test thread priority explicit setting using thread attribute.
+ *
+ * Test Method (Validation or Falsification):
+ * - 
+ *
+ * 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 * func(void * arg)
+{
+  int policy;
+  struct sched_param param;
+
+  assert(pthread_getschedparam(pthread_self(), &policy, &param) == 0);
+  assert(policy == SCHED_OTHER);
+  return (void *) param.sched_priority;
+}
+ 
+int
+main()
+{
+  pthread_t t;
+  pthread_attr_t attr;
+  void * result = NULL;
+  struct sched_param param;
+  int maxPrio = sched_get_priority_max(SCHED_OTHER);
+  int minPrio = sched_get_priority_min(SCHED_OTHER);
+
+  assert(pthread_attr_init(&attr) == 0);
+  assert(pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED) == 0);
+
+  for (param.sched_priority = minPrio;
+       param.sched_priority <= maxPrio;
+       param.sched_priority++)
+    {
+      assert(pthread_attr_setschedparam(&attr, &param) == 0);
+      assert(pthread_create(&t, &attr, func, NULL) == 0);
+      pthread_join(t, &result);
+      assert((int) result == param.sched_priority);
+    }
+
+  return 0;
+}
diff --git a/tests/priority2.c b/tests/priority2.c
new file mode 100644
index 0000000..4dcf385
--- /dev/null
+++ b/tests/priority2.c
@@ -0,0 +1,80 @@
+/*
+ * File: priority2.c
+ *
+ * Test Synopsis:
+ * - Test thread priority setting after creation.
+ *
+ * Test Method (Validation or Falsification):
+ * - 
+ *
+ * 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"
+
+pthread_mutex_t startMx = PTHREAD_MUTEX_INITIALIZER;
+
+void * func(void * arg)
+{
+  int policy;
+  struct sched_param param;
+
+  assert(pthread_mutex_lock(&startMx) == 0);
+  assert(pthread_getschedparam(pthread_self(), &policy, &param) == 0);
+  assert(pthread_mutex_unlock(&startMx) == 0);
+  assert(policy == SCHED_OTHER);
+  return (void *) param.sched_priority;
+}
+ 
+int
+main()
+{
+  pthread_t t;
+  void * result = NULL;
+  struct sched_param param;
+  int maxPrio = sched_get_priority_max(SCHED_OTHER);
+  int minPrio = sched_get_priority_min(SCHED_OTHER);
+
+  for (param.sched_priority = minPrio;
+       param.sched_priority <= maxPrio;
+       param.sched_priority++)
+    {
+      assert(pthread_mutex_lock(&startMx) == 0);
+      assert(pthread_create(&t, NULL, func, NULL) == 0);
+      assert(pthread_setschedparam(t, SCHED_OTHER, &param) == 0);
+      assert(pthread_mutex_unlock(&startMx) == 0);
+      pthread_join(t, &result);
+      assert((int) result == param.sched_priority);
+    }
+
+  return 0;
+}