X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=c%2Fpthread_extra%2Fpthread_extra.h;h=efba75e6e46427175e3d9cba51dcede073961e79;hb=238a70320639c49bc44c74588fd94cd435dfa4c3;hp=bd1baad3b8e1270495b616ccd1b458fe568fd761;hpb=a8e71e8fffa0159f06b2c469fb2d3dfd8222b306;p=mirrors%2FPrograms.git

diff --git a/c/pthread_extra/pthread_extra.h b/c/pthread_extra/pthread_extra.h
index bd1baad..efba75e 100644
--- a/c/pthread_extra/pthread_extra.h
+++ b/c/pthread_extra/pthread_extra.h
@@ -2,34 +2,65 @@
 #define __PTHREAD_EXTRA_H__
 
 #include <pthread.h>
-#include <time.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <signal.h>
+//#include <time.h>
 
 #define PTHREAD_XTIME_NOBLOCK (&(struct timespec){ .tv_sec = 0, .tv_nsec = 0 })
 #define PTHREAD_XTIME_FOREVER NULL
 
-//Pausing
+// User data
 
+#define PTHREAD_XTHREADS_MAX 65535
+#define PTHREAD_XNULL ((pthread_t)NULL)
+
+#ifdef __PTHREAD_EXTRA_INTERNAL
+typedef struct pthread_user_data_internal_t {
+	pthread_t tid; //Thread ID
+	void *usr; //User pointer
+	//Internaly used members:
+	sig_atomic_t running; //pthread_pause
+} pthread_user_data_internal_t;
+
+pthread_user_data_internal_t* pthread_user_data_internal(pthread_t thread);
+#endif //__PTHREAD_EXTRA_INTERNAL
+
+void** pthread_user_data_ptr(pthread_t thread);
+void*  pthread_user_data_get(pthread_t thread);
+void   pthread_user_data_set(pthread_t thread, void *usr);
+void   pthread_user_data_cleanup(void * arg);
+
+// Pausing
+
+//GDB: handle SIG34 nostop noprint
 #define PTHREAD_XSIG_STOP (SIGRTMIN+0)
 #define PTHREAD_XSIG_CONT (SIGRTMIN+1)
 #define PTHREAD_XSIGRTMIN (SIGRTMIN+2) //First unused RT signal
 
-#define pthread_pause(t)   (pthread_kill((t), PTHREAD_XSIG_STOP));
-#define pthread_unpause(t) (pthread_kill((t), PTHREAD_XSIG_CONT));
-
+int pthread_extra_create(pthread_t *restrict thread,
+                          const pthread_attr_t *restrict attr,
+                          void *(*start_routine)(void *),
+                          void *restrict arg);
 void pthread_unpause_handler();
 void pthread_pause_handler();
 void pthread_pause_enable();
+void pthread_pause_disable();
+int pthread_pause(pthread_t thread);
+int pthread_unpause(pthread_t thread);
+int pthread_pause_reschedule(pthread_t thread);
+int pthread_extra_yield();
 
 // Message queues
 
-#define PTHREAD_XMQ_FRONT true
-#define PTHREAD_XMQ_BACK false
-
-#define PTHREAD_XMQ_RECV false
-#define PTHREAD_XMQ_PEEK true
+//Flags
+typedef uint8_t pthread_mq_flags_t;
+#define PTHREAD_XMQ_NONE	0			///< No flags specified (default behaviour)
+#define PTHREAD_XMQ_FRONT	1			///< Send to front of the queue (scheduled for next receive)
+#define PTHREAD_XMQ_BACK	PTHREAD_XMQ_NONE	///< Send to back of the queue (default)
+#define PTHREAD_XMQ_PEEK	2			///< Only peek, do not remove received item
+#define PTHREAD_XMQ_RECV	PTHREAD_XMQ_NONE	///< Remove received item from queue (default)
+#define PTHREAD_XMQ_OVERW	4			///< Overwrite item if queue full
 
 typedef struct pthread_mq_t {
 	pthread_mutex_t lock;
@@ -45,10 +76,13 @@ typedef struct pthread_mq_t {
 
 bool pthread_mq_init(pthread_mq_t *mq, size_t msg_size, size_t msg_count_max);
 void pthread_mq_free(pthread_mq_t *mq);
-size_t pthread_mq_waiting(pthread_mq_t *mq);
+
 bool pthread_mq_reset(pthread_mq_t *mq);
-bool pthread_mq_send_generic(pthread_mq_t *mq, void * data, bool to_front, const struct timespec *restrict abs_timeout);
-bool pthread_mq_receive_generic(pthread_mq_t *mq, void * data, bool peek, const struct timespec *restrict abs_timeout);
+bool pthread_mq_send_generic(pthread_mq_t *mq, void * data, pthread_mq_flags_t flags, const struct timespec *restrict abs_timeout);
+bool pthread_mq_receive_generic(pthread_mq_t *mq, void * data, pthread_mq_flags_t flags, const struct timespec *restrict abs_timeout);
+
+size_t pthread_mq_waiting(pthread_mq_t *mq);
+size_t pthread_mq_vacant(pthread_mq_t *mq);
 
 // Multi mutex locking