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.

1 files changed, 177 insertions, 177 deletions

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) */