diff options
| -rw-r--r-- | ChangeLog-97b | 8 | ||||
| -rw-r--r-- | TAO/README.sun | 6 | ||||
| -rw-r--r-- | ace/OS.cpp | 92 |
3 files changed, 99 insertions, 7 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index dc46a685fe2..e529681a0b7 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,5 +1,13 @@ Thu Oct 23 05:21:43 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + * ace/OS.cpp (thr_create): Added a fix to set the Chorus stack + size correctly. Thanks to Wei Chiang <chiang@tele.nokia.fi> for + reporting this. + + * ace/OS.cpp: Added a new method ace_sysconf_dump() to dump the + state of the configuration. Thanks to Wei Chiang + <chiang@tele.nokia.fi> for reporting this. + * ace/Singleton.cpp (dump): There was a typo in the dump() method for ACE_TSS_Singleton, it should be ACE_TSS_Singleton::instance_i(). I've fixed this. diff --git a/TAO/README.sun b/TAO/README.sun index b8ff647db2b..5fbfaeacbdc 100644 --- a/TAO/README.sun +++ b/TAO/README.sun @@ -6,7 +6,7 @@ the much of the specific information probably is inaccurate with respect to the current state of TAO. Please see the ./README file that comes with TAO for up-to-date information. -Specifically, many of the file referred to in here may not appear in +Specifically, some of the files referred to below have been renamed in TAO. ======================================== @@ -69,8 +69,8 @@ The rest of this document includes these sections: - WHAT ARE: IOP, IIOP, GIOP, ESIOP, AND DCE-CIOP? For instructions on how to build and test this software, see the file -named "BUILDING" in the "docs" directory. - +named "BUILDING" in the "docs" directory. [Note, this is renamed to +TAO-Install.html for TAO]. ENGINE OVERVIEW --------------- diff --git a/ace/OS.cpp b/ace/OS.cpp index 0a9d522b96a..b136c6a41ba 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -1621,11 +1621,17 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # endif /* ACE_NEEDS_HUGE_THREAD_STACKSIZE */ # if defined (CHORUS) - // if it is a super actor, we can't set stacksize. - // But for the time bing we are all non-super actors - // To be fixed later + // If it is a super actor, we can't set stacksize. But for the time + // being we are all non-super actors. Should be fixed to take care + // of super actors!!! if (stacksize == 0) - stacksize = 0x100000; + stacksize = ACE_OS::sysconf (_SC_PTHREAD_STACK_MIN); + else + { + size_t _s = ACE_OS::sysconf (_SC_PTHREAD_STACK_MIN); + if (size < _s) + size = _s; + } # endif /*CHORUS */ if (stacksize != 0) @@ -2963,3 +2969,81 @@ ACE_OS::rwlock_init (ACE_rwlock_t *rw, #endif /* ACE_HAS_THREADS */ } #endif /* ! ACE_HAS_THREADS || ! ACE_HAS_STHREADS */ + +#if defined (CHORUS) +extern "C" +void +ace_sysconf_dump (void) +{ + ACE_Time_Value time = ACE_OS::gettimeofday (); + if (time == -1) + ACE_DEBUG ((LM_DEBUG, "Cannot get time\n")); + else + time.dump (); + + ACE_DEBUG ((LM_DEBUG, + "ARG_MAX \t= \t%d\t" + "DELAYTIMER_MAX \t= \t%d\n" + "_MQ_OPEN_MAX \t= \t%d\t" + "_MQ_PRIO_MAX \t= \t%d\n" + "_MQ_DFL_MSGSIZE\t= \t%d\t" + "_MQ_DFL_MAXMSGNB\t= \t%d\n" + "_MQ_PATHMAX \t= \t%d\n" + "NGROUPS_MAX \t= \t%d\t" + "OPEN_MAX \t= \t%d\n" + "PAGESIZE \t= \t%d\n" + "PTHREAD_DESTRUCTOR_ITERATIONS \t= \t%d\n" + "PTHREAD_KEYS_MAX \t= \t%d\n" + "PTHREAD_STACK_MAX \t= \t%d\n" + "PTHREAD_STACK_MIN \t= \t%d\n" + "PTHREAD_THREADS_MAX \t= \t%d\n" + "SEM_VALUE_MAX \t= \t%d\n" + "SEM_PATHMAX \t= \t%d\n" + "TIMER_MAX \t= \t%d\n" + "TZNAME_MAX \t= \t%d\n" + "_POSIX_MESSAGE_PASSING \t= \t%d\n" + "_POSIX_SEMAPHORES \t= \t%d\n" + "_POSIX_SHARED_MEMORY_OBJECTS \t= \t%d\n" + "_POSIX_THREADS \t= \t%d\n" + "_POSIX_THREAD_ATTR_STACKADDR \t= \t%d\n" + "_POSIX_THREAD_ATTR_STACKSIZE \t= \t%d\n" + "_POSIX_THREAD_PRIORITY_SCHEDULING= \t%d\n" + "_POSIX_THREAD_PRIO_INHERIT \t= \t%d\n" + "_POSIX_THREAD_PRIO_PROTECT \t= \t%d\n" + "_POSIX_THREAD_PROCESS_SHARED \t= \t%d\n" + "_POSIX_THREAD_SAFE_FUNCTIONS \t= \t%d\n" + "_POSIX_TIMERS \t= \t%d\n" + "_POSIX_VERSION \t= \t%d\n", + ACE_OS::sysconf (_SC_ARG_MAX), + ACE_OS::sysconf (_SC_DELAYTIMER_MAX), + ACE_OS::sysconf (_SC_MQ_OPEN_MAX), + ACE_OS::sysconf (_SC_MQ_PRIO_MAX), + ACE_OS::sysconf (_SC_MQ_DFL_MSGSIZE), + ACE_OS::sysconf (_SC_MQ_DFL_MAXMSGNB), + ACE_OS::sysconf (_SC_MQ_PATHMAX), + ACE_OS::sysconf (_SC_NGROUPS_MAX), + ACE_OS::sysconf (_SC_OPEN_MAX), + ACE_OS::sysconf (_SC_PAGESIZE), + ACE_OS::sysconf (_SC_PTHREAD_DESTRUCTOR_ITERATIONS), + ACE_OS::sysconf (_SC_PTHREAD_KEYS_MAX), + ACE_OS::sysconf (_SC_PTHREAD_STACK_MIN), + ACE_OS::sysconf (_SC_PTHREAD_THREADS_MAX), + ACE_OS::sysconf (_SC_SEM_VALUE_MAX), + ACE_OS::sysconf (_SC_SHM_PATHMAX), + ACE_OS::sysconf (_SC_TIMER_MAX), + ACE_OS::sysconf (_SC_TZNAME_MAX), + ACE_OS::sysconf (_SC_MESSAGE_PASSING), + ACE_OS::sysconf (_SC_SEMAPHORES), + ACE_OS::sysconf (_SC_SHARED_MEMORY_OBJECTS), + ACE_OS::sysconf (_SC_THREADS), + ACE_OS::sysconf (_SC_THREAD_ATTR_STACKADDR), + ACE_OS::sysconf (_SC_THREAD_ATTR_STACKSIZE), + ACE_OS::sysconf (_SC_THREAD_PRIORITY_SCHEDULING), + ACE_OS::sysconf (_SC_THREAD_PRIO_INHERIT), + ACE_OS::sysconf (_SC_THREAD_PRIO_PROTECT), + ACE_OS::sysconf (_SC_THREAD_PROCESS_SHARED), + ACE_OS::sysconf (_SC_THREAD_SAFE_FUNCTIONS), + ACE_OS::sysconf (_SC_TIMERS), + ACE_OS::sysconf (_SC_VERSION))); +} +#endif |