X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=threads.cc;h=bd1b624959629d3613e76afda0b72a58e795d122;hb=HEAD;hp=aef263ec4624418c2fc050cd3a998e8ad80bd878;hpb=563d0da13f38cf55a88673c2a712b797d4938df1;p=c11tester.git

diff --git a/threads.cc b/threads.cc
index aef263ec..bd1b6249 100644
--- a/threads.cc
+++ b/threads.cc
@@ -16,8 +16,9 @@
 #include "schedule.h"
 #include "clockvector.h"
 
-#ifdef TLS
 #include <dlfcn.h>
+
+#ifdef TLS
 uintptr_t get_tls_addr() {
 	uintptr_t addr;
 	asm ("mov %%fs:0, %0" : "=r" (addr));
@@ -60,6 +61,19 @@ Thread * thread_current(void)
 	return model->get_current_thread();
 }
 
+/**
+ * @brief Get the current Thread id
+ *
+ * Must be called from a user context
+ *
+ * @return The id of the currently executing thread
+ */
+thread_id_t thread_current_id(void)
+{
+	ASSERT(model);
+	return model->get_current_thread_id();
+}
+
 void modelexit() {
 	model->switch_thread(new ModelAction(THREAD_FINISH, std::memory_order_seq_cst, thread_current()));
 }
@@ -97,6 +111,13 @@ void thread_startup()
 #endif
 }
 
+
+static int (*real_epoll_wait_p)(int epfd, struct epoll_event *events, int maxevents, int timeout) = NULL;
+
+int real_epoll_wait(int epfd, struct epoll_event *events, int maxevents, int timeout) {
+	return real_epoll_wait_p(epfd, events, maxevents, timeout);
+}
+
 static int (*pthread_mutex_init_p)(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) = NULL;
 
 int real_pthread_mutex_init(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr) {
@@ -135,6 +156,13 @@ void real_pthread_exit (void * value_ptr) {
 
 void real_init_all() {
 	char * error;
+	if (!real_epoll_wait_p) {
+		real_epoll_wait_p = (int (*)(int epfd, struct epoll_event *events, int maxevents, int timeout))dlsym(RTLD_NEXT, "epoll_wait");
+		if ((error = dlerror()) != NULL) {
+			fputs(error, stderr);
+			exit(EXIT_FAILURE);
+		}
+	}
 	if (!pthread_mutex_init_p) {
 		pthread_mutex_init_p = (int (*)(pthread_mutex_t *__mutex, const pthread_mutexattr_t *__mutexattr))dlsym(RTLD_NEXT, "pthread_mutex_init");
 		if ((error = dlerror()) != NULL) {
@@ -391,6 +419,8 @@ Thread::Thread(thread_id_t tid) :
 	last_action_val(0),
 	model_thread(true)
 {
+	// real_memset is not defined when
+	// the model thread is constructed
 	memset(&context, 0, sizeof(context));
 }
 
@@ -495,13 +525,15 @@ Thread * Thread::waiting_on() const
 	if (!pending)
 		return NULL;
 
-	if (pending->get_type() == THREAD_JOIN)
-		return pending->get_thread_operand();
-	else if (pending->get_type() == PTHREAD_JOIN)
-		return pending->get_thread_operand();
-	else if (pending->is_lock())
-		return (Thread *)pending->get_mutex()->get_state()->locked;
-	return NULL;
+	switch (pending->get_type()) {
+		case THREAD_JOIN:
+		case PTHREAD_JOIN:
+			return pending->get_thread_operand();
+		case ATOMIC_LOCK:
+			return (Thread *)pending->get_mutex()->get_state()->locked;
+		default:
+			return NULL;
+	}
 }
 
 /**