diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Basic')
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp | 1184 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp | 94 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsw | 29 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Basic/EC_Basic.h | 354 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Basic/EC_Basic.i | 15 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Basic/Makefile | 148 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/EC_Basic/README | 12 | ||||
| -rwxr-xr-x | TAO/orbsvcs/tests/EC_Basic/run_test.pl | 10 |
8 files changed, 0 insertions, 1846 deletions
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp deleted file mode 100644 index 09696ba2c55..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.cpp +++ /dev/null @@ -1,1184 +0,0 @@ -// $Id$ - -#include "ace/Get_Opt.h" -#include "ace/Auto_Ptr.h" -#include "ace/Sched_Params.h" - -#include "orbsvcs/Event_Utilities.h" -#include "orbsvcs/Event_Service_Constants.h" -#include "orbsvcs/Time_Utilities.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/Sched/Config_Scheduler.h" -#include "orbsvcs/Runtime_Scheduler.h" -#include "orbsvcs/Event/Event_Channel.h" -#include "orbsvcs/Event/Module_Factory.h" -#include "EC_Basic.h" - -#if !defined (__ACE_INLINE__) -#include "EC_Basic.i" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(EC_Basic, EC_Basic, "$Id$") - -// **************************************************************** - -int -main (int argc, char *argv []) -{ - ECB_Driver driver; - return driver.run (argc, argv); -} - -// **************************************************************** - -ECB_Driver::ECB_Driver (void) - : pid_filename_ (0) -{ -} - -int -ECB_Driver::run (int argc, char* argv[]) -{ - TAO_TRY - { - this->orb_ = - CORBA::ORB_init (argc, - argv, - "", - TAO_TRY_ENV); - TAO_CHECK_ENV; - - CORBA::Object_var poa_object = - this->orb_->resolve_initial_references ("RootPOA"); - if (CORBA::is_nil (poa_object.in ())) - ACE_ERROR_RETURN ((LM_ERROR, - " (%P|%t) Unable to initialize the POA.\n"), - 1); - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_TRY_ENV); - TAO_CHECK_ENV; - - if (this->parse_args (argc, argv)) - return 1; - - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: Execution parameters:\n" - " pid file name = <%s>\n", - this->pid_filename_ ? this->pid_filename_ : "nil")); - - if (this->pid_filename_ != 0) - { - FILE *pid = ACE_OS::fopen (this->pid_filename_, - "w"); - if (pid != 0) - { - ACE_OS::fprintf (pid, - "%d\n", - ACE_OS::getpid ()); - ACE_OS::fclose (pid); - } - } - - ACE_Config_Scheduler scheduler_impl; - RtecScheduler::Scheduler_var scheduler = - scheduler_impl._this (TAO_TRY_ENV); - TAO_CHECK_ENV; - - CORBA::String_var str = - this->orb_->object_to_string (scheduler.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: The (local) scheduler IOR is <%s>\n", - str.in ())); - - // Create the EventService implementation, but don't start its - // internal threads. - TAO_Reactive_Module_Factory module_factory; - ACE_EventChannel ec_impl (scheduler.in (), - 0, - ACE_DEFAULT_EVENT_CHANNEL_TYPE, - &module_factory); - - // Register Event_Service with the Naming Service. - RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (TAO_TRY_ENV); - TAO_CHECK_ENV; - - str = this->orb_->object_to_string (ec.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; - - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: The (local) EC IOR is <%s>\n", - str.in ())); - - poa_manager->activate (TAO_TRY_ENV); - TAO_CHECK_ENV; - - RtecEventChannelAdmin::EventChannel_var local_ec = - ec_impl._this (TAO_TRY_ENV); - TAO_CHECK_ENV; - - ec_impl.activate (); - - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: local EC objref ready\n")); - - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: start supplier_id_test\n")); - - ECB_SupplierID_Test supplier_id_test; - supplier_id_test.run (this->orb_.in (), - local_ec.in (), - scheduler.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; - - if (supplier_id_test.dump_results () != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "EC_Basic: supplier_id test failed\n"), - -1); - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: end supplier_id_test\n")); - - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: start correlation_test\n")); - - ECB_Correlation_Test correlation_test; - correlation_test.run (this->orb_.in (), - local_ec.in (), - scheduler.in (), - TAO_TRY_ENV); - TAO_CHECK_ENV; - - if (correlation_test.dump_results () != 0) - ACE_ERROR_RETURN ((LM_ERROR, - "EC_Basic: correlation test failed\n"), - -1); - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: end correlation_test\n")); - - ACE_DEBUG ((LM_DEBUG, - "EC_Basic: shutdown the EC\n")); - ec_impl.shutdown (); - } - TAO_CATCH (CORBA::SystemException, sys_ex) - { - TAO_TRY_ENV.print_exception ("SYS_EX"); - } - TAO_CATCHANY - { - TAO_TRY_ENV.print_exception ("NON SYS EX"); - } - TAO_ENDTRY; - return 0; -} - -// **************************************************************** - -int -ECB_Driver::parse_args (int argc, char *argv []) -{ - ACE_Get_Opt get_opt (argc, argv, "p:"); - int opt; - - while ((opt = get_opt ()) != EOF) - { - switch (opt) - { - case 'p': - this->pid_filename_ = get_opt.optarg; - break; - case '?': - default: - ACE_DEBUG ((LM_DEBUG, - "Usage: %s " - "[ORB options] " - "-p <pid file name> " - "\n", - argv[0])); - return -1; - } - } - - return 0; -} - -// **************************************************************** - -ECB_Test::~ECB_Test (void) -{ -} - -// **************************************************************** - -ECB_Consumer::ECB_Consumer (ECB_Test *test, - int consumer_id) - : test_ (test), - consumer_id_ (consumer_id) -{ -} - -void -ECB_Consumer::open (const char* name, - RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& TAO_IN_ENV) -{ - this->rt_info_ = - scheduler->create (name, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID(TAO_IN_ENV); - - // The worst case execution time is far less than 2 - // milliseconds, but that is a safe estimate.... - ACE_Time_Value tv (0, 2000); - TimeBase::TimeT time; - ORBSVCS_Time::Time_Value_to_TimeT (time, tv); - scheduler->set (this->rt_info_, - RtecScheduler::VERY_HIGH_CRITICALITY, - time, time, time, - 0, - RtecScheduler::VERY_LOW_IMPORTANCE, - time, - 0, - RtecScheduler::OPERATION, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - // = Connect as a consumer. - this->consumer_admin_ = ec->for_consumers (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); -} - -void -ECB_Consumer::connect (const RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment& TAO_IN_ENV) -{ - if (CORBA::is_nil (this->consumer_admin_.in ())) - return; - - RtecEventComm::PushConsumer_var objref = this->_this (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier_proxy_ = - this->consumer_admin_->obtain_push_supplier (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier_proxy_->connect_push_consumer (objref.in (), - qos, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); -} - -void -ECB_Consumer::disconnect (CORBA::Environment& TAO_IN_ENV) -{ - if (CORBA::is_nil (this->supplier_proxy_.in ()) - || CORBA::is_nil (this->consumer_admin_.in ())) - return; - - this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier_proxy_ = - RtecEventChannelAdmin::ProxyPushSupplier::_nil (); -} - -void -ECB_Consumer::close (CORBA::Environment &TAO_IN_ENV) -{ - this->disconnect (TAO_IN_ENV); - this->consumer_admin_ = - RtecEventChannelAdmin::ConsumerAdmin::_nil (); -} - -void -ECB_Consumer::push (const RtecEventComm::EventSet& events, - CORBA::Environment &TAO_IN_ENV) -{ - this->test_->push (this->consumer_id_, - events, - TAO_IN_ENV); -} - -void -ECB_Consumer::disconnect_push_consumer (CORBA::Environment &) -{ -} - -// **************************************************************** - -ECB_Supplier::ECB_Supplier (ECB_Test *test, - int supplier_id) - : test_ (test), - supplier_id_ (supplier_id) -{ -} - -void -ECB_Supplier::open (const char* name, - RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment &TAO_IN_ENV) -{ - this->rt_info_ = - scheduler->create (name, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - // The execution times are set to reasonable values, but actually - // they are changed on the real execution, i.e. we lie to the - // scheduler to obtain right priorities; but we don't care if the - // set is schedulable. - ACE_Time_Value tv (0, 2000); - TimeBase::TimeT time; - ORBSVCS_Time::Time_Value_to_TimeT (time, tv); - - scheduler->set (this->rt_info_, - RtecScheduler::VERY_HIGH_CRITICALITY, - time, time, time, - 0, - RtecScheduler::VERY_LOW_IMPORTANCE, - time, - 1, - RtecScheduler::OPERATION, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - // = Connect as a consumer. - this->supplier_admin_ = ec->for_suppliers (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); -} - -void -ECB_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment& TAO_IN_ENV) -{ - if (CORBA::is_nil (this->supplier_admin_.in ())) - return; - - this->consumer_proxy_ = - this->supplier_admin_->obtain_push_consumer (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - RtecEventComm::PushSupplier_var objref = this->_this (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->consumer_proxy_->connect_push_supplier (objref.in (), - qos, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); -} - -void -ECB_Supplier::disconnect (CORBA::Environment& TAO_IN_ENV) -{ - if (CORBA::is_nil (this->consumer_proxy_.in ()) - || CORBA::is_nil (this->supplier_admin_.in ())) - return; - - this->consumer_proxy_->disconnect_push_consumer (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer_proxy_ = - RtecEventChannelAdmin::ProxyPushConsumer::_nil (); -} - -void -ECB_Supplier::close (CORBA::Environment &TAO_IN_ENV) -{ - this->disconnect (TAO_IN_ENV); - this->supplier_admin_ = - RtecEventChannelAdmin::SupplierAdmin::_nil (); -} - -void -ECB_Supplier::send_event (RtecEventComm::EventSet& events, - CORBA::Environment& TAO_IN_ENV) -{ - // RtecEventComm::EventSet copy = events; - this->consumer_proxy_->push (events, TAO_IN_ENV); -} - -void -ECB_Supplier::disconnect_push_supplier (CORBA::Environment& TAO_IN_ENV) -{ - ACE_UNUSED_ARG (TAO_IN_ENV); - // this->supplier_proxy_->disconnect_push_supplier (TAO_IN_ENV); -} - -// **************************************************************** - -ECB_SupplierID_Test::ECB_SupplierID_Test (void) - : consumer0_ (this, 0), - consumer1_ (this, 1), - supplier0_ (this, 0), - supplier1_ (this, 1) -{ -} - -void -ECB_SupplierID_Test::run (CORBA::ORB_ptr orb, - RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& TAO_IN_ENV) -{ - ACE_UNUSED_ARG (orb); - - int i; - - for (i = 0; i <= ECB_SupplierID_Test::PHASE_END; ++i) - { - this->event_count_[i] = 0; - this->error_count_[i] = 0; - } - - // Startup - this->consumer0_.open ("SupplierID/consumer0", - ec, - scheduler, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer1_.open ("SupplierID/consumer1", - ec, - scheduler, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.open ("SupplierID/supplier0", - ec, - scheduler, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.open ("SupplierID/supplier1", - ec, - scheduler, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - // Precompute the QoS for the consumers and suppliers. - ACE_ConsumerQOS_Factory consumer0_qos; - consumer0_qos.start_disjunction_group (); - consumer0_qos.insert_source (ECB_SupplierID_Test::SUPPLIER_ID, - this->consumer0_.rt_info ()); - - ACE_ConsumerQOS_Factory consumer1_qos; - consumer1_qos.start_disjunction_group (); - consumer1_qos.insert_source (ECB_SupplierID_Test::SUPPLIER_ID, - this->consumer1_.rt_info ()); - - ACE_SupplierQOS_Factory supplier0_qos; - supplier0_qos.insert (ECB_SupplierID_Test::SUPPLIER_ID, - ACE_ES_EVENT_UNDEFINED + 1, - this->supplier0_.rt_info (), - 1); - - ACE_SupplierQOS_Factory supplier1_qos; - supplier1_qos.insert (ECB_SupplierID_Test::SUPPLIER_ID, - ACE_ES_EVENT_UNDEFINED + 1, - this->supplier1_.rt_info (), - 1); - - // Precompute the event set - RtecEventComm::EventSet events (1); - events.length (1); - - RtecEventComm::Event& e = events[0]; - e.header.source = ECB_SupplierID_Test::SUPPLIER_ID; - e.header.ttl = 1; - e.header.type = ACE_ES_EVENT_UNDEFINED + 1; - - ACE_hrtime_t t = ACE_OS::gethrtime (); - ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t); - e.header.ec_recv_time = ORBSVCS_Time::zero; - e.header.ec_send_time = ORBSVCS_Time::zero; - - e.data.x = 0; - e.data.y = 0; - - // Start the real test. - - // PHASE 0, test filtering by supplier ID in the presence of - // multiple suppliers with the same ID... - this->phase_ = ECB_SupplierID_Test::PHASE_0; - - this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 1, test disconnection of a single supplier. - this->phase_ = ECB_SupplierID_Test::PHASE_1; - this->supplier1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 2, test reconnection of the supplier. - this->phase_ = ECB_SupplierID_Test::PHASE_2; - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 3, test disconnect of one consumer - this->phase_ = ECB_SupplierID_Test::PHASE_3; - this->consumer1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 4, test reconnection of one consumer - this->phase_ = ECB_SupplierID_Test::PHASE_4; - this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 5, test disconnection of two consumers. - this->phase_ = ECB_SupplierID_Test::PHASE_5; - this->consumer0_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 6, test reconnection of two consumers. - this->phase_ = ECB_SupplierID_Test::PHASE_6; - this->consumer0_.connect (consumer0_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer1_.connect (consumer1_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 7, test disconnect/reconnect of both suppliers. - this->phase_ = ECB_SupplierID_Test::PHASE_7; - this->supplier0_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_SupplierID_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (events, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE END, any events received after this are errors. - this->phase_ = ECB_SupplierID_Test::PHASE_END; - - // Finish - this->supplier1_.close (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.close (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer1_.close (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer0_.close (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); -} - -int -ECB_SupplierID_Test::dump_results (void) -{ - static CORBA::ULong expected_count[PHASE_END]={ - 4 * ECB_SupplierID_Test::EVENTS_SENT, - 2 * ECB_SupplierID_Test::EVENTS_SENT, - 4 * ECB_SupplierID_Test::EVENTS_SENT, - 2 * ECB_SupplierID_Test::EVENTS_SENT, - 4 * ECB_SupplierID_Test::EVENTS_SENT, - 0, - 4 * ECB_SupplierID_Test::EVENTS_SENT, - 4 * ECB_SupplierID_Test::EVENTS_SENT - }; - - int result = 0; - - for (int i = 0; - i < ECB_SupplierID_Test::PHASE_END; - ++i) - { - if (this->error_count_[i] != 0) - { - ACE_ERROR ((LM_ERROR, - "SupplierID_Test: Error count for phase %d " - "is not zero\n", - i)); - result = -1; - } - if (this->event_count_[i] != expected_count[i]) - { - ACE_ERROR ((LM_ERROR, - "SupplierID_Test: Mismatched event count in phase %d, " - "expected %d, count is %d\n", - i, - expected_count[i], - this->event_count_[i])); - result = -1; - } - } - if (this->error_count_[ECB_SupplierID_Test::PHASE_END] != 0) - { - ACE_ERROR ((LM_ERROR, - "SupplierID_Test: Events received after final phase\n")); - result = -1; - } - if (result == 0) - ACE_DEBUG ((LM_DEBUG, - "SupplierID_Test: All phases successful\n")); - - return result; -} - -void -ECB_SupplierID_Test::push (int consumer_id, - const RtecEventComm::EventSet& events, - CORBA::Environment &TAO_IN_ENV) -{ - ACE_UNUSED_ARG (events); - ACE_UNUSED_ARG (TAO_IN_ENV); - - switch (this->phase_) - { - case ECB_SupplierID_Test::PHASE_END: - default: - this->error_count_[ECB_SupplierID_Test::PHASE_END]++; - break; - - case ECB_SupplierID_Test::PHASE_0: - this->event_count_[ECB_SupplierID_Test::PHASE_0]++; - break; - - case ECB_SupplierID_Test::PHASE_1: - this->event_count_[ECB_SupplierID_Test::PHASE_1]++; - break; - - case ECB_SupplierID_Test::PHASE_2: - this->event_count_[ECB_SupplierID_Test::PHASE_2]++; - break; - - case ECB_SupplierID_Test::PHASE_3: - if (consumer_id == 0) - this->event_count_[ECB_SupplierID_Test::PHASE_3]++; - else - this->error_count_[ECB_SupplierID_Test::PHASE_3]++; - break; - - case ECB_SupplierID_Test::PHASE_4: - this->event_count_[ECB_SupplierID_Test::PHASE_4]++; - break; - - case ECB_SupplierID_Test::PHASE_5: - this->error_count_[ECB_SupplierID_Test::PHASE_5]++; - break; - - case ECB_SupplierID_Test::PHASE_6: - this->event_count_[ECB_SupplierID_Test::PHASE_6]++; - break; - - case ECB_SupplierID_Test::PHASE_7: - this->event_count_[ECB_SupplierID_Test::PHASE_7]++; - break; - } -} - -// **************************************************************** - -ECB_Correlation_Test::ECB_Correlation_Test (void) - : consumer_ (this, 0), - supplier0_ (this, 0), - supplier1_ (this, 1) -{ -} - -void -ECB_Correlation_Test::run (CORBA::ORB_ptr orb, - RtecEventChannelAdmin::EventChannel_ptr ec, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& TAO_IN_ENV) -{ - ACE_UNUSED_ARG (orb); - - int i; - - for (i = 0; i <= ECB_Correlation_Test::PHASE_END; ++i) - { - this->event_count_[i] = 0; - this->error_count_[i] = 0; - } - - // Startup - this->consumer_.open ("Correlation/consumer", - ec, - scheduler, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.open ("Correlation/supplier0", - ec, - scheduler, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.open ("Correlation/supplier1", - ec, - scheduler, - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - // Precompute the QoS for the consumers and suppliers. - ACE_ConsumerQOS_Factory consumer_qos; - consumer_qos.start_conjunction_group (); - consumer_qos.insert_type (ECB_Correlation_Test::EVENT_A, - this->consumer_.rt_info ()); - consumer_qos.insert_type (ECB_Correlation_Test::EVENT_B, - this->consumer_.rt_info ()); - - ACE_SupplierQOS_Factory supplier0_qos; - supplier0_qos.insert (ECB_Correlation_Test::SUPPLIER_ID_0, - ECB_Correlation_Test::EVENT_A, - this->supplier0_.rt_info (), - 1); - supplier0_qos.insert (ECB_Correlation_Test::SUPPLIER_ID_0, - ECB_Correlation_Test::EVENT_B, - this->supplier0_.rt_info (), - 1); - - ACE_SupplierQOS_Factory supplier1_qos; - supplier1_qos.insert (ECB_Correlation_Test::SUPPLIER_ID_1, - ECB_Correlation_Test::EVENT_A, - this->supplier1_.rt_info (), - 1); - supplier1_qos.insert (ECB_Correlation_Test::SUPPLIER_ID_1, - ECB_Correlation_Test::EVENT_B, - this->supplier1_.rt_info (), - 1); - - // Precompute the events - RtecEventComm::EventSet event_a (1); - event_a.length (1); - { - RtecEventComm::Event& e = event_a[0]; - e.header.source = ECB_Correlation_Test::SUPPLIER_ID_0; - e.header.ttl = 1; - e.header.type = ECB_Correlation_Test::EVENT_A; - - ACE_hrtime_t t = ACE_OS::gethrtime (); - ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t); - e.header.ec_recv_time = ORBSVCS_Time::zero; - e.header.ec_send_time = ORBSVCS_Time::zero; - - e.data.x = 0; - e.data.y = 0; - } - - RtecEventComm::EventSet event_b (1); - event_b.length (1); - { - RtecEventComm::Event& e = event_b[0]; - e.header.source = ECB_Correlation_Test::SUPPLIER_ID_0; - e.header.ttl = 1; - e.header.type = ECB_Correlation_Test::EVENT_B; - - ACE_hrtime_t t = ACE_OS::gethrtime (); - ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t); - e.header.ec_recv_time = ORBSVCS_Time::zero; - e.header.ec_send_time = ORBSVCS_Time::zero; - - e.data.x = 0; - e.data.y = 0; - } - - RtecEventComm::EventSet event_ab (2); - event_ab.length (2); - { - RtecEventComm::Event& e = event_ab[0]; - e.header.source = ECB_Correlation_Test::SUPPLIER_ID_0; - e.header.ttl = 1; - e.header.type = ECB_Correlation_Test::EVENT_A; - - ACE_hrtime_t t = ACE_OS::gethrtime (); - ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t); - e.header.ec_recv_time = ORBSVCS_Time::zero; - e.header.ec_send_time = ORBSVCS_Time::zero; - - e.data.x = 0; - e.data.y = 0; - } - { - RtecEventComm::Event& e = event_ab[1]; - e.header.source = ECB_Correlation_Test::SUPPLIER_ID_0; - e.header.ttl = 1; - e.header.type = ECB_Correlation_Test::EVENT_B; - - ACE_hrtime_t t = ACE_OS::gethrtime (); - ORBSVCS_Time::hrtime_to_TimeT (e.header.creation_time, t); - e.header.ec_recv_time = ORBSVCS_Time::zero; - e.header.ec_send_time = ORBSVCS_Time::zero; - - e.data.x = 0; - e.data.y = 0; - } - - // Start the real test. - - // PHASE 0 - this->phase_ = ECB_Correlation_Test::PHASE_0; - - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_b, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 1, test disconnection of a single supplier. - this->phase_ = ECB_Correlation_Test::PHASE_1; - this->consumer_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (event_ab, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_ab, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 2, test reconnection of the supplier. - this->phase_ = ECB_Correlation_Test::PHASE_2; - this->consumer_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_b, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.send_event (event_b, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 3 - this->phase_ = ECB_Correlation_Test::PHASE_3; - this->consumer_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_ab, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 4 - this->phase_ = ECB_Correlation_Test::PHASE_4; - this->consumer_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_b, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE 5 - this->phase_ = ECB_Correlation_Test::PHASE_5; - this->consumer_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.disconnect (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer_.connect (consumer_qos.get_ConsumerQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - this->supplier0_.connect (supplier0_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.connect (supplier1_qos.get_SupplierQOS (), - TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - - for (i = 0; i < ECB_Correlation_Test::EVENTS_SENT; ++i) - { - this->supplier0_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier1_.send_event (event_a, TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - } - - // PHASE END, any events received after this are errors. - this->phase_ = ECB_Correlation_Test::PHASE_END; - - // Finish - this->supplier1_.close (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->supplier0_.close (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); - this->consumer_.close (TAO_IN_ENV); - TAO_CHECK_ENV_RETURN_VOID (TAO_IN_ENV); -} - -int -ECB_Correlation_Test::dump_results (void) -{ - static CORBA::ULong expected_count[PHASE_END] = - { - 1 * ECB_Correlation_Test::EVENTS_SENT, - 2 * ECB_Correlation_Test::EVENTS_SENT, - 2 * ECB_Correlation_Test::EVENTS_SENT, - 1 * ECB_Correlation_Test::EVENTS_SENT, - 1 * ECB_Correlation_Test::EVENTS_SENT, - 0 - }; - - int result = 0; - - for (int i = 0; - i < ECB_Correlation_Test::PHASE_END; - ++i) - { - if (this->error_count_[i] != 0) - { - ACE_ERROR ((LM_ERROR, - "Correlation_Test: Error count for phase %d " - "is not zero\n", - i)); - result = -1; - } - if (this->event_count_[i] != expected_count[i]) - { - ACE_ERROR ((LM_ERROR, - "Correlation_Test: Mismatched event count in phase %d, " - "expected %d, count is %d\n", - i, - expected_count[i], - this->event_count_[i])); - result = -1; - } - } - if (this->error_count_[ECB_Correlation_Test::PHASE_END] != 0) - { - ACE_ERROR ((LM_ERROR, - "Correlation_Test: Events received after final phase\n")); - result = -1; - } - if (result == 0) - ACE_DEBUG ((LM_DEBUG, - "Correlation_Test: All phases successful\n")); - - return result; -} - -void -ECB_Correlation_Test::push (int consumer_id, - const RtecEventComm::EventSet& events, - CORBA::Environment &TAO_IN_ENV) -{ - ACE_UNUSED_ARG (consumer_id); - ACE_UNUSED_ARG (TAO_IN_ENV); - - if (events.length () != 2) - { - ACE_ERROR ((LM_ERROR, - "Correlation_Test::push - " - "event length (%d) in phase %d\n", - events.length (), this->phase_)); - this->error_count_[this->phase_]++; - return; - } - - // If the types do not match we have an error. - if (!((events[0].header.type == ECB_Correlation_Test::EVENT_A - && events[1].header.type == ECB_Correlation_Test::EVENT_B) - || (events[0].header.type == ECB_Correlation_Test::EVENT_B - && events[1].header.type == ECB_Correlation_Test::EVENT_A))) - { - ACE_ERROR ((LM_ERROR, - "Correlation_Test::push - event type\n")); - this->error_count_[this->phase_]++; - return; - } - - switch (this->phase_) - { - case ECB_Correlation_Test::PHASE_END: - default: - this->error_count_[ECB_Correlation_Test::PHASE_END]++; - break; - - case ECB_Correlation_Test::PHASE_0: - this->event_count_[ECB_Correlation_Test::PHASE_0]++; - break; - - case ECB_Correlation_Test::PHASE_1: - this->event_count_[ECB_Correlation_Test::PHASE_1]++; - break; - - case ECB_Correlation_Test::PHASE_2: - this->event_count_[ECB_Correlation_Test::PHASE_2]++; - break; - - case ECB_Correlation_Test::PHASE_3: - this->event_count_[ECB_Correlation_Test::PHASE_3]++; - break; - - case ECB_Correlation_Test::PHASE_4: - this->event_count_[ECB_Correlation_Test::PHASE_4]++; - break; - - case ECB_Correlation_Test::PHASE_5: - this->error_count_[ECB_Correlation_Test::PHASE_5]++; - break; - } -} - -// **************************************************************** - -#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) -#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp deleted file mode 100644 index 1c4327fe178..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsp +++ /dev/null @@ -1,94 +0,0 @@ -# Microsoft Developer Studio Project File - Name="EC_Basic" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Console Application" 0x0103
-
-CFG=EC_Basic - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "EC_Basic.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "EC_Basic.mak" CFG="EC_Basic - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "EC_Basic - Win32 Release" (based on\
- "Win32 (x86) Console Application")
-!MESSAGE "EC_Basic - Win32 Debug" (based on "Win32 (x86) Console Application")
-!MESSAGE
-
-# Begin Project
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "EC_Basic - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-
-!ELSEIF "$(CFG)" == "EC_Basic - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D TAO_ORBSVCS_HAS_DLL=1 /YX /FD /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 TAOd.lib orbsvcsd.lib aced.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\orbsvcs" /libpath:"..\..\..\tao" /libpath:"..\..\..\..\ace"
-
-!ENDIF
-
-# Begin Target
-
-# Name "EC_Basic - Win32 Release"
-# Name "EC_Basic - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=.\EC_Basic.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsw b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsw deleted file mode 100644 index a9f492f94d6..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "EC_Basic"=.\EC_Basic.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h deleted file mode 100644 index 5ffa770d18e..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.h +++ /dev/null @@ -1,354 +0,0 @@ -/* -*- C++ -*- */ -// $Id$ -// -// ============================================================================ -// -// = TITLE -// A simple test for the Event Channel. -// -// = DESCRIPTION -// This test exercises the basic features of the EC, such as -// filtering, correlation, timeouts, etc. -// The test creates a colocated EC, some suppliers, some consumers -// and exercises each feature, one at a time. -// -// ============================================================================ - -#ifndef EC_BASIC_H -#define EC_BASIC_H - -#include "ace/SString.h" - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "ace/High_Res_Timer.h" -#include "orbsvcs/RtecEventChannelAdminC.h" -#include "orbsvcs/RtecEventCommS.h" -#include "orbsvcs/Channel_Clients_T.h" - -class ECB_Driver -{ - // - // = TITLE - // A class to control the tests. - // - // = DESCRIPTION - // This class creates multiple tests and runs them in sequence, - // providing proper environment for each one (the event channel, - // the ORB configuration, etc. - // -public: - ECB_Driver (void); - - int run (int argc, char* argv[]); - // Run the test. - -private: - int shutdown (CORBA::Environment&); - // Called when the main thread is about to shutdown. - - int parse_args (int argc, char* argv[]); - // parse the command line arguments - - void dump_results (void); - // Dump the results to the standard output. - -private: - const char* pid_filename_; - // The name of a file where the process stores its pid - - ACE_hrtime_t test_start_; - ACE_hrtime_t test_stop_; - // Measure the test elapsed time as well as mark the beginning of - // the frames. - - CORBA::ORB_var orb_; - // The ORB, so we can shut it down. -}; - -// **************************************************************** - -class ECB_Test -{ - // = TITLE - // The base class for all the tests. - // - // = DESCRIPTION - // All the tests inherit from this class, it is used by the - // consumer and suppliers as callbacks. - // -public: - virtual ~ECB_Test (void); - // Destructor - - virtual void push (int consumer_number, - const RtecEventComm::EventSet& events, - CORBA::Environment &_env) = 0; - // The callback from the Consumer.... -}; - -class ECB_Consumer : public POA_RtecEventComm::PushConsumer -{ -public: - // = TITLE - // The consumers for all the tests. - // - // = DESCRIPTION - // To simplify each test implementation a generic consumer class - // is provided. - // It dispatches the events back to a Base_Test. - // - ECB_Consumer (ECB_Test* test, - int consumer_id); - - void open (const char* name, - RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); - // This method connects the consumer to the EC. - - void close (CORBA::Environment &_env); - // Disconnect from the EC. - - RtecScheduler::handle_t rt_info (void) const; - // The RT_Info for this object - - void connect (const RtecEventChannelAdmin::ConsumerQOS& qos, - CORBA::Environment &_env); - void disconnect (CORBA::Environment &_env); - // Disconnect from the supplier, but do not forget about it or close - // it. - - // = The POA_RtecEventComm::PushComsumer methods. - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env); - virtual void disconnect_push_consumer (CORBA::Environment &); - -private: - ECB_Test* test_; - // To callback. - - int consumer_id_; - // So we can give our identity back to the test. - - RtecScheduler::handle_t rt_info_; - // The handle for our RT_Info description. - - RtecEventChannelAdmin::ProxyPushSupplier_var supplier_proxy_; - // We talk to the EC using this proxy. - - RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_; - // We talk to the EC using this proxy. -}; - -class ECB_Supplier : public POA_RtecEventComm::PushSupplier -{ -public: - // = TITLE - // Implement one of the consumers in this test. - // - ECB_Supplier (ECB_Test* test, - int supplier_id); - // We generate an id based on the name.... - - void open (const char* name, - RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); - // This method connects the supplier to the EC. - - void close (CORBA::Environment &_env); - // Disconnect from the EC. - - RtecScheduler::handle_t rt_info (void) const; - // The RT_Info for this object - - void connect (const RtecEventChannelAdmin::SupplierQOS& qos, - CORBA::Environment &_env); - void disconnect (CORBA::Environment &_env); - // Disconnect from the EC, but do not forget about it or close - // it. - - void send_event (RtecEventComm::EventSet& events, - CORBA::Environment &_env); - // Send one event, the supplier provides the SourceID - - // = The POA_RtecEventComm::PushSupplier methods. - virtual void disconnect_push_supplier (CORBA::Environment &); - -private: - ECB_Test* test_; - // To callback. - - int supplier_id_; - // This is NOT the supplier ID for the EC, just a number for the - - RtecScheduler::handle_t rt_info_; - // The handle for our RT_Info description. - - RtecEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_; - // We talk to the EC using this proxy. - - RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_; - // We talk to the EC using this proxy. -}; - -// **************************************************************** - -// @@ TODO WE may need to split each test to its own file, but only -// once the number of tests justifies that change. - -class ECB_SupplierID_Test : public ECB_Test -{ - // - // = TITLE - // Verifies that multiple suppliers can have the same ID. - // - // = DESCRIPTION - // This class creates two consumers and two suppliers, the - // suppliers connect with the same ID, but send out different - // events. The consumers subscribe by supplier ID. - // - // The test executes several phases (see the enum below). - // - // = TODO - // The test could be more flexible, but functionality is more - // important than flexiblitity. - // -public: - ECB_SupplierID_Test (void); - - enum - { - PHASE_0, // Verifies filtering for two suppliers with the same ID - PHASE_1, // Disconnect one of the suppliers - PHASE_2, // Reconnect the supplier - PHASE_3, // Disconnect a consumer - PHASE_4, // Reconnect the consumer - PHASE_5, // Disconnect both consumers - PHASE_6, // Reconnect both consumers - PHASE_7, // Disconnect both suppliers and reconnect them - PHASE_END // To check that no events are received after the test ends. - }; - - enum - { - EVENTS_SENT = 10, // How many events we send on each test - SUPPLIER_ID = 1 - }; - - void run (CORBA::ORB_ptr orb, - RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); - // Start the test. - - int dump_results (void); - // Print out the results, returns -1 if an error was detected. - - virtual void push (int consumer_id, - const RtecEventComm::EventSet& events, - CORBA::Environment &_env); - // The callback from the Consumer.... - - -private: - ECB_Consumer consumer0_; - ECB_Consumer consumer1_; - // The consumers... - - ECB_Supplier supplier0_; - ECB_Supplier supplier1_; - // The suppliers... - - CORBA::ULong event_count_[ECB_SupplierID_Test::PHASE_END + 1]; - // Count the correctly received events. - - CORBA::ULong error_count_[ECB_SupplierID_Test::PHASE_END + 1]; - // Store the number of errors for each phase. - - int phase_; - // Keep track of the test we are running... -}; - -// **************************************************************** - -class ECB_Correlation_Test : public ECB_Test -{ - // - // = TITLE - // Verifies that correlation works. - // - // = DESCRIPTION - // This class creates one consumers and two suppliers, the - // consumer subscribe for several event correlations. - // The correlations are satisfied in several different ways by - // both suppliers (see below).by: - // - // = TODO - // -public: - ECB_Correlation_Test (void); - - enum - { - PHASE_0, // One supplier sends A the other sends B - PHASE_1, // Both suppliers send event A and B (in a single event) - PHASE_2, // Both suppliers alternate A and B - PHASE_3, // One supplier sends A the other sends A and B (in a - // single event) - PHASE_4, // One supplier sends A the other alternates A and B - PHASE_5, // Both suppliers send A - PHASE_END // To check that no events are received after the test ends. - }; - - enum - { - EVENTS_SENT = 10, // How many events we send on each test - EVENT_A = 100, // The event "A" - EVENT_B = 200, // The event "B" - SUPPLIER_ID_0 = 100, // The supplier ID for supplier0 - SUPPLIER_ID_1 = 200 // The supplier ID for supplier1 - }; - - void run (CORBA::ORB_ptr orb, - RtecEventChannelAdmin::EventChannel_ptr event_channel, - RtecScheduler::Scheduler_ptr scheduler, - CORBA::Environment& _env); - // Start the test. - - int dump_results (void); - // Print out the results, returns -1 if an error was detected. - - virtual void push (int consumer_id, - const RtecEventComm::EventSet& events, - CORBA::Environment &_env); - // The callback from the Consumer.... - -private: - ECB_Consumer consumer_; - // The consumer... - - ECB_Supplier supplier0_; - ECB_Supplier supplier1_; - // The suppliers... - - CORBA::ULong event_count_[ECB_Correlation_Test::PHASE_END + 1]; - // Count the correctly received events. - - CORBA::ULong error_count_[ECB_Correlation_Test::PHASE_END + 1]; - // Store the number of errors for each phase. - - int phase_; - // Keep track of the test we are running... -}; - -// **************************************************************** - -#if defined (__ACE_INLINE__) -#include "EC_Basic.i" -#endif /* __ACE_INLINE__ */ - -#endif /* EC_BASIC_H */ diff --git a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.i b/TAO/orbsvcs/tests/EC_Basic/EC_Basic.i deleted file mode 100644 index 1688f03c423..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/EC_Basic.i +++ /dev/null @@ -1,15 +0,0 @@ -// $Id$ - -RtecScheduler::handle_t -ECB_Consumer::rt_info (void) const -{ - return this->rt_info_; -} - -RtecScheduler::handle_t -ECB_Supplier::rt_info (void) const -{ - return this->rt_info_; -} - - diff --git a/TAO/orbsvcs/tests/EC_Basic/Makefile b/TAO/orbsvcs/tests/EC_Basic/Makefile deleted file mode 100644 index 14302e476fd..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/Makefile +++ /dev/null @@ -1,148 +0,0 @@ -# $Id$ - -BIN = EC_Basic - -SRC = $(BIN:%=%$(VAR).cpp) -LDLIBS= -lorbsvcs -lTAO - -ifndef TAO_ROOT -TAO_ROOT = $(ACE_ROOT)/TAO -endif - -CPPFLAGS += -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_ROOT) - -#---------------------------------------------------------------------------- -# Include macros and targets -#---------------------------------------------------------------------------- - -include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU -include $(ACE_ROOT)/include/makeinclude/macros.GNU -include $(ACE_ROOT)/include/makeinclude/rules.common.GNU -include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU -include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU - -#### Local rules and variables... - -#---------------------------------------------------------------------------- -# Dependencies -#---------------------------------------------------------------------------- - -# DO NOT DELETE THIS LINE -- g++dep uses it. -# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY. - -.obj/EC_Basic.o .obj/EC_Basic.so .shobj/EC_Basic.o .shobj/EC_Basic.so: EC_Basic.cpp \ - $(ACE_ROOT)/ace/Get_Opt.h \ - $(ACE_ROOT)/ace/ACE.h \ - $(ACE_ROOT)/ace/OS.h \ - $(ACE_ROOT)/ace/inc_user_config.h \ - $(ACE_ROOT)/ace/config.h \ - $(ACE_ROOT)/ace/config-sunos5.5.h \ - $(ACE_ROOT)/ace/config-g++-common.h \ - $(ACE_ROOT)/ace/streams.h \ - $(ACE_ROOT)/ace/Basic_Types.h \ - $(ACE_ROOT)/ace/Basic_Types.i \ - $(ACE_ROOT)/ace/OS.i \ - $(ACE_ROOT)/ace/Trace.h \ - $(ACE_ROOT)/ace/Log_Msg.h \ - $(ACE_ROOT)/ace/Log_Record.h \ - $(ACE_ROOT)/ace/ACE.i \ - $(ACE_ROOT)/ace/Log_Priority.h \ - $(ACE_ROOT)/ace/SString.h \ - $(ACE_ROOT)/ace/SString.i \ - $(ACE_ROOT)/ace/Malloc_Base.h \ - $(ACE_ROOT)/ace/Log_Record.i \ - $(ACE_ROOT)/ace/Get_Opt.i \ - $(ACE_ROOT)/ace/Auto_Ptr.h \ - $(ACE_ROOT)/ace/Auto_Ptr.i \ - $(ACE_ROOT)/ace/Auto_Ptr.cpp \ - $(ACE_ROOT)/ace/Sched_Params.h \ - $(ACE_ROOT)/ace/Sched_Params.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/orbsvcs_export.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Service_Constants.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Time_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event_Utilities.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosTimeBaseS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecSchedulerS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Scheduler_Generic.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Sched/Config_Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Scheduler_Factory.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Runtime_Scheduler.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.h \ - $(TAO_ROOT)/tao/Timeprobe.h \ - $(ACE_ROOT)/ace/Timeprobe.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventCommS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/RtecEventChannelAdminS.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Local_ESTypes.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/RT_Task.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Timer_Module.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/ReactorTask.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Fast_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor.h \ - $(ACE_ROOT)/ace/Select_Reactor_T.h \ - $(ACE_ROOT)/ace/Select_Reactor_Base.h \ - $(ACE_ROOT)/ace/Token.h \ - $(ACE_ROOT)/ace/Token.i \ - $(ACE_ROOT)/ace/Pipe.h \ - $(ACE_ROOT)/ace/Pipe.i \ - $(ACE_ROOT)/ace/Select_Reactor_Base.i \ - $(ACE_ROOT)/ace/Select_Reactor_T.cpp \ - $(ACE_ROOT)/ace/Timer_Heap.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.h \ - $(ACE_ROOT)/ace/Timer_Heap_T.cpp \ - $(ACE_ROOT)/ace/Select_Reactor_T.i \ - $(ACE_ROOT)/ace/Select_Reactor.i \ - $(ACE_ROOT)/ace/Timer_List.h \ - $(ACE_ROOT)/ace/Timer_List_T.h \ - $(ACE_ROOT)/ace/Timer_List_T.cpp \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Manip.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Event_Channel.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Event/Module_Factory.h \ - EC_Basic.h \ - $(ACE_ROOT)/ace/High_Res_Timer.h \ - $(ACE_ROOT)/ace/High_Res_Timer.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.h \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.i \ - $(TAO_ROOT)/orbsvcs/orbsvcs/Channel_Clients_T.cpp \ - EC_Basic.i - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY diff --git a/TAO/orbsvcs/tests/EC_Basic/README b/TAO/orbsvcs/tests/EC_Basic/README deleted file mode 100644 index 18159740f60..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/README +++ /dev/null @@ -1,12 +0,0 @@ -# $Id$ - -A regression test for TAO's Real-time Event Channel. - -This program will be used to test the basic features of the Event -Channel. The current tests are: - - + SupplierID_Test: verify that several suppliers can can the - same supplier ID. - - + Correlation_Test: verify that a consumer can subscribe to a - correlation. diff --git a/TAO/orbsvcs/tests/EC_Basic/run_test.pl b/TAO/orbsvcs/tests/EC_Basic/run_test.pl deleted file mode 100755 index 50a65b5d6e3..00000000000 --- a/TAO/orbsvcs/tests/EC_Basic/run_test.pl +++ /dev/null @@ -1,10 +0,0 @@ -# -*- perl -*- -# $Id$ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -$status = system ($EXEPREFIX."EC_Basic".$Process::EXE_EXT, ""); - -# @@ Capture any errors from the server too. -exit $status; |