summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-06 04:26:01 +0000
committernanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-06 04:26:01 +0000
commitc94002394c80b1566c062e336286b4009d5f1d50 (patch)
treee2fa1d9c6996f8484d0da05fea384962798b48b9
parent7c01b018543c90d6ff95534d752cf6f4062a8788 (diff)
downloadATCD-c94002394c80b1566c062e336286b4009d5f1d50.tar.gz
Changed to use fork1 on Solaris (when using solaris threads)
-rw-r--r--ace/OS.cpp27
1 files changed, 16 insertions, 11 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 65716f9310f..fb807f478d6 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -3774,7 +3774,12 @@ ACE_OS::fork (const char *program_name)
ACE_UNUSED_ARG (program_name);
ACE_NOTSUP_RETURN (pid_t (-1));
# else
- pid_t pid = ::fork ();
+ pid_t pid =
+# if defined (ACE_HAS_STHREADS)
+ ::fork1 ();
+#else
+ ::fork ();
+#endif /* ACE_HAS_STHREADS */
if (pid == 0)
ACE_LOG_MSG->sync (program_name);
@@ -4185,12 +4190,12 @@ ACE_OS::open (const char *filename,
ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock = 0;)
if (ACE_BIT_ENABLED (mode, _O_APPEND))
- {
- ACE_MT
+ {
+ ACE_MT
(
- ace_os_monitor_lock =
- ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
- ace_os_monitor_lock->acquire ();
+ ace_os_monitor_lock =
+ ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+ ace_os_monitor_lock->acquire ();
)
}
@@ -4274,12 +4279,12 @@ ACE_OS::open (const wchar_t *filename,
ACE_MT (ACE_Thread_Mutex *ace_os_monitor_lock = 0;)
if (ACE_BIT_ENABLED (mode, _O_APPEND))
- {
- ACE_MT
+ {
+ ACE_MT
(
- ace_os_monitor_lock =
- ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
- ace_os_monitor_lock->acquire ();
+ ace_os_monitor_lock =
+ ACE_Managed_Object<ACE_Thread_Mutex>::get_preallocated_object (ACE_Object_Manager::ACE_OS_MONITOR_LOCK);
+ ace_os_monitor_lock->acquire ();
)
}