diff options
Diffstat (limited to 'orbsvcs/examples/RtEC/IIOPGateway')
| -rw-r--r-- | orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp | 6 | ||||
| -rw-r--r-- | orbsvcs/examples/RtEC/IIOPGateway/EC.cpp | 6 | ||||
| -rw-r--r-- | orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp | 6 | ||||
| -rw-r--r-- | orbsvcs/examples/RtEC/IIOPGateway/Makefile.am | 174 | ||||
| -rw-r--r-- | orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp | 6 | ||||
| -rwxr-xr-x | orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl | 12 | ||||
| -rw-r--r-- | orbsvcs/examples/RtEC/IIOPGateway/ec.conf | 1 | ||||
| -rw-r--r-- | orbsvcs/examples/RtEC/IIOPGateway/gateway.conf | 1 | ||||
| -rwxr-xr-x | orbsvcs/examples/RtEC/IIOPGateway/run_test.pl | 12 |
9 files changed, 18 insertions, 206 deletions
diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp index 280290a51db..d0994c95d3d 100644 --- a/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp +++ b/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp @@ -8,10 +8,6 @@ #include "ace/Arg_Shifter.h" #include "ace/OS_NS_string.h" -ACE_RCSID (EC_Examples, - Consumer, - "$Id$") - const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1; const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; @@ -174,7 +170,7 @@ Consumer::parse_args (int argc, ACE_TCHAR *argv[]) arg_shifter.ignore_arg (); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp index cd9a0a226ef..686b1110fa3 100644 --- a/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp +++ b/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp @@ -9,10 +9,6 @@ #include "orbsvcs/Event/EC_Gateway.h" #include "ace/Arg_Shifter.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - static const ACE_TCHAR *ecname = 0; int @@ -136,7 +132,7 @@ EC::parse_args (int argc, ACE_TCHAR *argv[]) arg_shifter.ignore_arg (); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp index 960c99a112c..39bda637a4c 100644 --- a/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp +++ b/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp @@ -9,10 +9,6 @@ #include "ace/Arg_Shifter.h" #include "ace/Dynamic_Service.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - static const ACE_TCHAR *supplierec = 0; static const ACE_TCHAR *consumerec = 0; @@ -155,7 +151,7 @@ Gateway::parse_args (int argc, ACE_TCHAR *argv[]) arg_shifter.ignore_arg (); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am deleted file mode 100644 index d8d324ba722..00000000000 --- a/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am +++ /dev/null @@ -1,174 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_ROOT = $(top_srcdir) - -noinst_PROGRAMS = - -## Makefile.RtEC_IIOPGateway.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += Gateway - -Gateway_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Gateway_SOURCES = \ - Gateway.cpp \ - Gateway.h - -Gateway_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.RtEC_IIOPGateway_Consumer.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Consumer - -Consumer_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Consumer_SOURCES = \ - Consumer.cpp \ - Consumer.h - -Consumer_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.RtEC_IIOPGateway_EC.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS -if !BUILD_ACE_FOR_TAO - -noinst_PROGRAMS += EC - -EC_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -EC_SOURCES = \ - EC.cpp \ - EC.h - -EC_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif !BUILD_ACE_FOR_TAO -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Makefile.RtEC_IIOPGateway_Supplier.am - -if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS - -noinst_PROGRAMS += Supplier - -Supplier_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Supplier_SOURCES = \ - Supplier.cpp \ - Supplier.h - -Supplier_LDADD = \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \ - $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_EXCEPTIONS -endif BUILD_CORBA_MESSAGING - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp b/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp index 3954787c61a..b5fa6558f6a 100644 --- a/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp +++ b/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp @@ -9,10 +9,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_NS_unistd.h" -ACE_RCSID (EC_Examples, - Supplier, - "$Id$") - const RtecEventComm::EventSourceID MY_SOURCE_ID = ACE_ES_EVENT_SOURCE_ANY + 1; const RtecEventComm::EventType MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1; @@ -165,7 +161,7 @@ Supplier::parse_args (int argc, ACE_TCHAR *argv[]) arg_shifter.ignore_arg (); } - // Indicates sucessful parsing of the command line + // Indicates successful parsing of the command line return 0; } diff --git a/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl b/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl index a34cba2cb9e..a5a732212aa 100755 --- a/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl +++ b/orbsvcs/examples/RtEC/IIOPGateway/consumerec_crash.pl @@ -44,31 +44,31 @@ $g->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $s->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$T1 = $t1->CreateProcess ("EC", +$T1 = $t1->CreateProcess ("EC", " -ORBInitRef NameService=file://$t1_nsiorfile ". "-ORBsvcconf $t1_conffile ". "-e channel1"); -$T2 = $t2->CreateProcess ("EC", +$T2 = $t2->CreateProcess ("EC", " -ORBInitRef NameService=file://$t2_nsiorfile ". "-ORBsvcconf $t2_conffile ". "-e channel2"); -$G = $g->CreateProcess ("Gateway", +$G = $g->CreateProcess ("Gateway", " -ORBInitRef NameService=file://$g_nsiorfile ". "-ORBSvcconf $g_gconffile ". "-c channel2 ". "-s channel1"); -$C = $c->CreateProcess ("Consumer", +$C = $c->CreateProcess ("Consumer", " -ORBInitRef NameService=file://$c_nsiorfile ". "-ORBDebugLevel $debug_level ". "-e channel2"); -$S = $s->CreateProcess ("Supplier", +$S = $s->CreateProcess ("Supplier", " -ORBInitRef NameService=file://$s_nsiorfile ". "-e channel1"); diff --git a/orbsvcs/examples/RtEC/IIOPGateway/ec.conf b/orbsvcs/examples/RtEC/IIOPGateway/ec.conf index 73633a3f946..912531e5bf7 100644 --- a/orbsvcs/examples/RtEC/IIOPGateway/ec.conf +++ b/orbsvcs/examples/RtEC/IIOPGateway/ec.conf @@ -1,4 +1,5 @@ # $Id$ + #static EC_Factory "-ECobserver basic -ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000" static EC_Factory "-ECobserver basic " #static EC_Gateway_IIOP "-ECGIIOPConsumerECControl reactive" diff --git a/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf b/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf index 8319c781e4e..4095ec8acef 100644 --- a/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf +++ b/orbsvcs/examples/RtEC/IIOPGateway/gateway.conf @@ -1,4 +1,5 @@ # $Id$ + #static EC_Factory "-ECobserver basic -ECDispatching reactive -ECFiltering basic -ECSupplierFiltering per-supplier -ECProxyConsumerLock thread -ECProxySupplierLock thread -ECConsumerControl reactive -ECSupplierControl reactive -ECConsumerControlPeriod 50000 -ECSupplierControlPeriod 50000" #static EC_Factory "-ECobserver basic " #dynamic Logger Service_Object * ACE:_make_ACE_Logging_Strategy() "-f STDERR|VERBOSE_LITE" diff --git a/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl b/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl index 4a6868692c2..7caef1cc8df 100755 --- a/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl +++ b/orbsvcs/examples/RtEC/IIOPGateway/run_test.pl @@ -44,31 +44,31 @@ $g->DeleteFile ($nsiorfile); $c->DeleteFile ($nsiorfile); $s->DeleteFile ($nsiorfile); -$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/Naming_Service", +$NS = $ns->CreateProcess ("$ENV{TAO_ROOT}/orbsvcs/Naming_Service/tao_cosnaming", " -o $ns_nsiorfile"); -$T1 = $t1->CreateProcess ("EC", +$T1 = $t1->CreateProcess ("EC", " -ORBInitRef NameService=file://$t1_nsiorfile ". "-ORBsvcconf $t1_conffile ". "-e channel1"); -$T2 = $t2->CreateProcess ("EC", +$T2 = $t2->CreateProcess ("EC", " -ORBInitRef NameService=file://$t2_nsiorfile ". "-ORBsvcconf $t2_conffile ". "-e channel2"); -$G = $g->CreateProcess ("Gateway", +$G = $g->CreateProcess ("Gateway", " -ORBInitRef NameService=file://$g_nsiorfile ". "-ORBSvcconf $g_gconffile ". "-c channel2 ". "-s channel1"); -$C = $c->CreateProcess ("Consumer", +$C = $c->CreateProcess ("Consumer", " -ORBInitRef NameService=file://$c_nsiorfile ". "-ORBDebugLevel $debug_level ". "-e channel2"); -$S = $s->CreateProcess ("Supplier", +$S = $s->CreateProcess ("Supplier", " -ORBInitRef NameService=file://$s_nsiorfile ". "-e channel1"); |