diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-15 02:18:00 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-10-15 02:18:00 +0000 |
| commit | f028287669aefde4e23ab61929107133fef25165 (patch) | |
| tree | 429d780e6a176187cdc722fc3d50def38cb07de0 | |
| parent | 24c72489e8c24756aaa31161ad51df32f4c4e911 (diff) | |
| download | ATCD-f028287669aefde4e23ab61929107133fef25165.tar.gz | |
ChangeLogTag:Wed Oct 14 20:10:00 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Mcast/Makefile | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Mcast/svc.conf | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index 05971160cf2..8728568c9ab 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,5 +1,10 @@ Wed Oct 14 20:10:00 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp: + This test uses the Reactive version of the EC, just to show how + to configure the EC in that mode (this test does not attempt to + preserve priorities, so it is good place to put this). + * tao/encode.cpp: Fixed encoding for Any when both cdr_ and value_ are zero (usually when the Any is holding a tk_null). diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 820221ebc0b..14c7d727c15 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -160,7 +160,7 @@ ECM_Driver::run (int argc, char* argv[]) // Create the EventService implementation, but don't start its // internal threads. - TAO_Default_Module_Factory module_factory; + TAO_Reactive_Module_Factory module_factory; ACE_EventChannel ec_impl (0, ACE_DEFAULT_EVENT_CHANNEL_TYPE, &module_factory); diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile b/TAO/orbsvcs/tests/EC_Mcast/Makefile index cdecb880940..e48e4dacd2c 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/Makefile +++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile @@ -154,6 +154,9 @@ include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU $(ACE_ROOT)/ace/Message_Queue.h \ $(ACE_ROOT)/ace/Message_Block.h \ $(ACE_ROOT)/ace/Message_Block.i \ + $(ACE_ROOT)/ace/Message_Block_T.h \ + $(ACE_ROOT)/ace/Message_Block_T.i \ + $(ACE_ROOT)/ace/Message_Block_T.cpp \ $(ACE_ROOT)/ace/IO_Cntl_Msg.h \ $(ACE_ROOT)/ace/Message_Queue_T.h \ $(ACE_ROOT)/ace/Message_Queue_T.i \ diff --git a/TAO/orbsvcs/tests/EC_Mcast/svc.conf b/TAO/orbsvcs/tests/EC_Mcast/svc.conf index f3362851751..b1cddc490d4 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/svc.conf +++ b/TAO/orbsvcs/tests/EC_Mcast/svc.conf @@ -2,6 +2,6 @@ # # The options are described in $TAO_ROOT/docs/Options.html # -dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBpoa global -ORBcoltable global -ORBinputcdrallocator global" +dynamic Resource_Factory Service_Object * TAO:_make_TAO_Resource_Factory() "-ORBresources global -ORBpoa global -ORBcoltable global -ORBinputcdrallocator global -ORBreactorlock null" dynamic Client_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Client_Strategy_Factory() dynamic Server_Strategy_Factory Service_Object * TAO:_make_TAO_Default_Server_Strategy_Factory() "-ORBconcurrency reactive -ORBdemuxstrategy dynamic -ORBtablesize 128 -ORBpoalock thread -ORBcoltbllock thread -ORBpoamgrlock thread" |