summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-21 20:03:51 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-21 20:03:51 +0000
commit2aea34ae91d60717f2f6a307082603f07fb0085f (patch)
tree5446a4c7354ee5bff74d4d73ad35683dccb6ed21
parentce3c840861a4f88cffbfbdaa0075c25c066f2dea (diff)
downloadATCD-2aea34ae91d60717f2f6a307082603f07fb0085f.tar.gz
Allow passing back the thread exit status of the thread being joined
-rw-r--r--ace/Thread_Manager.cpp4
-rw-r--r--ace/Thread_Manager.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp
index 0631a4fcd94..e270f864d21 100644
--- a/ace/Thread_Manager.cpp
+++ b/ace/Thread_Manager.cpp
@@ -1416,7 +1416,7 @@ ACE_Thread_Manager::cancel_all (int async_cancel)
}
int
-ACE_Thread_Manager::join (ACE_thread_t tid)
+ACE_Thread_Manager::join (ACE_thread_t tid, void **status)
{
ACE_TRACE ("ACE_Thread_Manager::join");
@@ -1467,7 +1467,7 @@ ACE_Thread_Manager::join (ACE_thread_t tid)
// Didn't find the thread we want or the thread is not joinable.
}
- if (ACE_Thread::join (tdb.thr_handle_) == -1)
+ if (ACE_Thread::join (tdb.thr_handle_, status) == -1)
return -1;
# if defined (ACE_HAS_DCE_DRAFT4_THREADS) && defined (ACE_LACKS_SETDETACH)
diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h
index 0c860771a24..fd90982e6c4 100644
--- a/ace/Thread_Manager.h
+++ b/ace/Thread_Manager.h
@@ -476,7 +476,7 @@ public:
// check thru its thread list for threads with THR_DETACHED or
// THR_DAEMON flags set and remove these threads.
- int join (ACE_thread_t tid);
+ int join (ACE_thread_t tid, void **status = 0);
// Join a thread specified by <tid>.
int wait_grp (int grp_id);