X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=threads-model.h;h=a99f6619350fdcd21a6f1b0c7899002f7e843e32;hb=HEAD;hp=057ad9d99a6f7fcc8377a0d7129bf99076a0851c;hpb=6f00cf7293dd0b42cad96855604287f6814f36d8;p=c11tester.git

diff --git a/threads-model.h b/threads-model.h
index 057ad9d9..a99f6619 100644
--- a/threads-model.h
+++ b/threads-model.h
@@ -6,7 +6,6 @@
 #define __THREADS_MODEL_H__
 
 #include <stdint.h>
-
 #include "mymemory.h"
 #include "threads.h"
 #include "modeltypes.h"
@@ -14,6 +13,7 @@
 #include "context.h"
 #include "classlist.h"
 #include "pthread.h"
+#include <sys/epoll.h>
 
 struct thread_params {
 	thrd_start_t func;
@@ -34,7 +34,8 @@ typedef enum thread_state {
 	 */
 	THREAD_BLOCKED,
 	/** Thread has completed its execution */
-	THREAD_COMPLETED
+	THREAD_COMPLETED,
+	THREAD_FREED
 } thread_state;
 
 
@@ -47,9 +48,11 @@ public:
 
 	~Thread();
 	void complete();
+	void freeResources();
 
 	static int swap(ucontext_t *ctxt, Thread *t);
 	static int swap(Thread *t, ucontext_t *ctxt);
+	static int swap(Thread *t, Thread *t2);
 
 	thread_state get_state() const { return state; }
 	void set_state(thread_state s);
@@ -80,7 +83,10 @@ public:
 	void * get_pthread_return() { return pthread_return; }
 
 	/** @return True if this thread is finished executing */
-	bool is_complete() const { return state == THREAD_COMPLETED; }
+	bool is_complete() const { return state == THREAD_COMPLETED || state == THREAD_FREED; }
+
+	/** @return True if this thread has finished and its resources have been freed */
+	bool is_freed() const { return state == THREAD_FREED; }
 
 	/** @return True if this thread is blocked */
 	bool is_blocked() const { return state == THREAD_BLOCKED; }
@@ -94,11 +100,17 @@ public:
 	 *  @see Thread::pending */
 	void set_pending(ModelAction *act) { pending = act; }
 
+	bool just_woken_up() { return wakeup_state; }
+	void set_wakeup_state(bool state) { wakeup_state = state; }
+
 	Thread * waiting_on() const;
 	bool is_waiting_on(const Thread *t) const;
 
 	bool is_model_thread() const { return model_thread; }
 
+	void * get_stack_addr() { return stack; }
+	ClockVector * get_acq_fence_cv() { return acq_fence_cv; }
+
 	friend void thread_startup();
 #ifdef TLS
 	friend void setup_context();
@@ -133,6 +145,9 @@ private:
 	/** @brief The parent Thread which created this Thread */
 	Thread * const parent;
 
+	/** @brief Acquire fence cv */
+	ClockVector *acq_fence_cv;
+
 	/** @brief The THREAD_CREATE ModelAction which created this Thread */
 	ModelAction *creation;
 
@@ -145,13 +160,18 @@ private:
 	 */
 	ModelAction *pending;
 
+	/** @brief True if this thread was just woken up */
+	bool wakeup_state;
+
 	void (*start_routine)(void *);
 	void *(*pstart_routine)(void *);
 
 	void *arg;
 	ucontext_t context;
 	void *stack;
+	uint32_t stack_size;
 #ifdef TLS
+	void * helper_stack;
 public:
 	char *tls;
 	ucontext_t helpercontext;
@@ -180,11 +200,13 @@ private:
 
 #ifdef TLS
 uintptr_t get_tls_addr();
+void tlsdestructor(void *v);
 #endif
 
 Thread * thread_current();
+thread_id_t thread_current_id();
 void thread_startup();
-void main_thread_startup();
+void initMainThread();
 
 static inline thread_id_t thrd_to_id(thrd_t t)
 {
@@ -211,4 +233,13 @@ static inline int id_to_int(thread_id_t id)
 	return id;
 }
 
+int real_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout);
+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__ */