diff options
| author | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-13 17:18:06 +0000 |
|---|---|---|
| committer | boris <boris@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-13 17:18:06 +0000 |
| commit | 5273b3b5bdfecfe1f0bd675899a86d71d9a53847 (patch) | |
| tree | 7a32d3cdd7d806d920286d3dfdbdff71007c52dd | |
| parent | 5d85fa3f9cc211a54bd8b90aa7ed30b754f0071b (diff) | |
| download | ATCD-5273b3b5bdfecfe1f0bd675899a86d71d9a53847.tar.gz | |
ChangeLogTag: Thu Jan 13 11:29:35 2005 Boris Kolpackov <boris@dre.vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ace/TMCast/Group.cpp | 8 | ||||
| -rw-r--r-- | ace/TMCast/LinkListener.hpp | 4 | ||||
| -rw-r--r-- | protocols/ace/TMCast/Group.cpp | 8 | ||||
| -rw-r--r-- | protocols/ace/TMCast/LinkListener.hpp | 4 |
5 files changed, 22 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 1d6512a080d..39c971e9948 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 13 11:29:35 2005 Boris Kolpackov <boris@dre.vanderbilt.edu> + + * ace/TMCast/Group.cpp: + * ace/TMCast/LinkListener.hpp: Use ACE_hthread_t instead of + ACE_thread_t to join threads. + Wed Jan 12 22:52:12 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * ace/OS_NS_stdio.h (gets): diff --git a/ace/TMCast/Group.cpp b/ace/TMCast/Group.cpp index 5412b1fde03..464533bec2f 100644 --- a/ace/TMCast/Group.cpp +++ b/ace/TMCast/Group.cpp @@ -78,9 +78,11 @@ namespace ACE_TMCast in_link_data_.subscribe (cond_); in_control_.subscribe (cond_); + ACE_thread_t unused; if (ACE_OS::thr_create (&thread_thunk, this, THR_JOINABLE, + &unused, &thread_) != 0) ::abort (); } @@ -290,7 +292,7 @@ namespace ACE_TMCast } private: - ACE_thread_t thread_; + ACE_hthread_t thread_; ACE_Thread_Mutex mutex_; ACE_Condition<ACE_Thread_Mutex> cond_; @@ -488,13 +490,13 @@ namespace ACE_TMCast { } - void + void Group::send (void const* msg, size_t size) throw (Group::InvalidArg, Group::Failed, Group::Aborted) { pimpl_->send (msg, size); } - size_t + size_t Group::recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace) { return pimpl_->recv (msg, size); diff --git a/ace/TMCast/LinkListener.hpp b/ace/TMCast/LinkListener.hpp index 5081a4a6e21..1dea811cd39 100644 --- a/ace/TMCast/LinkListener.hpp +++ b/ace/TMCast/LinkListener.hpp @@ -75,9 +75,11 @@ namespace ACE_TMCast LinkListener (ACE_SOCK_Dgram_Mcast& sock, MessageQueue& out) : sock_(sock), out_ (out) { + ACE_thread_t unused; if (ACE_OS::thr_create (&thread_thunk, this, THR_JOINABLE, + &unused, &thread_) != 0) ::abort (); } @@ -160,7 +162,7 @@ namespace ACE_TMCast private: typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; - ACE_thread_t thread_; + ACE_hthread_t thread_; ACE_SOCK_Dgram_Mcast& sock_; MessageQueue& out_; MessageQueue control_; diff --git a/protocols/ace/TMCast/Group.cpp b/protocols/ace/TMCast/Group.cpp index 5412b1fde03..464533bec2f 100644 --- a/protocols/ace/TMCast/Group.cpp +++ b/protocols/ace/TMCast/Group.cpp @@ -78,9 +78,11 @@ namespace ACE_TMCast in_link_data_.subscribe (cond_); in_control_.subscribe (cond_); + ACE_thread_t unused; if (ACE_OS::thr_create (&thread_thunk, this, THR_JOINABLE, + &unused, &thread_) != 0) ::abort (); } @@ -290,7 +292,7 @@ namespace ACE_TMCast } private: - ACE_thread_t thread_; + ACE_hthread_t thread_; ACE_Thread_Mutex mutex_; ACE_Condition<ACE_Thread_Mutex> cond_; @@ -488,13 +490,13 @@ namespace ACE_TMCast { } - void + void Group::send (void const* msg, size_t size) throw (Group::InvalidArg, Group::Failed, Group::Aborted) { pimpl_->send (msg, size); } - size_t + size_t Group::recv (void* msg, size_t size) throw (Group::Failed, Group::InsufficienSpace) { return pimpl_->recv (msg, size); diff --git a/protocols/ace/TMCast/LinkListener.hpp b/protocols/ace/TMCast/LinkListener.hpp index 5081a4a6e21..1dea811cd39 100644 --- a/protocols/ace/TMCast/LinkListener.hpp +++ b/protocols/ace/TMCast/LinkListener.hpp @@ -75,9 +75,11 @@ namespace ACE_TMCast LinkListener (ACE_SOCK_Dgram_Mcast& sock, MessageQueue& out) : sock_(sock), out_ (out) { + ACE_thread_t unused; if (ACE_OS::thr_create (&thread_thunk, this, THR_JOINABLE, + &unused, &thread_) != 0) ::abort (); } @@ -160,7 +162,7 @@ namespace ACE_TMCast private: typedef ACE_Guard<ACE_Thread_Mutex> AutoLock; - ACE_thread_t thread_; + ACE_hthread_t thread_; ACE_SOCK_Dgram_Mcast& sock_; MessageQueue& out_; MessageQueue control_; |