diff options
| -rw-r--r-- | ChangeLog-98b | 8 | ||||
| -rw-r--r-- | ace/OS.cpp | 6 | ||||
| -rw-r--r-- | ace/Synch.i | 3 | ||||
| -rw-r--r-- | ace/config-chorus.h | 1 |
4 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b index 78b8f50fa70..0dcdc85faa2 100644 --- a/ChangeLog-98b +++ b/ChangeLog-98b @@ -1,3 +1,11 @@ +1998-10-13 Nagarajan Surendran <naga@tango.cs.wustl.edu> + + * ace/OS.cpp : Added static member definition + KnCap ACE_OS::actorcaps_[ACE_CHORUS_MAX_ACTORS] + for CHORUS. + + * ace/config-chorus.h: Added ACE_HAS_TSS_EMULATION. + Tue Oct 13 22:40:40 1998 Carlos O'Ryan <coryan@cs.wustl.edu> * ace/Makefile: diff --git a/ace/OS.cpp b/ace/OS.cpp index 310761f3f72..f78819757b0 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -1179,6 +1179,12 @@ ACE_thread_t ACE_OS::NULL_thread; ACE_hthread_t ACE_OS::NULL_hthread; ACE_thread_key_t ACE_OS::NULL_key; +#if defined (CHORUS) +KnCap ACE_OS::actorcaps_[ACE_CHORUS_MAX_ACTORS]; +// This is used to map an actor's id into a KnCap for killing and +// waiting actors. +#endif /* CHORUS */ + #if defined (ACE_WIN32) // = Static initialization. diff --git a/ace/Synch.i b/ace/Synch.i index d0726eaea51..c4a940a7b6b 100644 --- a/ace/Synch.i +++ b/ace/Synch.i @@ -262,8 +262,9 @@ ACE_Mutex::remove (void) result = 0; } return result; -#endif /* */ +#else /* !CHORUS */ return ACE_OS::mutex_destroy (&this->lock_); +#endif /* CHORUS */ } ACE_INLINE const ACE_sema_t & diff --git a/ace/config-chorus.h b/ace/config-chorus.h index 81fa51ffd3c..a0dcbcb91c9 100644 --- a/ace/config-chorus.h +++ b/ace/config-chorus.h @@ -135,6 +135,7 @@ # define ACE_USE_RCSID 0 #endif /* #if !defined (ACE_USE_RCSID) */ +#define ACE_HAS_TSS_EMULATION // Needed to wait for "processes" to exit. #include <am/await.h> |