projects
/
c11tester.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
809d0f8
)
remove print statements
author
root
<root@dw-6.eecs.uci.edu>
Sat, 27 Jul 2019 07:35:24 +0000
(
00:35
-0700)
committer
root
<root@dw-6.eecs.uci.edu>
Sat, 27 Jul 2019 07:35:24 +0000
(
00:35
-0700)
threads.cc
patch
|
blob
|
history
diff --git
a/threads.cc
b/threads.cc
index c668b288c21fa9d647c008a7931e1e7287a3748e..d17ddabc5535c3d9112fe748522b11f7624b097c 100644
(file)
--- a/
threads.cc
+++ b/
threads.cc
@@
-160,7
+160,6
@@
int real_pthread_join (pthread_t __th, void ** __thread_return) {
void finalize_helper_thread() {
Thread * curr_thread = thread_current();
void finalize_helper_thread() {
Thread * curr_thread = thread_current();
- model_print("finalize_helper_thread\n");
real_pthread_mutex_lock(&curr_thread->mutex);
curr_thread->tls = (char *) get_tls_addr();
real_pthread_mutex_unlock(&curr_thread->mutex);
real_pthread_mutex_lock(&curr_thread->mutex);
curr_thread->tls = (char *) get_tls_addr();
real_pthread_mutex_unlock(&curr_thread->mutex);
@@
-173,7
+172,6
@@
void finalize_helper_thread() {
void * helper_thread(void * ptr) {
Thread * curr_thread = thread_current();
void * helper_thread(void * ptr) {
Thread * curr_thread = thread_current();
- model_print("helper_thread\n");
//build a context for this real thread so we can take it's context
int ret = getcontext(&curr_thread->helpercontext);
//build a context for this real thread so we can take it's context
int ret = getcontext(&curr_thread->helpercontext);
@@
-200,7
+198,6
@@
void * helper_thread(void * ptr) {
void setup_context() {
Thread * curr_thread = thread_current();
void setup_context() {
Thread * curr_thread = thread_current();
- model_print("setup_context\n");
/* Add dummy "start" action, just to create a first clock vector */
model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
/* Add dummy "start" action, just to create a first clock vector */
model->switch_to_master(new ModelAction(THREAD_START, std::memory_order_seq_cst, curr_thread));
@@
-212,7
+209,6
@@
void setup_context() {
/* Create the real thread */
real_pthread_create(&curr_thread->thread, NULL, helper_thread, NULL);
/* Create the real thread */
real_pthread_create(&curr_thread->thread, NULL, helper_thread, NULL);
- model_print("thread_created\n");
bool notdone = true;
while(notdone) {
real_pthread_mutex_lock(&curr_thread->mutex);
bool notdone = true;
while(notdone) {
real_pthread_mutex_lock(&curr_thread->mutex);
@@
-222,7
+218,6
@@
void setup_context() {
}
set_tls_addr((uintptr_t)curr_thread->tls);
}
set_tls_addr((uintptr_t)curr_thread->tls);
- model_print("tls taken\n");
setcontext(&curr_thread->context);
}
#endif
setcontext(&curr_thread->context);
}
#endif