Thu Mar 11 09:01:48 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au>

        * pthread.h (pthread_mutex_t): revert to (pthread_mutex_t *);
        define a value to serve as PTHREAD_MUTEX_INITIALIZER.
        (pthread_mutex_t_): remove staticinit and valid elements.
        (pthread_cond_t): revert to (pthread_cond_t_ *);
        define a value to serve as PTHREAD_COND_INITIALIZER.
        (pthread_cond_t_): remove staticinit and valid elements.
        * mutex.c (pthread_mutex_t args): adjust indirection of references.
        (all functions): check for PTHREAD_MUTEX_INITIALIZER value;
        check for NULL (invalid).
        * condvar.c (pthread_cond_t args): adjust indirection of references.
        (all functions): check for PTHREAD_COND_INITIALIZER value;
        check for NULL (invalid).
Wed Mar 10 17:18:12 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
        * misc.c (CancelableWait): Undo changes from Mar 8 and 7.
tests/ChangeLog
Fri Mar 12 08:34:15 1999  Ross Johnson  <rpj@ixobrychus.canberra.edu.au>
        * eyal1.c (main): Fix trylock loop; was not waiting for thread to lock
        the "started" mutex.

1 files changed, 118 insertions, 121 deletions

diff --git a/tests/condvar4.c b/tests/condvar4.c
index 4c5fc38..f93db27 100644
--- a/tests/condvar4.c
+++ b/tests/condvar4.c
@@ -1,121 +1,118 @@
-/*

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

-}

+/*
+ * 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((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;
+}