X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=c%2Fpthread_extra%2Fpthread_user_data.c;h=26204a870aa03c55d1d7499266ccc827f10cc4df;hb=7e0f3dba1713edfea98cdfe7909c08f68fa5f7b7;hp=b86c4a3291a300247e7bd70046eb6d22682fa9f5;hpb=883427014d5349442395c1059af5a1abade951ad;p=mirrors%2FPrograms.git

diff --git a/c/pthread_extra/pthread_user_data.c b/c/pthread_extra/pthread_user_data.c
index b86c4a3..26204a8 100644
--- a/c/pthread_extra/pthread_user_data.c
+++ b/c/pthread_extra/pthread_user_data.c
@@ -1,5 +1,6 @@
 #define __PTHREAD_EXTRA_INTERNAL
 
+#include <assert.h>
 #include <pthread.h>
 #include <pthread_extra.h>
 
@@ -17,8 +18,9 @@ pthread_user_data_internal_t* pthread_user_data_internal(pthread_t thread) {
 	pthread_t i;
 	for(i = 0; i<PTHREAD_XTHREADS_MAX; i++) {
 		if(pthread_equal(pthread_user_data[i].tid, PTHREAD_XNULL)) {
-			pthread_user_data[i].tid = thread;
+			//FIXME: Should be locking for addition to the array!!!!
 			pthread_user_data[i+1].tid = PTHREAD_XNULL;
+			pthread_user_data[i].tid = thread;
 			break;
 		}
 		if(pthread_equal(pthread_user_data[i].tid, thread)) break;
@@ -41,3 +43,17 @@ void pthread_user_data_set(pthread_t thread, void *usr) {
 void* pthread_user_data_get(pthread_t thread) {
 	return *(pthread_user_data_ptr(thread));
 }
+
+//Remove canceled thread from user data registry
+int pthread_user_data_remove(pthread_t thread) {
+	//FIXME: not implemented yet!
+	(void) thread;
+	return 0;
+}
+
+//User data cleanup handler to be registered with pthread_cleanup_push()
+void pthread_user_data_cleanup( void * arg ) {
+	pthread_t t = (pthread_t)arg;
+	assert(pthread_equal(t, pthread_self()) && "Pthread_self() is not working in cleanup context!");
+	pthread_user_data_remove(t);
+}