X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=threads-model.h;h=e2084abf5008e071bb4cd09e55b3d95a71b3a326;hp=5fc6d675aba6a9f05b132ded2ad2aed0ad6250d5;hb=8caa7a3bd239c0141876f4f5a47d3910f1747e3c;hpb=2b004336a919f74a5ca8f6d87ad5414360a949c7

diff --git a/threads-model.h b/threads-model.h
index 5fc6d675..e2084abf 100644
--- a/threads-model.h
+++ b/threads-model.h
@@ -6,12 +6,13 @@
 #define __THREADS_MODEL_H__
 
 #include <stdint.h>
-
 #include "mymemory.h"
-#include <threads.h>
+#include "threads.h"
 #include "modeltypes.h"
 #include "stl-model.h"
 #include "context.h"
+#include "classlist.h"
+#include "pthread.h"
 
 struct thread_params {
 	thrd_start_t func;
@@ -35,13 +36,14 @@ typedef enum thread_state {
 	THREAD_COMPLETED
 } thread_state;
 
-class ModelAction;
 
 /** @brief A Thread is created for each user-space thread */
 class Thread {
 public:
 	Thread(thread_id_t tid);
-	Thread(thrd_t *t, void (*func)(void *), void *a, Thread *parent);
+	Thread(thread_id_t tid, thrd_t *t, void (*func)(void *), void *a, Thread *parent);
+	Thread(thread_id_t tid, thrd_t *t, void *(*func)(void *), void *a, Thread *parent);
+
 	~Thread();
 	void complete();
 
@@ -72,6 +74,10 @@ public:
 	 */
 	uint64_t get_return_value() const { return last_action_val; }
 
+	/** @set and get the return value from pthread functions */
+	void set_pthread_return(void *ret) { pthread_return = ret; }
+	void * get_pthread_return() { return pthread_return; }
+
 	/** @return True if this thread is finished executing */
 	bool is_complete() const { return state == THREAD_COMPLETED; }
 
@@ -93,6 +99,11 @@ public:
 	bool is_model_thread() const { return model_thread; }
 
 	friend void thread_startup();
+#ifdef TLS
+	friend void setup_context();
+	friend void * helper_thread(void *);
+	friend void finalize_helper_thread();
+#endif
 
 	/**
 	 * Intentionally NOT allocated with MODELALLOC or SNAPSHOTALLOC.
@@ -112,6 +123,9 @@ public:
 	void operator delete[](void *p, size_t size) {
 		Thread_free(p);
 	}
+#ifdef TLS
+	void setTLS(char *_tls) { tls = _tls;}
+#endif
 private:
 	int create_context();
 
@@ -131,9 +145,20 @@ private:
 	ModelAction *pending;
 
 	void (*start_routine)(void *);
+	void *(*pstart_routine)(void *);
+
 	void *arg;
 	ucontext_t context;
 	void *stack;
+#ifdef TLS
+public:
+	char *tls;
+	ucontext_t helpercontext;
+	pthread_mutex_t mutex;
+	pthread_mutex_t mutex2;
+	pthread_t thread;
+private:
+#endif
 	thrd_t *user_thread;
 	thread_id_t id;
 	thread_state state;
@@ -145,11 +170,20 @@ private:
 	 */
 	uint64_t last_action_val;
 
+	/** the value return from pthread functions */
+	void * pthread_return;
+
 	/** @brief Is this Thread a special model-checker thread? */
 	const bool model_thread;
 };
 
+#ifdef TLS
+uintptr_t get_tls_addr();
+#endif
+
 Thread * thread_current();
+void thread_startup();
+void main_thread_startup();
 
 static inline thread_id_t thrd_to_id(thrd_t t)
 {
@@ -176,4 +210,12 @@ static inline int id_to_int(thread_id_t id)
 	return id;
 }
 
-#endif /* __THREADS_MODEL_H__ */
+int real_pthread_mutex_init(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr);
+int real_pthread_mutex_lock (pthread_mutex_t *__mutex);
+int real_pthread_mutex_unlock (pthread_mutex_t *__mutex);
+int real_pthread_create (pthread_t *__restrict __newthread, const pthread_attr_t *__restrict __attr, void *(*__start_routine)(void *), void *__restrict __arg);
+int real_pthread_join (pthread_t __th, void ** __thread_return);
+void real_pthread_exit (void * value_ptr) __attribute__((noreturn));
+void real_init_all();
+
+#endif	/* __THREADS_MODEL_H__ */