diff options
| -rw-r--r-- | ChangeLog-97b | 8 | ||||
| -rw-r--r-- | ace/Message_Queue.h | 3 | ||||
| -rw-r--r-- | ace/Message_Queue.i | 8 | ||||
| -rw-r--r-- | ace/OS.cpp | 10 | ||||
| -rw-r--r-- | ace/config-chorus.h | 1 |
5 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index b41ba96e45d..e05df152c79 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,5 +1,13 @@ Fri Nov 7 01:06:08 1997 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + * ace/Message_Queue: Added a new method called deactivated(), + which returns true if the queue has been deactivated. Thanks to + Wei Chiang <chiang@tele.nokia.fi> for reporting this. + + * ace/{config-chorus.h,OS.cpp}: Added a new macro called + ACE_CHORUS_DEFAULT_MIN_STACK_SIZE. Thanks to Wei Chiang + <chiang@tele.nokia.fi> for reporting this. + * ace/DEV_Addr.cpp, ace/FILE_Addr.cpp, ace/SPIPE_Addr.cpp, diff --git a/ace/Message_Queue.h b/ace/Message_Queue.h index f8fd83cc26f..68c71c3835e 100644 --- a/ace/Message_Queue.h +++ b/ace/Message_Queue.h @@ -156,6 +156,9 @@ public: // before the call and WAS_ACTIVE if queue was active before the // call. + virtual int deactivated (void); + // Returns true if <deactivated_> is enabled. + // = Notification hook. virtual int notify (void); diff --git a/ace/Message_Queue.i b/ace/Message_Queue.i index 7c0038f40d7..6697eb242a4 100644 --- a/ace/Message_Queue.i +++ b/ace/Message_Queue.i @@ -135,6 +135,14 @@ ACE_Message_Queue<ACE_SYNCH_USE>::deactivate (void) return this->deactivate_i (); } +template <ACE_SYNCH_DECL> ACE_INLINE int +ACE_Message_Queue<ACE_SYNCH_USE>::deactivated (void) +{ + ACE_TRACE ("ACE_Message_Queue<ACE_SYNCH_USE>::deactivated"); + + return this->deactivated_; +} + ACE_ALLOC_HOOK_DEFINE(ACE_Message_Queue_Reverse_Iterator) diff --git a/ace/OS.cpp b/ace/OS.cpp index 27bdd7d2ef8..d7a038aa26a 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -1696,13 +1696,9 @@ ACE_OS::thr_create (ACE_THR_FUNC func, // being we are all non-super actors. Should be fixed to take care // of super actors!!! if (stacksize == 0) - stacksize = 2 * ACE_OS::sysconf (_SC_PTHREAD_STACK_MIN); - else - { - size_t _s = 2 * ACE_OS::sysconf (_SC_PTHREAD_STACK_MIN); - if (stacksize < _s) - stacksize = _s; - } + stacksize = ACE_CHORUS_DEFAULT_MIN_STACK_SIZE; + else if (stacksize < ACE_CHORUS_DEFAULT_MIN_STACK_SIZE) + stacksize = ACE_CHORUS_DEFAULT_MIN_STACK_SIZE; # endif /*CHORUS */ if (stacksize != 0) diff --git a/ace/config-chorus.h b/ace/config-chorus.h index 805bddfffc6..d90f53ec3c1 100644 --- a/ace/config-chorus.h +++ b/ace/config-chorus.h @@ -22,6 +22,7 @@ #define ACE_HAS_TEMPLATE_SPECIALIZATION #define ACE_LACKS_UNIX_SIGNALS #define ACE_HAS_IP_MULTICAST +#define ACE_CHORUS_DEFAULT_MIN_STACK_SIZE 0x2000 #define ACE_LACKS_MPROTECT #define ACE_LACKS_SOCKETPAIR #define ACE_LACKS_ACCESS |