implemented FT component

24 files changed, 140 insertions, 55 deletions

diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/.depend.simple_nm_launcher b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/.depend.simple_nm_launcher
index e69de29bb2d..e69de29bb2d 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/.depend.simple_nm_launcher
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/.depend.simple_nm_launcher
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT.cidl b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.cidl
index c923063eacd..c923063eacd 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT.cidl
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.cidl
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT.idl b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.idl
index 2671922ef42..fe9dda8b34e 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT.idl
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.idl
@@ -7,6 +7,7 @@ module Simple
 {
   component SimpleFT supports test
   {
+    attribute string app_name;
   };
 
   home SimpleFTHome manages SimpleFT
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT.mpc b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.mpc
index 55325aadd50..55325aadd50 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT.mpc
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT.mpc
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_exec.cpp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.cpp
index 7661c1e7205..90d154edfb1 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_exec.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.cpp
@@ -20,11 +20,12 @@
 
 #include "SimpleFT_exec.h"
 #include <ace/Env_Value_T.h>
+#include <ace/Throughput_Stats.h>
 #include <orbsvcs/CosNamingC.h>
 #include "ciao/CIAO_common.h"
 #include "ciao/Containers/Container_Base.h"
 #include "ciao/Contexts/Context_Impl_Base.h"
-
+#include "ciao/FTComponentServer/Name_Helper_T.h"
 
 namespace CIDL_SimpleFT_Impl
 {
@@ -33,9 +34,36 @@ namespace CIDL_SimpleFT_Impl
   //==================================================================
 
   SimpleFT_exec_i::SimpleFT_exec_i (void)
+    : app_name_ ("APPLICATION_NAME"),
+      orb_ (CORBA::ORB::_nil ()),
+      agent_ (StateSynchronizationAgent::_nil ()),
+      history_ (50),
+      state_ (0)
   {
     CIAO_TRACE ("SimpleFT_exec_i::SimpleFT_exec_i (void)");
     CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFT_exec_i::SimpleFT_exec_i (void)\n"));
+
+    CIAO::Context_Impl_Base * base_context = dynamic_cast <CIAO::Context_Impl_Base*> (context_.in ());
+
+    if (base_context == 0)
+      {
+	CIAO_ERROR ((LM_ERROR, "could not cast to Context_Impl_Base\n"));
+      }
+    else
+      {
+	CIAO::Container_var container = base_context->_ciao_the_Container ();
+
+	CIAO::Container_i * container_i = dynamic_cast <CIAO::Container_i*> (container.in ());
+	
+	if (container_i == 0)
+	  {
+	    CIAO_ERROR ((LM_ERROR, "could not cast to Container_i\n"));
+	  }
+	else
+	  {
+	    orb_ = container_i->the_ORB ();
+	  }
+      }
   }
 
   SimpleFT_exec_i::~SimpleFT_exec_i (void)
@@ -80,27 +108,39 @@ namespace CIDL_SimpleFT_Impl
   {
     CIAO_TRACE ("SimpleFT_exec_i::ccm_activate");
     CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFT_exec_i::ccm_activate\n"));
+    
+    Name_Helper_T <StateSynchronizationAgent> nh (orb_.in (), true);
 
-    CIAO_DEBUG ((LM_DEBUG, "resolving name service reference\n"));
-#ifdef RESOLVE_INITIAL_REFERENCE_IS_IMPLEMENTED
-    CORBA::Object_var ns_obj = context_->resolve_service_reference ("NameService");
-#else
-    std::string ns_ior = ACE_Env_Value <std::string> ("NameServiceIOR", std::string ());
+    CIAO_DEBUG ((LM_DEBUG, "resolving the StateSynchronizationAgent in the NamingService.\n"));
 
-    if (ns_ior.empty ())
+    try
       {
-	CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::ccm_activate - could find NameServiceIOR env variable.\n"));
-	return;
+	agent_ = nh.resolve ("FLARe/" +
+			     this->get_hostname () +
+			     "/StateSynchronizationAgent");
+
+	if (CORBA::is_nil (agent_.in ()))
+	  {
+	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::ccm_activate - could not find agent.\n"));
+	    return;
+	  }
+
+	CIAO_DEBUG ((LM_DEBUG, "registering the application with the agent.\n"));
+
+	ReplicatedApplication_var myself = ReplicatedApplication::_narrow (this);
+
+	if (CORBA::is_nil (myself.in ()))
+	  {
+	    CIAO_ERROR ((LM_WARNING, "SimpleFT_exec_i::ccm_activate - could not get reference to itself.\n"));
+	    return;
+	  }
+
+	agent_->register_application (app_name_.c_str (), myself.in ());
+      }
+    catch (CORBA::Exception &ex)
+      {
+	CIAO_ERROR ((LM_ERROR, "SimpleFT_exec_i::ccm_activate - cuaght: %s", ex._info ().c_str ()));
       }
-#endif
-#if 0    
-    CIAO::Context_Impl_Base * base_context = 
-      dynamic_cast <CIAO::Context_Impl_Base*> (context_.in ());
-    CORBA::Object_var ns_obj = base_context->_ciao_the_Container ()->the_ORB ()->string_to_object (ns_ior.c_str ());
-
-    CIAO_DEBUG ((LM_DEBUG, "narrowing name servic\n"));
-    CosNaming::NamingContextExt_var ns = CosNaming::NamingContextExt::_narrow (ns_obj.in ());
-#endif
   }
 
   void
@@ -135,6 +175,23 @@ namespace CIDL_SimpleFT_Impl
     CIAO_DEBUG ((LM_EMERGENCY, "SimpleFT - Test - Lifecycle event - SimpleFTHome_exec_i::~SimpleFTHome_exec_i\n"));
   }
 
+  // Attribute operations
+
+  char *
+  SimpleFT_exec_i::app_name (void)
+  {
+    char * name = new char[app_name_.length ()];
+    ACE_OS::strcpy (name, app_name_.c_str ());    
+
+    return name;
+  }
+
+  void 
+  SimpleFT_exec_i::app_name (const char * app_name)
+  {
+    app_name_ = app_name;
+  }
+
   // Supported or inherited operations.
 
   void 
@@ -176,44 +233,40 @@ namespace CIDL_SimpleFT_Impl
   SimpleFT_exec_i::method (CORBA::ULong test_start, CORBA::ULong test_end,
 			   CORBA::ULong work,
 			   CORBA::ULong prime_number,
-			   CORBA::ULong kill)
+			   CORBA::ULong)
   {
-#ifdef JUST_COPIED
-    static int i = 0;
-    ACE_DEBUG ((LM_DEBUG, "%d\n",i++));
-    
-    if (kill && stop_)
-      ACE_OS::exit (1);
-    if (test_start == 1)
-      {
-	this->start_ = ACE_OS::gethrtime ();
-      }
-    ACE_hrtime_t start = ACE_OS::gethrtime ();
+  static int i = 0;
+  CIAO_DEBUG ((LM_DEBUG, "%d\n",i++));
+
+  if (test_start == 1)
+    {
+      this->start_ = ACE_OS::gethrtime ();
+    }
+
+  ACE_hrtime_t start = ACE_OS::gethrtime ();
   
-    for (; work != 0; work--)
-      ACE::is_prime (prime_number,
-		     2,
-		     prime_number / 2);
-    ACE_hrtime_t end = ACE_OS::gethrtime ();
+  for (; work != 0; work--)
+    ACE::is_prime (prime_number,
+                   2,
+                   prime_number / 2);
+  ACE_hrtime_t end = ACE_OS::gethrtime ();
 
-    ++state_;
+  ++state_;
 
-    if (!CORBA::is_nil (agent_.in ()))
-      agent_->state_changed (object_id_.c_str ());
+  if (!CORBA::is_nil (agent_.in ()))
+    agent_->state_changed (app_name_.c_str ());
 
-    // ACE_DEBUG ((LM_DEBUG, "Time taken = %d\n", end - start));
-    this->history_.sample (end - start);
-    if (test_end == 1)
-      {
-	this->end_ = ACE_OS::gethrtime ();
-      }
-#endif
+  this->history_.sample (end - start);
+  
+  if (test_end == 1)
+    {
+      this->end_ = ACE_OS::gethrtime ();
+    }
   }
 
   void
   SimpleFT_exec_i::dump (void)
   {
-#ifdef JUST_COPIED
     ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
     ACE_Basic_Stats stats;
     this->history_.collect_basic_stats (stats);
@@ -221,17 +274,24 @@ namespace CIDL_SimpleFT_Impl
     ACE_Throughput_Stats::dump_throughput ("Total", gsf,
 					   this->end_ - this->start_,
 					   stats.samples_count ());
-#endif
   }
   
   void
   SimpleFT_exec_i::shutdown (void)
   {
-#ifdef JUST_COPIED
-    this->orb_->shutdown (0);
-#endif
+    // not implemented
   }
 
