Tue Jul 18 23:30:59 2000 John Heitmann <jwh1@cs.wustl.edu>

6 files changed, 121 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ad62d1c9fc..552b4bd7d10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jul 18 23:30:59 2000  John Heitmann  <jwh1@cs.wustl.edu>
+
+	* ace/OS.h
+
+	  Modified earlier changes to improve support for LynxOS
+	  signals using pace.
+
+	* ace/ACE.cpp
+	* ace/OS_Memory.h
+
+	  Use pace system calls instead of regular calls
+	  when pace is enabled.
+
 Tue Jul 18 12:55:55 2000  Joe Hoffert  <joeh@cs.wustl.edu>
 
         * include/makeinclude/platform_lynxos.GNU:
@@ -6,7 +19,7 @@ Tue Jul 18 12:55:55 2000  Joe Hoffert  <joeh@cs.wustl.edu>
 
 Mon Jul 17 23:44:36 2000  Vishal Kachroo  <vishal@cs.wustl.edu>
 
-	* ace/Makefile (OTHER_FILES): Moved SOCK_Dgram_Mcast_QoS to the 
+	* ace/Makefile (OTHER_FILES): Moved SOCK_Dgram_Mcast_QoS to the
 	  other files category. It really belongs to a separate category
 	  that I'll create later.
 
@@ -24,14 +37,14 @@ Mon Jul 17 05:38:15 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 Sun Jul 16 18:53:42 2000  Darrell Brunsch  <brunsch@uci.edu>
 
-        * ace/TTY_IO:  Removed the #define for ACE_BUILD_DLL, since it 
+        * ace/TTY_IO:  Removed the #define for ACE_BUILD_DLL, since it
           is already defined in the .dsp file.
 
 Sun Jul 16 19:36:17 2000  Vishal Kachroo  <vishal@cs.wustl.edu>
 
 	* ace/QoS_Session.h:
 	* ace/QoS_Session_Impl.{cpp,h,i}:
-	* ace/SOCK_Dgram_Mcast_QoS.cpp: Changed these files to accomodate 
+	* ace/SOCK_Dgram_Mcast_QoS.cpp: Changed these files to accomodate
 	  the new QoS decorator classes.
 
 	* ace/QoS_Decorator.{cpp,h}: Added the QoS decoration for the
@@ -45,7 +58,7 @@ Sun Jul 16 08:49:44 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/Process_Manager: To fix deadlocks with the Process_Manager
 	  on UNIX applied the following fixes:
-  
+
           Use the notify() capability of the reactor from the signal
  	  handler. This allows the signal handler to notify the reactor
  	  (over a pipe) that the signal should be processed. This is done
@@ -56,19 +69,19 @@ Sun Jul 16 08:49:44 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	  Thanks to Roger Larsson <larssoro@hotmail.com> for contribution
  	  these fixes.
-	
-	* ace/TTY_IO: Added additional support for the ACE serial line I/O 
+
+	* ace/TTY_IO: Added additional support for the ACE serial line I/O
 	  wrapper facades.  Thanks to Martin Stack <mstack@cambertx.com>
  	  for contribution this.
 
 	* ace/Service_Repository.h,
   	* ace/Service_Object.h,
   	* ace/Service_Config.h: Added the following aliases:
-	
+
 	  #define ACE_Component ACE_Service_Object
   	  #define ACE_Component_Config ACE_Service_Config
   	  #define ACE_Component_Repository ACE_Service_Repository
-	  
+
 	  to be consistent with the terminology in the POSA2 book.
 
 Fri Jul 14 19:31:39 2000  Eric Ding  <qnd1@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 8ad62d1c9fc..552b4bd7d10 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,16 @@
+Tue Jul 18 23:30:59 2000  John Heitmann  <jwh1@cs.wustl.edu>
+
+	* ace/OS.h
+
+	  Modified earlier changes to improve support for LynxOS
+	  signals using pace.
+
+	* ace/ACE.cpp
+	* ace/OS_Memory.h
+
+	  Use pace system calls instead of regular calls
+	  when pace is enabled.
+
 Tue Jul 18 12:55:55 2000  Joe Hoffert  <joeh@cs.wustl.edu>
 
         * include/makeinclude/platform_lynxos.GNU:
