Mon Mar 8 11:18:59 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>

        * misc.c (CancelableWait): Ensure cancelEvent handle is the lowest
        indexed element in the handles array. Enhance test for abandoned
        objects.
        * pthread.h (PTHREAD_MUTEX_INITIALIZER): Trailing elements not
        initialised are set to zero by the compiler. This avoids the
        problem of initialising the opaque critical section element in it.
        (PTHREAD_COND_INITIALIZER): Ditto.
        * semaphore.c (_pthread_sem_timedwait): Check sem == NULL earlier.
Sun Mar  7 12:31:14 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
        * condvar.c (pthread_cond_init): set semaphore initial value
        to 0, not 1. cond_timedwait was returning signaled immediately.
        * misc.c (CancelableWait): Place the cancel event handle first
        in the handle table for WaitForMultipleObjects. This ensures that
        the cancel event is recognised and acted apon if both objects
        happen to be signaled together.
        * private.c (_pthread_cond_test_init_lock): Initialise and destroy.
        * implement.h (_pthread_cond_test_init_lock): Add extern.
        * global.c (_pthread_cond_test_init_lock): Add declaration.
        * condvar.c (pthread_cond_destroy): check for valid initialised CV;
        flag destroyed CVs as invalid.
        (pthread_cond_init): pthread_cond_t is no longer just a pointer.
        This is because PTHREAD_COND_INITIALIZER needs state info to reside
        in pthread_cond_t so that it can initialise on first use. Will work on
        making pthread_cond_t (and other objects like it) opaque again, if
        possible, later.
        (cond_timedwait): add check for statically initialisation of
        CV; initialise on first use.
        (pthread_cond_signal): check for valid CV.
        (pthread_cond_broadcast): check for valid CV.
        (_cond_check_need_init): Add.
        * pthread.h (PTHREAD_COND_INITIALIZER): Fix.
        (pthread_cond_t): no longer a pointer to pthread_cond_t_.
        (pthread_cond_t_): add 'staticinit' and 'valid' elements.
tests/ChangeLog
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.

1 files changed, 121 insertions, 106 deletions

diff --git a/tests/condvar4.c b/tests/condvar4.c
index 867746b..4c5fc38 100644
--- a/tests/condvar4.c
+++ b/tests/condvar4.c
@@ -1,106 +1,121 @@
-/*
- * File: condvar1.c
- *
- * Test Synopsis:
- * - Test PTHREAD_COND_INITIALIZER.
- *
- * Test Method (Validation or Falsification):
- * - Validation
- *
- * Requirements Tested:
- * - 
- *
- * Features Tested:
- * - 
- *
- * Cases Tested:
- * - 
- *
- * Description:
- * - Test basic CV function but starting with a static initialised
- *   CV.
- *
- * Environment:
- * - 
- *
- * Input:
- * - None.
- *
- * Output:
- * - File name, Line number, and failed expression on failure.
- * - No output on success.
- *
- * Assumptions:
- * - 
- *
- * Pass Criteria:
- * - pthread_cond_timedwait returns 0.
- * - Process returns zero exit status.
- *
- * Fail Criteria:
- * - pthread_cond_timedwait returns ETIMEDOUT.
- * - Process returns non-zero exit status.
- */
-
-#include "test.h"
-
-typedef struct cvthing_t_ cvthing_t;
-
-struct cvthing_t_ {
-  pthread_cond_t notbusy;
-  pthread_mutex_t lock;
-  int busy;
-  int count;
-};
-
-static cvthing_t cvthing = {
-  PTHREAD_MUTEX_INITIALIZER,
-  PTHREAD_COND_INITIALIZER,
-};
-
-static enum {
-  NUMTHREADS = 2
-};
-
-void *
-mythread(void * arg)
-{
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  assert(pthread_cond_signal(&cvthing.notbusy) == 0);
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  return 0;
-}
-
-int
-main()
-{
-  pthread_t t[NUMTHREADS];
-  int result[NUMTHREADS];
-  struct timespec abstime = { 0, 0 };
-  struct timeval curtime;
-
-  assert((t[0] = pthread_self()) != NULL);
-
-  assert(pthread_mutex_lock(&cvthing.lock) == 0);
-
-  gettimeofday(&curtime, NULL);
-  abstime.tv_sec = curtime.tv_sec + 5; 
-
-  assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == ETIMEDOUT);
-  
-  assert(pthread_create(&t[1], NULL, mythread, (void *) 1) == 0);
-
-  gettimeofday(&curtime, NULL);
-  abstime.tv_sec = curtime.tv_sec + 10;
-
-  assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);
-
-  assert(pthread_mutex_unlock(&cvthing.lock) == 0);
-
-  assert(pthread_cond_destroy(&cvthing) == 0);
-
-  return 0;
-}
+/*

+ * File: condvar1.c

+ *

+ * Test Synopsis:

+ * - Test PTHREAD_COND_INITIALIZER.

+ *

+ * Test Method (Validation or Falsification):

+ * - Validation

+ *

+ * Requirements Tested:

+ * - 

+ *

+ * Features Tested:

+ * - 

+ *

+ * Cases Tested:

+ * - 

+ *

+ * Description:

+ * - Test basic CV function but starting with a static initialised

+ *   CV.

+ *

+ * Environment:

+ * - 

+ *

+ * Input:

+ * - None.

+ *

+ * Output:

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

+ * - No output on success.

+ *

+ * Assumptions:

+ * - 

+ *

+ * Pass Criteria:

+ * - pthread_cond_timedwait returns 0.

+ * - Process returns zero exit status.

+ *

+ * Fail Criteria:

+ * - pthread_cond_timedwait returns ETIMEDOUT.

+ * - Process returns non-zero exit status.

+ */