+  std::string
+  SimpleFT_exec_i::get_hostname ()
+  {
+    char hn_str [100];
+    gethostname (hn_str, sizeof (hn_str));
+    
+    return std::string (hn_str);
+  }
+
+
   // Home operations.
 
   // Factory and finder operations.
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_exec.h b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.h
index d431d336172..e47e3b8ad00 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_exec.h
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec.h
@@ -32,6 +32,8 @@
 #include "SimpleFT_exec_export.h"
 #include "tao/LocalObject.h"
 #include "StateSynchronizationAgentC.h"
+#include "ace/Sample_History.h"
+#include "ace/High_Res_Timer.h"
 
 namespace CIDL_SimpleFT_Impl
 {
@@ -58,6 +60,10 @@ namespace CIDL_SimpleFT_Impl
 
     // Attribute operations.
 
+    virtual char * app_name (void);
+    
+    virtual void app_name (const char * app_name);
+
     // Port operations.
 
     // Operations from Components::SessionComponent
@@ -75,10 +81,22 @@ namespace CIDL_SimpleFT_Impl
     virtual void ccm_remove ();
 
     private:
+    std::string get_hostname ();
+
     ::Simple::CCM_SimpleFT_Context_var context_;
 
+    std::string app_name_;
+
+    CORBA::ORB_var orb_;
+
     StateSynchronizationAgent_var agent_;
 
+    ACE_Sample_History history_;
+
+    ACE_hrtime_t start_;
+
+    ACE_hrtime_t end_;
+
     long state_;
   };
 
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_exec_export.h b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec_export.h
index d9998cd3fb3..d9998cd3fb3 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_exec_export.h
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_exec_export.h
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_stub_export.h b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_stub_export.h
index 9f00b3d51b7..9f00b3d51b7 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_stub_export.h
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_stub_export.h
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_svnt_export.h b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_svnt_export.h
index 5b5bda97c49..5b5bda97c49 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/SimpleFT_svnt_export.h
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/SimpleFT_svnt_export.h
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/Test.idl b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/Test.idl
index 4fee003011c..4fee003011c 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/Components/Test.idl
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/Components/Test.idl
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/FTComponentExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/FTComponentExplicitHome.cdp
index 31474b4865a..31474b4865a 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/FTComponentExplicitHome.cdp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/FTComponentExplicitHome.cdp
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/SimpleComponentExplicitHome.cdp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleComponentExplicitHome.cdp
index 31474b4865a..31474b4865a 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/SimpleComponentExplicitHome.cdp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleComponentExplicitHome.cdp
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/SimpleHome.cdp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleHome.cdp
index a63da21f0f6..a63da21f0f6 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/SimpleHome.cdp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/SimpleHome.cdp
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/lns.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/lns.sh
index f51b97ea03b..f51b97ea03b 100755
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/lns.sh
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/lns.sh
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/nm_launcher.mpc b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/nm_launcher.mpc
index 0e960e72d68..0e960e72d68 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/nm_launcher.mpc
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/nm_launcher.mpc
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/run_componentserver.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/run_componentserver.sh
index 04562e2651e..04562e2651e 100755
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/run_componentserver.sh
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/run_componentserver.sh
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/run_launcher.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/run_launcher.sh
index 30c480c38de..30c480c38de 100755
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/run_launcher.sh
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/run_launcher.sh
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/run_test.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/run_test.sh
index 9d2a7d851f0..9d2a7d851f0 100755
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/run_test.sh
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/run_test.sh
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/simple_nm_launcher.cpp b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/simple_nm_launcher.cpp
index 67dfbbcd6c9..4ec1f755b43 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/simple_nm_launcher.cpp
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/simple_nm_launcher.cpp
@@ -92,10 +92,17 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       
       ACE_DEBUG ((LM_DEBUG, "*** simple_nm_launcher: calling start\n"));
       na->start ();
