summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TAO/ChangeLog-99c11
-rw-r--r--TAO/performance-tests/Latency/client.conf1
-rw-r--r--TAO/performance-tests/Latency/server.conf2
-rw-r--r--TAO/performance-tests/Latency/st_server.conf2
-rw-r--r--TAO/tao/default_resource.cpp6
5 files changed, 19 insertions, 3 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index d99a0436352..a7367b4195d 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,14 @@
+Tue Aug 17 20:51:13 1999 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * tao/default_resource.cpp:
+ Also use the new signal masking features with the TP reactor.
+
+ * performance-tests/Latency/client.conf:
+ * performance-tests/Latency/server.conf:
+ * performance-tests/Latency/st_server.conf:
+ Use the -ORBReactorMaskSignals 0 option to disable signal
+ masking.
+
Tue Aug 17 19:17:20 1999 Jeff Parsons <parsons@cs.wustl.edu>
* TAO/tests/Param_Test/driver.cpp:
diff --git a/TAO/performance-tests/Latency/client.conf b/TAO/performance-tests/Latency/client.conf
index e19fbe40a3a..3bb0134252a 100644
--- a/TAO/performance-tests/Latency/client.conf
+++ b/TAO/performance-tests/Latency/client.conf
@@ -1,2 +1,3 @@
# $Id$
+#
static Client_Strategy_Factory "-ORBclientconnectionhandler RW"
diff --git a/TAO/performance-tests/Latency/server.conf b/TAO/performance-tests/Latency/server.conf
index 0a9c9ed5cf6..ccdb77fcd42 100644
--- a/TAO/performance-tests/Latency/server.conf
+++ b/TAO/performance-tests/Latency/server.conf
@@ -1,3 +1,3 @@
# $Id$
#
-static Resource_Factory "-ORBReactorType tp"
+static Resource_Factory "-ORBReactorType tp -ORBReactorMaskSignals 0"
diff --git a/TAO/performance-tests/Latency/st_server.conf b/TAO/performance-tests/Latency/st_server.conf
index 6dda1eb4c0d..1a121075eca 100644
--- a/TAO/performance-tests/Latency/st_server.conf
+++ b/TAO/performance-tests/Latency/st_server.conf
@@ -1,4 +1,4 @@
# $Id$
#
-static Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBReactorSignals 0 -ORBInputCDRAllocator null"
+static Resource_Factory "-ORBresources global -ORBReactorType select_st -ORBReactorMaskSignals 0 -ORBInputCDRAllocator null"
static Server_Strategy_Factory "-ORBPOALock null -ORBAllowReactivationOfSystemids 0"
diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp
index ee3079d3b51..6a5a1404907 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -431,7 +431,11 @@ TAO_Default_Resource_Factory::allocate_reactor_impl (void) const
break;
case TAO_REACTOR_TP:
- ACE_NEW_RETURN (impl, ACE_TP_Reactor, 0);
+ ACE_NEW_RETURN (impl, ACE_TP_Reactor ((ACE_Sig_Handler*)0,
+ (ACE_Timer_Queue*)0,
+ this->reactor_mask_signals_),
+ 0);
+ break;
break;
}
return impl;