+

+#include "test.h"

+#include <sys/timeb.h>

+

+typedef struct cvthing_t_ cvthing_t;

+

+struct cvthing_t_ {

+  pthread_cond_t notbusy;

+  pthread_mutex_t lock;

+};

+

+static cvthing_t cvthing = {

+  PTHREAD_MUTEX_INITIALIZER,

+  PTHREAD_COND_INITIALIZER,

+};

+

+enum {

+  NUMTHREADS = 2

+};

+

+void *

+mythread(void * arg)

+{

+  assert(pthread_mutex_lock(&cvthing.lock) == 0);

+

+  assert(pthread_cond_signal(&cvthing.notbusy) == 0);

+

+  assert(pthread_mutex_unlock(&cvthing.lock) == 0);

+

+  return 0;

+}

+

+int

+main()

+{

+  pthread_t t[NUMTHREADS];

+  struct timespec abstime = { 0, 0 };

+#if defined(__MINGW32__)

+  struct timeb currSysTime;

+#else

+  struct _timeb currSysTime;

+#endif

+  const DWORD NANOSEC_PER_MILLISEC = 1000000;

+

+  assert(cvthing.notbusy.staticinit == 1);

+  assert(cvthing.notbusy.valid == 1);

+

+  assert((t[0] = pthread_self()) != NULL);

+

+  assert(pthread_mutex_lock(&cvthing.lock) == 0);

+

+  /* get current system time */

+  _ftime(&currSysTime);

+

+  abstime.tv_sec = currSysTime.time;

+  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;

+

+  abstime.tv_sec += 5;

+

+  assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == ETIMEDOUT);

+  

+  assert(pthread_create(&t[1], NULL, mythread, (void *) 1) == 0);

+

+  _ftime(&currSysTime);

+

+  abstime.tv_sec = currSysTime.time;

+  abstime.tv_nsec = NANOSEC_PER_MILLISEC * currSysTime.millitm;

+

+  abstime.tv_sec += 5;

+

+  assert(pthread_cond_timedwait(&cvthing.notbusy, &cvthing.lock, &abstime) == 0);

+

+  assert(pthread_mutex_unlock(&cvthing.lock) == 0);

+

+  assert(pthread_cond_destroy(&cvthing.notbusy) == 0);

+

+  return 0;

+}