@@ -6,7 +19,7 @@ Tue Jul 18 12:55:55 2000  Joe Hoffert  <joeh@cs.wustl.edu>
 
 Mon Jul 17 23:44:36 2000  Vishal Kachroo  <vishal@cs.wustl.edu>
 
-	* ace/Makefile (OTHER_FILES): Moved SOCK_Dgram_Mcast_QoS to the 
+	* ace/Makefile (OTHER_FILES): Moved SOCK_Dgram_Mcast_QoS to the
 	  other files category. It really belongs to a separate category
 	  that I'll create later.
 
@@ -24,14 +37,14 @@ Mon Jul 17 05:38:15 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 Sun Jul 16 18:53:42 2000  Darrell Brunsch  <brunsch@uci.edu>
 
-        * ace/TTY_IO:  Removed the #define for ACE_BUILD_DLL, since it 
+        * ace/TTY_IO:  Removed the #define for ACE_BUILD_DLL, since it
           is already defined in the .dsp file.
 
 Sun Jul 16 19:36:17 2000  Vishal Kachroo  <vishal@cs.wustl.edu>
 
 	* ace/QoS_Session.h:
 	* ace/QoS_Session_Impl.{cpp,h,i}:
-	* ace/SOCK_Dgram_Mcast_QoS.cpp: Changed these files to accomodate 
+	* ace/SOCK_Dgram_Mcast_QoS.cpp: Changed these files to accomodate
 	  the new QoS decorator classes.
 
 	* ace/QoS_Decorator.{cpp,h}: Added the QoS decoration for the
@@ -45,7 +58,7 @@ Sun Jul 16 08:49:44 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/Process_Manager: To fix deadlocks with the Process_Manager
 	  on UNIX applied the following fixes:
-  
+
           Use the notify() capability of the reactor from the signal
  	  handler. This allows the signal handler to notify the reactor
  	  (over a pipe) that the signal should be processed. This is done
@@ -56,19 +69,19 @@ Sun Jul 16 08:49:44 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	  Thanks to Roger Larsson <larssoro@hotmail.com> for contribution
  	  these fixes.
-	
-	* ace/TTY_IO: Added additional support for the ACE serial line I/O 
+
+	* ace/TTY_IO: Added additional support for the ACE serial line I/O
 	  wrapper facades.  Thanks to Martin Stack <mstack@cambertx.com>
  	  for contribution this.
 
 	* ace/Service_Repository.h,
   	* ace/Service_Object.h,
   	* ace/Service_Config.h: Added the following aliases:
-	
+
 	  #define ACE_Component ACE_Service_Object
   	  #define ACE_Component_Config ACE_Service_Config
   	  #define ACE_Component_Repository ACE_Service_Repository
-	  
+
 	  to be consistent with the terminology in the POSA2 book.
 
 Fri Jul 14 19:31:39 2000  Eric Ding  <qnd1@cs.wustl.edu>
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 8ad62d1c9fc..552b4bd7d10 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,16 @@
+Tue Jul 18 23:30:59 2000  John Heitmann  <jwh1@cs.wustl.edu>
+
+	* ace/OS.h
+
+	  Modified earlier changes to improve support for LynxOS
+	  signals using pace.
+
+	* ace/ACE.cpp
+	* ace/OS_Memory.h
+
+	  Use pace system calls instead of regular calls
+	  when pace is enabled.
+
 Tue Jul 18 12:55:55 2000  Joe Hoffert  <joeh@cs.wustl.edu>
 
         * include/makeinclude/platform_lynxos.GNU:
@@ -6,7 +19,7 @@ Tue Jul 18 12:55:55 2000  Joe Hoffert  <joeh@cs.wustl.edu>
 
 Mon Jul 17 23:44:36 2000  Vishal Kachroo  <vishal@cs.wustl.edu>
 
