Changeset 19057

Timestamp:

Aug 13, 2008, 5:22:13 PM (18 years ago)

Author:

Paul Price

Message:

Renamed psThreadTaskDelete to psThreadTaskRemove to maintain consistency with psHash, psMetadata, etc. I'm working on getting some support for thread-specific data. I had a scheme, but it doesn't work (I assumed that a pthread_t was an integer); need to rethink. In the meantime, it's #if-ed out.

Location:

trunk/psLib/src

Files:

• imageops/psImageConvolve.c (modified) (2 diffs)
• sys/psThread.c (modified) (3 diffs)
• sys/psThread.h (modified) (4 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2008-08-12 03:08:41 $
+/// @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2008-08-14 03:22:13 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -1071 +1071 @@
         }
     } else if (!set && threaded) {
-        psThreadTaskDelete("PSLIB_IMAGE_CONVOLVE_MASK");
+        psThreadTaskRemove("PSLIB_IMAGE_CONVOLVE_MASK");
     }
 

trunk/psLib/src/sys/psThread.c

@@ -26 +26 @@
 static psArray *pool = NULL;            // array of defined threads
 static psHash *tasks = NULL;            // List of defined tasks
+static psArray *tsd = NULL;             // Thread-specific data
 
 
@@ -165 +166 @@
 }
 
-bool psThreadTaskDelete(const char *type)
+bool psThreadTaskRemove(const char *type)
 {
     PS_ASSERT_STRING_NON_EMPTY(type, false);
@@ -316 +317 @@
     tasks = NULL;
 
+    psFree(tsd);
+    tsd = NULL;
+
     return true;
 }
 
+
+#if 0
+// This doesn't work like I thought it would: pthread_self can return anything.
+bool psThreadDataAdd(const char *name, psPtr ptr)
+{
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+    PS_ASSERT_PTR_NON_NULL(ptr, false);
+
+    pthread_key_t *key = psAlloc(sizeof(pthread_key_t)); // Key for data
+    pthread_key_create(key, psFree);
+
+    if (!tsd) {
+        tsd = psArrayAlloc(numThreads);
+    }
+
+    psHashAdd(
+
+    pthread_t tid = pthread_self();     // Thread identifier
+    int numThreads = psThreadPoolSize();// Number of threads
+    psAssert(tid < numThreads, "Thread identifier (%d) exceeds number of threads (%d)", (int)tid, numThreads);
+
+    if (!tsd) {
+        tsd = psArrayAlloc(numThreads);
+    }
+
+    psHash *hash = tsd->data[tid];      // Thread-specific hash of data
+    return psHashAdd(hash, name, ptr);
+}
+
+void *psThreadDataLookup(const char *name)
+{
+    PS_ASSERT_STRING_NON_EMPTY(name, NULL);
+
+    if (!tsd) {
+        return NULL;
+    }
+
+    pthread_t tid = pthread_self();     // Thread identifier
+    int numThreads = psThreadPoolSize();// Number of threads
+    psAssert(tid < numThreads, "Thread identifier (%d) exceeds number of threads (%d)", (int)tid, numThreads);
+
+    psHash *hash = tsd->data[tid];      // Thread-specific hash of data
+    return psHashLookup(hash, name);
+}
+
+bool psThreadDataRemove(const char *name)
+{
+    PS_ASSERT_STRING_NON_EMPTY(name, false);
+
+    if (!tsd) {
+        return false;
+    }
+
+    pthread_t tid = pthread_self();     // Thread identifier
+    int numThreads = psThreadPoolSize();// Number of threads
+    psAssert(tid < numThreads, "Thread identifier (%d) exceeds number of threads (%d)", (int)tid, numThreads);
+
+    psHash *hash = tsd->data[tid];      // Thread-specific hash of data
+    return psHashRemove(hash, name);
+}
+#endif

trunk/psLib/src/sys/psThread.h

@@ -4 +4 @@
  *
  *  @author EAM, IFA
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-08-12 03:28:37 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-08-14 03:22:13 $
  *
  *  Copyright 2004-2005 Insitute for Astronomy, University of Hawaii
@@ -12 +12 @@
 #ifndef PS_THREAD_H
 #define PS_THREAD_H
+
+#include <pthread.h>
+#include "psString.h"
+#include "psArray.h"
 
 /// @addtogroup SysUtils System Utilities
@@ -87 +91 @@
 
 /// Remove a task from the list
-bool psThreadTaskDelete(const char *type // Task type to remove
+bool psThreadTaskRemove(const char *type // Task type to remove
     );
 
@@ -111 +115 @@
 bool psThreadPoolFinalize(void);
 
+
+/// Add thread-specific data
+///
+/// The provided pointer is added to a thread-specific hash under the provided name.
+bool psThreadDataAdd(const char *name,  // Name of data
+                     psPtr ptr          // Data to add
+    );
+
+/// Lookup thread-specific data
+///
+/// The thread-specific hash is interrogated using the provided name.
+void *psThreadDataLookup(const char *name // Name of data
+    );
+
+/// Remove thread-specific data
+///
+/// The thread-specific hash has the data associated with the provided name deleted.
+bool psThreadDataRemove(const char *name // Name of data
+    );
+
+
 /// @}
 #endif /* PS_THREAD_H */