-      
+
+#if 0      
       ACE_DEBUG ((LM_DEBUG, "*** simple_nm_launcher: start finished, sleeping 20 seconds.\n"));
       ACE_OS::sleep (20);
       ACE_DEBUG ((LM_DEBUG, "*** simple_nm_launcher: waking up from sleep, calling destroyApplication\n"));
+#else
+      ACE_DEBUG ((LM_DEBUG, "*** simple_nm_launcher: start finished, press key to shut down.\n"));      
+      char c;
+      std::cin >> c;
+      ACE_DEBUG ((LM_DEBUG, "*** simple_nm_launcher: calling destroyApplication\n"));
+#endif
       
       nam->destroyApplication (na.in ());
       
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/start_nm.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/start_nm.sh
index 2531da0129e..b6a5fe66f6c 100755
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/start_nm.sh
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/start_nm.sh
@@ -1,2 +1 @@
 $CIAO_ROOT/DAnCE/bin/dance_node_manager -n FTNode=nm.ior -s $CIAO_ROOT/bin/ciao_ft_componentserver --server-args -ORBInitRef NameService=file://./ns.ior &
-
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/start_ns.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/start_ns.sh
index 425bc28dfff..425bc28dfff 100755
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/start_ns.sh
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/start_ns.sh
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/start_rm.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/start_rm.sh
new file mode 100755
index 00000000000..e11df645e6c
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/start_rm.sh
@@ -0,0 +1,3 @@
+$TAO_ROOT/orbsvcs/examples/FaultTolerance/FLARe/no-RT/ReplicationManager &
+sleep 1
+tao_nsadd --ns file://./ns.ior --name FLARe/ReplicationManager --ior file://./rm.ior
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/stop.sh b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/stop.sh
index dbb064f0cff..dbb064f0cff 100644
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/stop.sh
+++ b/CIAO/DAnCE/tests/CIAO/FaultTolerance-Deployments/stop.sh
diff --git a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/start_rm.sh b/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/start_rm.sh
deleted file mode 100755
index d8008655463..00000000000
--- a/CIAO/DAnCE/tests/CIAO/FaultTolernace-Deployments/start_rm.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-$TAO_ROOT/orbsvcs/examples/FaultTolerance/FLARe/no-RT/ReplicationManager &
-sleep 1
-tao_nsadd --ns file://./ns.ior --name ReplicationManager --ior file://./rm.ior