-	* ace/Makefile (OTHER_FILES): Moved SOCK_Dgram_Mcast_QoS to the 
+	* ace/Makefile (OTHER_FILES): Moved SOCK_Dgram_Mcast_QoS to the
 	  other files category. It really belongs to a separate category
 	  that I'll create later.
 
@@ -24,14 +37,14 @@ Mon Jul 17 05:38:15 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 Sun Jul 16 18:53:42 2000  Darrell Brunsch  <brunsch@uci.edu>
 
-        * ace/TTY_IO:  Removed the #define for ACE_BUILD_DLL, since it 
+        * ace/TTY_IO:  Removed the #define for ACE_BUILD_DLL, since it
           is already defined in the .dsp file.
 
 Sun Jul 16 19:36:17 2000  Vishal Kachroo  <vishal@cs.wustl.edu>
 
 	* ace/QoS_Session.h:
 	* ace/QoS_Session_Impl.{cpp,h,i}:
-	* ace/SOCK_Dgram_Mcast_QoS.cpp: Changed these files to accomodate 
+	* ace/SOCK_Dgram_Mcast_QoS.cpp: Changed these files to accomodate
 	  the new QoS decorator classes.
 
 	* ace/QoS_Decorator.{cpp,h}: Added the QoS decoration for the
@@ -45,7 +58,7 @@ Sun Jul 16 08:49:44 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* ace/Process_Manager: To fix deadlocks with the Process_Manager
 	  on UNIX applied the following fixes:
-  
+
           Use the notify() capability of the reactor from the signal
  	  handler. This allows the signal handler to notify the reactor
  	  (over a pipe) that the signal should be processed. This is done
@@ -56,19 +69,19 @@ Sun Jul 16 08:49:44 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	  Thanks to Roger Larsson <larssoro@hotmail.com> for contribution
  	  these fixes.
-	
-	* ace/TTY_IO: Added additional support for the ACE serial line I/O 
+
+	* ace/TTY_IO: Added additional support for the ACE serial line I/O
 	  wrapper facades.  Thanks to Martin Stack <mstack@cambertx.com>
  	  for contribution this.
 
 	* ace/Service_Repository.h,
   	* ace/Service_Object.h,
   	* ace/Service_Config.h: Added the following aliases:
-	
+
 	  #define ACE_Component ACE_Service_Object
   	  #define ACE_Component_Config ACE_Service_Config
   	  #define ACE_Component_Repository ACE_Service_Repository
-	  
+
 	  to be consistent with the terminology in the POSA2 book.
 
 Fri Jul 14 19:31:39 2000  Eric Ding  <qnd1@cs.wustl.edu>
diff --git a/ace/ACE.cpp b/ace/ACE.cpp
index 17f0ff7c134..e77503d8821 100644
--- a/ace/ACE.cpp
+++ b/ace/ACE.cpp
@@ -158,7 +158,9 @@ ACE::compiler_beta_version (void)
 int
 ACE::terminate_process (pid_t pid)
 {
-#if defined (ACE_HAS_PHARLAP)
+#if defined (ACE_HAS_PACE)
+  return pace_kill (pid, 9);
+#elif defined (ACE_HAS_PHARLAP)
   ACE_UNUSED_ARG (pid);
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_WIN32)
@@ -194,13 +196,22 @@ ACE::terminate_process (pid_t pid)
       return -1;
 #else
   return ACE_OS::kill (pid, 9);
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_PACE */
 }
 
 int
 ACE::process_active (pid_t pid)
 {
-#if !defined(ACE_WIN32)
+#if defined (ACE_HAS_PACE)
+  int retval = pace_kill (pid, 0);
+
+  if (retval == 0)
+    return 1;
+  else if (errno == ESRCH)
+    return 0;
+  else
+    return -1;
+#elif !defined(ACE_WIN32)
   int retval = ACE_OS::kill (pid, 0);
 
   if (retval == 0)
@@ -226,7 +237,7 @@ ACE::process_active (pid_t pid)
       else
         return 1;
     }
