Thu Aug 20 09:24:04 UTC 2009 Marcel Smit <msmit@remedy.nl>

        * tests/AMI_CCM/AMI/AMI_exec.cpp:
        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
        * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp:
          Improved log messages.

        * tests/AMI_CCM/descriptors/run_test.pl:
          Changed to meet the latest version.

5 files changed, 46 insertions, 35 deletions

diff --git a/modules/CIAO/ChangeLog b/modules/CIAO/ChangeLog
index a6bddeae11f..2ce5eee8a46 100644
--- a/modules/CIAO/ChangeLog
+++ b/modules/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Thu Aug 20 09:24:04 UTC 2009  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/AMI_CCM/AMI/AMI_exec.cpp:
+        * tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp:
+        * tests/AMI_CCM/Sender/Hello_Sender_exec.cpp:
+          Improved log messages.
+
+        * tests/AMI_CCM/descriptors/run_test.pl:
+          Changed to meet the latest version.
+
 Thu Aug 20 08:54:46 UTC 2009  Marcel Smit  <msmit@remedy.nl>
 
         * tests/AMI_CCM/AMI/AMI_exec.h:
diff --git a/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.cpp b/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.cpp
index 9f9d2c44e9f..d38eaa8cff7 100644
--- a/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.cpp
+++ b/modules/CIAO/tests/AMI_CCM/AMI/AMI_exec.cpp
@@ -47,16 +47,16 @@ namespace CIAO_Hello_AMI_AMI_Impl
 
   ami_handler::~ami_handler ()
   {
-    printf ("ami_handler::~ami_handler\n");
+    printf ("AMI :\tami_handler::~ami_handler\n");
   }
 
   int ami_handler::svc ()
   {
     char* out_str;
     CORBA::Long   result;
-    printf ("Thread started for cookie <%d>\n", ck_);
+    printf ("AMI :\tThread started for cookie <%d>\n", ck_);
     result = foo_receiver_->asynch_foo (CORBA::string_dup (in_str_), out_str);
-    printf ("Cookie <%ld> received : result <%ld> answer <%s>\n",
+    printf ("AMI :\tCookie <%ld> received : result <%ld> answer <%s>\n",
             ck_, result, out_str);
     foo_callback_->foo_callback_handler (ck_, result, CORBA::string_dup (out_str));
 
@@ -78,7 +78,7 @@ namespace CIAO_Hello_AMI_AMI_Impl
   
   AMI_ami_foo_exec_i::~AMI_ami_foo_exec_i (void)
   {
-    printf ("AMI_ami_foo_exec_i::~AMI_ami_foo_exec_i\n");
+    printf ("AMI :\tAMI_ami_foo_exec_i::~AMI_ami_foo_exec_i\n");
   }
   
   // Operations from ::CCM_AMI::AMI_ami_foo
@@ -87,10 +87,10 @@ namespace CIAO_Hello_AMI_AMI_Impl
   AMI_ami_foo_exec_i::sendc_asynch_foo (
     const char * in_str)
   {
-    printf ("\n\nReceived string <%s>\n", in_str);
-    printf ("Try to pass it on to the Receiver component\n");
+    printf ("AMI :\tReceived string <%s>\n", in_str);
+    printf ("AMI :\tTry to pass it on to the Receiver component\n");
     ::CCM_AMI::Cookie ck = ++cookie_;
-    printf ("Starting AMI handler to handle asych request <%ld>\n", ck);
+    printf ("AMI :\tStarting AMI handler to handle asych request <%ld>\n", ck);
     ami_handler* ah = new ami_handler (ck, in_str, foo_receiver_, foo_callback_);
     ah->activate ();
     return ck;
diff --git a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp b/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
index a4d90b28eda..e18bec15085 100644
--- a/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
+++ b/modules/CIAO/tests/AMI_CCM/Receiver/Hello_Receiver_exec.cpp
@@ -52,7 +52,7 @@ namespace CIAO_Hello_AMI_Receiver_Impl
     const char * in_str,
     ::CORBA::String_out answer)
   {
-    printf ("\n\n\n\n\nReceived string <%s>\n", in_str);
+    printf ("Receiver :\tReceived string <%s>\n", in_str);
     ACE_OS::sleep (ACE_OS::rand () % 5);
     answer = CORBA::string_dup ("This is my answer : Hi");
     return ACE_OS::rand () % 100;
diff --git a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp b/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp
index ffc42506475..abf6875a2bb 100644
--- a/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp
+++ b/modules/CIAO/tests/AMI_CCM/Sender/Hello_Sender_exec.cpp
@@ -36,7 +36,7 @@ namespace CIAO_Hello_AMI_Sender_Impl
 pulse_generator::pulse_generator (::CCM_AMI::AMI_ami_foo_ptr foo_ami)
           : foo_ami_ (::CCM_AMI::AMI_ami_foo::_duplicate (foo_ami))
 {
-  printf ("pulse_generator::pulse_generator\n");
+  printf ("Sender :\tpulse_generator::pulse_generator\n");
 }
 
 pulse_generator::~pulse_generator ()
@@ -45,16 +45,16 @@ pulse_generator::~pulse_generator ()
 
 int pulse_generator::svc ()
 {
-    printf ("pulse_generator::svc\n");
+    printf ("Sender :\tpulse_generator::svc\n");
     ACE_OS::sleep (10);
     for (int i = 0; i < 5; ++i)
       {
         if (CORBA::is_nil (foo_ami_))
-          printf ("foo_receiver is NIL !!!\n");
+          printf ("Sender :\tfoo_receiver is NIL !!!\n");
         else
           {
             foo_ami_->sendc_asynch_foo ("Do something funny");
-            printf ("asynch_foo has been called\n");
+            printf ("Sender :\tasynch_foo has been called\n");
           }
         ACE_OS::sleep (ACE_OS::rand () % 2);
       }
@@ -81,7 +81,7 @@ int pulse_generator::svc ()
     ::CORBA::Long result,
     const char * answer)
   {
-    printf ("Callback from AMI : cookie <%d> result <%d> answer <%s>\n", ck, result, answer);
+    printf ("Sender :\tCallback from AMI : cookie <%d> result <%d> answer <%s>\n", ck, result, answer);
   }
   
   void
@@ -140,7 +140,6 @@ int pulse_generator::svc ()
   void
   Sender_exec_i::ccm_activate (void)
   {
-    printf ("\n\nCCM active\n");
     ::CCM_AMI::AMI_ami_foo_var foo =
       this->context_->get_connection_run_asynch_foo ();
 
diff --git a/modules/CIAO/tests/AMI_CCM/descriptors/run_test.pl b/modules/CIAO/tests/AMI_CCM/descriptors/run_test.pl
index be3a1f3b002..4d0c8e9c8d2 100755
--- a/modules/CIAO/tests/AMI_CCM/descriptors/run_test.pl
+++ b/modules/CIAO/tests/AMI_CCM/descriptors/run_test.pl
@@ -16,18 +16,19 @@ $daemons_running = 0;
 $em_running = 0;
 $ns_running = 0;
 
-$daemons = 2;
-@ports = ( 60001, 60002 );
-@iorfiles = ( "Sender.ior", "Receiver.ior" );
-@nodenames = ( "Sender", "Receiver" );
+$daemons = 3;
+@ports = ( 60000, 60001, 60002 );
+@iorfiles = ( "AMI.ior", "Sender.ior", "Receiver.ior" );
+@nodenames = ( "AMI", "Sender", "Receiver" );
 
 $status = 0;
-$dat_file = "NodeManagerMap.dat";
 $cdp_file = "Plan.cdp";
 
 $nsior = PerlACE::LocalFile ("ns.ior");
 
 PerlACE::add_lib_path ('../lib');
+$ENV{"DANCE_TRACE_ENABLE"} = 0;
+$ENV{"CIAO_TRACE_ENABLE"} = 0;
 
 unlink $nsior;
 
@@ -42,7 +43,7 @@ sub delete_ior_files {
     unlink PerlACE::LocalFile ("EM.ior");
     unlink PerlACE::LocalFile ("Receiver.ior");
     unlink PerlACE::LocalFile ("Sender.ior");
-    unlink PerlACE::LocalFile ("DAM.ior");
+    unlink PerlACE::LocalFile ("AMI.ior");
     unlink PerlACE::LocalFile ("ns.ior");
 }
 
@@ -176,28 +177,29 @@ if (PerlACE::waitforfile_timed ("Sender.ior",
     exit 1;
 }
 
-# print "Invoking the controller ($controller_exec -k file://Sender.ior)\n";
-# $controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior");
-# $result = $controller->SpawnWaitKill (30);
+if (PerlACE::waitforfile_timed ("AMI.ior",
+                        $PerlACE::wait_interval_for_process_creation) == -1) {
+    print STDERR "ERROR: The ior file of AMI could not be found\n";
+    kill_open_processes ();
+    exit 1;
+}
 
-# if ($result != 0) {
-#     print STDERR "ERROR: The controller returned $result\n";
-#     $status = 1;
-# }
+print "Sleeping 60 seconds to allow task to complete\n";
+sleep (60);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
 print "by running dance_plan_launcher.exe with -k file://EM.ior -x $cdp_file -q\n";
 
-# $E =
-#   new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
-#                        "-k file://EM.ior -x $cdp_file -q");
-# $E->SpawnWaitKill (30);
+$E =
+  new PerlACE::Process ("$DAnCE/bin/dance_plan_launcher",
+                        "-k file://EM.ior -x $cdp_file -q");
+$E->SpawnWaitKill (30);
 
-# print "Executor returned.\n";
-# print "Shutting down rest of the processes.\n";
+print "Executor returned.\n";
+print "Shutting down rest of the processes.\n";
 
-# delete_ior_files ();
-# kill_open_processes ();
+delete_ior_files ();
+kill_open_processes ();
 
 exit $status;