Changeset 28402

Timestamp:

Jun 18, 2010, 10:48:42 AM (16 years ago)

Author:

Paul Price

Message:

Pulling pthread out of psThread type because it's unnecessary (never used) and subject to a (write) race condition.

Location:

trunk/psLib/src/sys

Files:

• psThread.c (modified) (4 diffs)
• psThread.h (modified) (1 diff)

trunk/psLib/src/sys/psThread.c

@@ -38 +38 @@
 static psList *pending = NULL;          // queue of pending jobs
 static psList *done = NULL;             // queue of done jobs
+static pthread_t *threads = NULL;       // array of the POSIX thread handles
 static psArray *pool = NULL;            // array of defined threads
 static psHash *tasks = NULL;            // List of defined tasks
 static psArray *tsd = NULL;             // Thread-specific data
-
 
 /***** basic thread functions *****/
@@ -265 +265 @@
 bool psThreadPoolInit(int nThreads)
 {
-    if (pool) {
+    if (pool || threads) {
         psAbort("psThreadsInit already called");
     }
@@ -276 +276 @@
 
     pool = psArrayAlloc(nThreads);
+    threads = psAlloc(nThreads * sizeof(pthread_t));
     for (int i = 0; i < nThreads; i++) {
-        psThread *thread = psThreadAlloc(); // Thread for pool
-        int success = pthread_create(&thread->pt, NULL, psThreadLauncher, thread);
-        psAssert(!success, "Unable to start thread");
-        pool->data[i] = thread;
+        psThread *thread = pool->data[i] = psThreadAlloc(); // Thread for pool
+        if (!pthread_create(&threads[i], NULL, psThreadLauncher, thread)) {
+            psAbort("Unable to create thread");
+        }
     }
     return true;
@@ -376 +377 @@
     pool = NULL;
 
+    psFree(threads);
+    threads = NULL;
+
     psFree(tasks);
     tasks = NULL;

trunk/psLib/src/sys/psThread.h

@@ -41 +41 @@
     bool busy;                          // Is the thread busy?
     bool fault;                         // Has the thread faulted?
-    pthread_t pt;                       // The thread itself
 } psThread;