diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-24 04:27:51 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 1997-10-24 04:27:51 +0000 |
| commit | 8a79a4c1f441114dca596bc58d070b12092b2b8e (patch) | |
| tree | 7b1a62bc71bc4bef68ec5e1e626c0d9f999c0d6f | |
| parent | ac9b91e19097347ebaa9e7dd58057249b9416e98 (diff) | |
| download | ATCD-8a79a4c1f441114dca596bc58d070b12092b2b8e.tar.gz | |
*** empty log message ***
| -rw-r--r-- | ChangeLog-97b | 18 | ||||
| -rw-r--r-- | TAO/tests/Makefile | 4 | ||||
| -rw-r--r-- | ace/Thread_Manager.cpp | 28 |
3 files changed, 25 insertions, 25 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 6b1fc4c4e5a..919c6ea289c 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,12 +1,3 @@ -Thu Oct 23 23:19:24 1997 James C Hu <jxh@lambada.cs.wustl.edu> - - * ace/Filecache.cpp: Removed template method specialization of - shared_find. No longer needed since Hash_Map_Manager has been - changed to no longer rely on sentinel_. - - * ace/Thread_Manager.cpp (various): - Hacked 'til it compiled. (Chased down syntax errors.) - Thu Oct 23 19:05:08 1997 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> * ace/Thread_Manager.cpp (find_hthread): Replaced the call @@ -62,6 +53,15 @@ Thu Oct 23 19:05:08 1997 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> for ACE_TSS_Singleton, it should be ACE_TSS_Singleton::instance_i(). I've fixed this. +Thu Oct 23 23:19:24 1997 James C Hu <jxh@lambada.cs.wustl.edu> + + * ace/Filecache.cpp: Removed template method specialization of + shared_find. No longer needed since Hash_Map_Manager has been + changed to no longer rely on sentinel_. + + * ace/Thread_Manager.cpp (various): + Hacked 'til it compiled. (Chased down syntax errors.) + Thu Oct 23 22:52:17 1997 Sergio Flores <sergio@polka.cs.wustl.edu> * ace/Timer_Queue_Adapters.cpp (svc): Added some POSIX thread diff --git a/TAO/tests/Makefile b/TAO/tests/Makefile index 63edfbe0ede..fa493a9b5f8 100644 --- a/TAO/tests/Makefile +++ b/TAO/tests/Makefile @@ -9,10 +9,10 @@ #---------------------------------------------------------------------------- DIRS = Cubit \ + IDL_Cubit \ + MT-Cubit \ Thruput_test -# MT-Cubit - #---------------------------------------------------------------------------- # Include macros and targets #---------------------------------------------------------------------------- diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 261edd26835..f2aa83d53f5 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -960,10 +960,10 @@ ACE_Thread_Manager::apply_grp (int grp_id, ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); int result = 0; - ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> - iter (this->thr_list_); - for (; ! iter.done (); iter.advance ()) + for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_); + !iter.done (); + iter.advance ()) if (iter.next ()->grp_id_ == grp_id && (this->*func) (iter.next (), arg) == -1) result = -1; @@ -1016,10 +1016,10 @@ ACE_Thread_Manager::apply_all (ACE_THR_MEMBER_FUNC func, int arg) ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex, ace_mon, this->lock_, -1)); int result = 0; - ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> - iter (this->thr_list_); - for (; ! iter.done (); iter.advance ()) + for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_); + !iter.done (); + iter.advance ()) if ((this->*func)(iter.next (), arg) == -1) result = -1; @@ -1074,15 +1074,15 @@ ACE_Thread_Manager::wait_grp (int grp_id) copy_table = new ACE_Thread_Descriptor [this->thr_list_.size ()]; - ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> - iter (this->thr_list_); - - for (; ! iter.done (); iter.advance ()) - // If threads are created as THR_DETACHED or THR_DAEMON, we can't help much. + for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_); + !iter.done (); + iter.advance ()) + // If threads are created as THR_DETACHED or THR_DAEMON, we + // can't help much. if (iter.next ()->task_ == this->task () && - (((iter.next ()->flags_ & (THR_DETACHED | THR_DAEMON)) == 0) - || ((iter.next ()->flags_ & THR_JOINABLE) != 0))) - copy_table[copy_count++] = *iter.next (); + (ACE_BIT_DISABLED (iter.next ()->flags_, (THR_DETACHED | THR_DAEMON)) + || ACE_BIT_ENABLED (iter.next ()->flags_, THR_JOINABLE))) + copy_table[copy_count++] = *iter.next (); } // Now to do the actual work |