-#endif /* ACE_WIN32 */
+#endif /* ACE_HAS_PACE */
 }
 
 // Split a string up into 'token'-delimited pieces, ala Perl's
diff --git a/ace/OS.h b/ace/OS.h
index c412cda2e26..0714beacb13 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -4005,11 +4005,6 @@ struct sigaction
 #   endif
 # endif /* SIG_DFL */
 
-# if defined (ACE_HAS_PACE) && PACE_LYNXOS
-#   undef SIG_IGN
-#   define SIG_IGN ((pace_sig_pf) 1)
-# endif /* (ACE_HAS_PACE) && PACE_LYNXOS */
-
 # if !defined (SIG_IGN)
 #   if defined (ACE_PSOS_DIAB_MIPS) || defined (ACE_PSOS_DIAB_PPC)
 #     define SIG_IGN ((void *) 1)     /* ignore signal */
diff --git a/ace/OS_Memory.h b/ace/OS_Memory.h
index d8165755388..1b115230dcc 100644
--- a/ace/OS_Memory.h
+++ b/ace/OS_Memory.h
@@ -27,7 +27,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/OS_Export.h"
-#include /**/ <stddef.h>
+#if defined (ACE_HAS_PACE)
+# include "pace/stddef.h"
+# include "pace/stdlib.h"
+#else
+# include /**/ <stddef.h>
+#endif /* ACE_HAS_PACE */
 
 # if !defined (ACE_MALLOC_ALIGN)
 #   define ACE_MALLOC_ALIGN ((int) sizeof (long))
@@ -53,25 +58,47 @@
 // too, so that you guarantee that strdup() calls your desired mallocator
 // and not the system mallocator.
 //
-# if !defined (ACE_MALLOC_FUNC)
-#   define ACE_MALLOC_FUNC ::malloc
-# endif
-# if !defined (ACE_CALLOC_FUNC)
-#   define ACE_CALLOC_FUNC ::calloc
-# endif
-# if !defined (ACE_FREE_FUNC)
-#   define ACE_FREE_FUNC ::free
-# endif
-# if !defined (ACE_REALLOC_FUNC)
-#   define ACE_REALLOC_FUNC ::realloc
-# endif
+# if defined (ACE_HAS_PACE)
+#  if !defined (ACE_MALLOC_FUNC)
+#    define ACE_MALLOC_FUNC pace_malloc
+#  endif
+#  if !defined (ACE_CALLOC_FUNC)
+#    define ACE_CALLOC_FUNC pace_calloc
+#  endif
+#  if !defined (ACE_FREE_FUNC)
+#    define ACE_FREE_FUNC pace_free
+#  endif
+#  if !defined (ACE_REALLOC_FUNC)
+#    define ACE_REALLOC_FUNC pace_realloc
+#  endif
 
-# if defined (ACE_HAS_OLD_MALLOC)
+#  if defined (ACE_HAS_OLD_MALLOC)
 typedef char *ACE_MALLOC_T;
-# else
+#  else
 typedef void *ACE_MALLOC_T;
-# endif /* ACE_HAS_OLD_MALLOC */
+#  endif /* ACE_HAS_OLD_MALLOC */
+
+# else
 
+#  if !defined (ACE_MALLOC_FUNC)
+#    define ACE_MALLOC_FUNC ::malloc
+#  endif
+#  if !defined (ACE_CALLOC_FUNC)
+#    define ACE_CALLOC_FUNC ::calloc
+#  endif
+#  if !defined (ACE_FREE_FUNC)
+#    define ACE_FREE_FUNC ::free
+#  endif
+#  if !defined (ACE_REALLOC_FUNC)
+#    define ACE_REALLOC_FUNC ::realloc
+#  endif
+
+#  if defined (ACE_HAS_OLD_MALLOC)
+typedef char *ACE_MALLOC_T;
+#  else
+typedef void *ACE_MALLOC_T;
+#  endif /* ACE_HAS_OLD_MALLOC */
+#endif /* ACE_HAS_PACE */
 
 class ACE_OS_Export ACE_OS_Memory
   // = TITLE