From 25cc2866a794bb3015de2b952b6d9dced35b0074 Mon Sep 17 00:00:00 2001 From: "William R. Otte" Date: Fri, 6 Feb 2009 19:37:08 +0000 Subject: ChangeLogTag: Fri Feb 6 19:36:03 UTC 2009 William R. Otte --- flat/CIAO/ChangeLog | 22 +++++++++++++++++++--- .../BasicSP/BMClosedED/BMClosedED_exec.cpp | 16 ++++++++-------- .../examples/BasicSP/BMDevice/BMDevice_exec.cpp | 10 +++++----- .../examples/BasicSP/BMDisplay/BMDisplay_exec.cpp | 14 +++++++------- flat/CIAO/examples/BasicSP/EC/EC_exec.cpp | 16 ++++++++-------- flat/CIAO/examples/BasicSP/EC/controller.cpp | 8 ++++---- .../BasicSP/descriptors/BasicSP_Unhomed.cdp | 11 +++++++++++ flat/CIAO/examples/BasicSP/descriptors/run_test.pl | 17 +++++------------ 8 files changed, 67 insertions(+), 47 deletions(-) diff --git a/flat/CIAO/ChangeLog b/flat/CIAO/ChangeLog index b4712d117e2..87ed281190b 100644 --- a/flat/CIAO/ChangeLog +++ b/flat/CIAO/ChangeLog @@ -1,9 +1,25 @@ -Fri Feb 6 19:22:40 UTC 2009 William R. Otte +Fri Feb 6 19:36:03 UTC 2009 William R. Otte - * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp: + * examples/BasicSP/BMDevice/BMDevice_exec.cpp: + * examples/BasicSP/BMDisplay/BMDisplay_exec.cpp: + * examples/BasicSP/EC/EC_exec.cpp: + + Raised the priority of logging messages so they would appear + without CIAO_LOG_LEVEL being set. - Better exception handling. + * examples/BasicSP/EC/controller.cpp: + * examples/BasicSP/descriptors/BasicSP_Unhomed.cdp: + * examples/BasicSP/descriptors/run_test.pl: + Fixes necessary to make this test work. + +Fri Feb 6 19:22:40 UTC 2009 William R. Otte + + * DAnCE/NodeApplication/NodeApplication_Impl.cpp: + + Better exception handling. + Fri Feb 6 18:26:39 UTC 2009 William R. Otte * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp: diff --git a/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp index a4d855213f7..a14b2f1de55 100644 --- a/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp +++ b/flat/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp @@ -31,10 +31,10 @@ void MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMClosedED - Doing computations \n")); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMClosedED - Doing data fetch \n")); // Refresh position @@ -43,7 +43,7 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *) if (CORBA::is_nil (dat.in ())) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMClosedED - got nil from get_connection \n")); throw CORBA::BAD_INV_ORDER (); @@ -52,7 +52,7 @@ MyImpl::BMClosedED_exec_i::push_in_avail (BasicSP::DataAvailable *) CORBA::String_var str = dat->get_data (); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMClosedED - Display data is [%s] \n", str.in ())); @@ -74,7 +74,7 @@ MyImpl::BMClosedED_exec_i::set_session_context ( Components::SessionContext_ptr ctx ) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMClosedED_exec_i::set_session_context\n")); this->context_ = @@ -95,7 +95,7 @@ MyImpl::BMClosedED_exec_i::configuration_complete () void MyImpl::BMClosedED_exec_i::ccm_activate () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMClosedED_exec_i::ccm_activate\n")); } @@ -103,7 +103,7 @@ void MyImpl::BMClosedED_exec_i::ccm_passivate () { // if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMClosedED_exec_i::ccm_passivate\n")); } @@ -111,7 +111,7 @@ void MyImpl::BMClosedED_exec_i::ccm_remove () { // if (CIAO::debug_level () > 0) - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMClosedED_exec_i::ccm_remove\n")); } diff --git a/flat/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp b/flat/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp index f19eb750f2a..781e8707d95 100644 --- a/flat/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp +++ b/flat/CIAO/examples/BasicSP/BMDevice/BMDevice_exec.cpp @@ -30,7 +30,7 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *) // Notify others BasicSP::DataAvailable_var event = new OBV_BasicSP::DataAvailable; - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMDevice, received a timeout from EC \n")); this->context_->push_data_available (event); @@ -40,7 +40,7 @@ MyImpl::BMDevice_exec_i::push_timeout (BasicSP::TimeOut *) void MyImpl::BMDevice_exec_i:: set_session_context (Components::SessionContext_ptr ctx) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDevice_exec_i::set_session_context\n")); this->context_ = @@ -61,21 +61,21 @@ MyImpl::BMDevice_exec_i::configuration_complete () void MyImpl::BMDevice_exec_i::ccm_activate () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDevice_exec_i::ccm_activate\n")); } void MyImpl::BMDevice_exec_i::ccm_passivate () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDevice_exec_i::ccm_passivate\n")); } void MyImpl::BMDevice_exec_i::ccm_remove () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDevice_exec_i::ccm_remove\n")); } diff --git a/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp b/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp index a7944d1a71d..46959173a6f 100644 --- a/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp +++ b/flat/CIAO/examples/BasicSP/BMDisplay/BMDisplay_exec.cpp @@ -22,10 +22,10 @@ MyImpl::BMDisplay_exec_i::push_data_ready ( { ACE_UNUSED_ARG (ev); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMDisplay - Doing computations \n")); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMDisplay - Doing data fetch \n")); // Refresh position BasicSP::ReadData_var dat @@ -37,7 +37,7 @@ MyImpl::BMDisplay_exec_i::push_data_ready ( CORBA::String_var str = dat->get_data (); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "BMDisplay - Display data is [%s] \n", str.in ())); @@ -49,7 +49,7 @@ MyImpl::BMDisplay_exec_i::set_session_context ( Components::SessionContext_ptr ctx ) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDisplay_exec_i::set_session_context\n")); this->context_ = BasicSP::CCM_BMDisplay_Context::_narrow (ctx); @@ -68,7 +68,7 @@ MyImpl::BMDisplay_exec_i::configuration_complete ( void MyImpl::BMDisplay_exec_i::ccm_activate () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDisplay_exec_i::ccm_activate\n")); } @@ -76,14 +76,14 @@ void MyImpl::BMDisplay_exec_i::ccm_passivate ( ) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDisplay_exec_i::ccm_passivate\n")); } void MyImpl::BMDisplay_exec_i::ccm_remove () { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::BMDisplay_exec_i::ccm_remove\n")); } diff --git a/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp b/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp index 741f9826b5d..30e90ec12b5 100644 --- a/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp +++ b/flat/CIAO/examples/BasicSP/EC/EC_exec.cpp @@ -35,7 +35,7 @@ MyImpl::timeout_Handler::close_h () this->done_ = 1; this->reactor ()->notify (); - ACE_DEBUG ((LM_DEBUG, "Waiting\n")); + ACE_DEBUG ((LM_EMERGENCY, "Waiting\n")); return this->wait (); } @@ -78,7 +78,7 @@ int MyImpl::timeout_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask close_mask) { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, ACE_TEXT ("[%x] handle = %d, close_mask = %d\n"), this, handle, @@ -93,7 +93,7 @@ MyImpl::timeout_Handler::handle_timeout (const ACE_Time_Value &, { this->pulse_callback_->pulse (); - // ACE_DEBUG ((LM_DEBUG, + // ACE_DEBUG ((LM_EMERGENCY, // ACE_TEXT ("[%x] with count #%05d timed out at %d.%d!\n"), // this, // tv.sec (), @@ -177,7 +177,7 @@ MyImpl::EC_exec_i::active () void MyImpl::EC_exec_i::set_session_context (Components::SessionContext_ptr ctx) { - ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::set_session_context\n")); + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::EC_exec_i::set_session_context\n")); this->context_ = BasicSP::CCM_EC_Context::_narrow (ctx); @@ -196,7 +196,7 @@ MyImpl::EC_exec_i::configuration_complete () void MyImpl::EC_exec_i::ccm_activate () { - ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_activate\n")); + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::EC_exec_i::ccm_activate\n")); this->pulser_.open_h (); } @@ -204,14 +204,14 @@ MyImpl::EC_exec_i::ccm_activate () void MyImpl::EC_exec_i::ccm_passivate () { - ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_passivate\n")); + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::EC_exec_i::ccm_passivate\n")); this->pulser_.close_h (); } void MyImpl::EC_exec_i::ccm_remove () { - ACE_DEBUG ((LM_DEBUG, "MyImpl::EC_exec_i::ccm_remove\n")); + ACE_DEBUG ((LM_EMERGENCY, "MyImpl::EC_exec_i::ccm_remove\n")); } void @@ -219,7 +219,7 @@ MyImpl::EC_exec_i::pulse (void) { try { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_EMERGENCY, ACE_TEXT ("Pushing BasicSP::TimeOut event!\n"))); BasicSP::TimeOut_var ev = new OBV_BasicSP::TimeOut (); diff --git a/flat/CIAO/examples/BasicSP/EC/controller.cpp b/flat/CIAO/examples/BasicSP/EC/controller.cpp index 5f068f99fba..39f8df1acbb 100644 --- a/flat/CIAO/examples/BasicSP/EC/controller.cpp +++ b/flat/CIAO/examples/BasicSP/EC/controller.cpp @@ -11,8 +11,8 @@ #include "ace/Get_Opt.h" #include "ace/streams.h" -const char *rategen_ior_ = 0; -int rate = 2; +const char *rategen_ior_ = "file://rategen.ior"; +int rate = 3; int turn_on = 1; int @@ -103,7 +103,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { pulser->hertz (rate); - ACE_DEBUG ((LM_DEBUG, "Start up the Event services\n")); + ACE_DEBUG ((LM_EMERGENCY, "Start up the Event services\n")); pulser->start (); } @@ -111,7 +111,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { pulser->stop (); - ACE_DEBUG ((LM_DEBUG, "Stop the ES\n")); + ACE_DEBUG ((LM_EMERGENCY, "Stop the ES\n")); } orb->destroy (); diff --git a/flat/CIAO/examples/BasicSP/descriptors/BasicSP_Unhomed.cdp b/flat/CIAO/examples/BasicSP/descriptors/BasicSP_Unhomed.cdp index cab36e8bb0e..468192ce95e 100644 --- a/flat/CIAO/examples/BasicSP/descriptors/BasicSP_Unhomed.cdp +++ b/flat/CIAO/examples/BasicSP/descriptors/BasicSP_Unhomed.cdp @@ -240,6 +240,17 @@ + + edu.vanderbilt.dre.DAnCE.InstanceIOR + + + tk_string + + + rategen.ior + + + diff --git a/flat/CIAO/examples/BasicSP/descriptors/run_test.pl b/flat/CIAO/examples/BasicSP/descriptors/run_test.pl index c4622e41b73..819f5a220ff 100755 --- a/flat/CIAO/examples/BasicSP/descriptors/run_test.pl +++ b/flat/CIAO/examples/BasicSP/descriptors/run_test.pl @@ -21,7 +21,7 @@ $daemons = 4; $status = 0; $dat_file = "BasicSP.dat"; $cdp_file = "BasicSP_Unhomed.cdp"; -$controller_exec = "$CIAO_ROOT/examples/BasicSP/"; +$controller_exec = "$CIAO_ROOT/examples/BasicSP/EC/controller"; $nsior = PerlACE::LocalFile ("ns.ior"); @@ -36,8 +36,7 @@ sub delete_ior_files { unlink $iorfiles[$i]; } unlink PerlACE::LocalFile ("EM.ior"); - unlink PerlACE::LocalFile ("Receiver.ior"); - unlink PerlACE::LocalFile ("Sender.ior"); + unlink PerlACE::LocalFile ("rategen.ior"); unlink PerlACE::LocalFile ("DAM.ior"); unlink PerlACE::LocalFile ("ns.ior"); } @@ -154,22 +153,15 @@ $E = $E->SpawnWaitKill (5000); if (PerlACE::waitforfile_timed ( - "Receiver.ior", + "rategen.ior", $PerlACE::wait_interval_for_process_creation) == -1) { print STDERR "ERROR: The ior file of receiver could not be found\n"; kill_open_processes (); exit 1; } -if (PerlACE::waitforfile_timed ("Sender.ior", - $PerlACE::wait_interval_for_process_creation) == -1) { - print STDERR "ERROR: The ior file of sender could not be found\n"; - kill_open_processes (); - exit 1; -} - print "Invoking the controller\n"; -$controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior"); +$controller = new PerlACE::Process ("$controller_exec", "-o"); $result = $controller->SpawnWaitKill (3000); if ($result != 0) { @@ -177,6 +169,7 @@ if ($result != 0) { $status = 1; } +sleep 10; # Invoke executor - stop the application -. print "Invoking executor - stop the application -\n"; $E = -- cgit v1.2.1