ChangeLogTag:Wed Jul 19 17:49:47 UTC 2006 Nanbor Wang <nanbor (a) txcorp (d) com>

4 files changed, 76 insertions, 21 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4ab90ef4356..efaf470a8ed 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,17 @@
+Wed Jul 19 17:49:47 UTC 2006  Nanbor Wang  <nanbor (a) txcorp (d) com>
+
+        * orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp: Enhanced
+          the client to use more than 2 replicas.  The limitation of using
+          2 replicas was causing the client to exit when one of the server
+          crashes.  This is due to the way ACE_TMCase handling a single
+          server as a fault.  But allowing more than 2 replicas, the 2
+          remaining servers can continue to work and thus demonstrate how
+          FT work.
+
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp: 
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h: 
+          Minor fixup to throw spec.
+        
 Wed Jul 19 17:07:12 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * TAO_IDL/be/be_visitor_arg_traits.cpp:
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
index 82f7c9d16ed..d3c4a92cde6 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
@@ -41,7 +41,7 @@ set_state (CORBA::Any const& state)
 CORBA::Short
 RolyPoly_i::number (char *&str
                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
+  ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E))
 {
   CORBA::string_free (str);
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
index a9fd7a706a0..86098f033e9 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.h
@@ -29,7 +29,7 @@ public:
   //
   virtual CORBA::Short
   number (char *&s ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
+    ACE_THROW_SPEC ((CORBA::SystemException, RolyPoly::E));
 
   virtual void
   shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index 7aff9a4a1bd..af43025ffa2 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -4,6 +4,8 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/SString.h"
+#include "ace/Unbounded_Queue.h"
 
 // IOR manipulation.
 #include "tao/IORManipulation/IORManip_Loader.h"
@@ -12,9 +14,9 @@
 
 #include "RolyPolyC.h"
 
-const char *ior1 = 0;
-const char *ior2 = 0;
+typedef ACE_Unbounded_Queue<ACE_SString> IOR_QUEUE;
 
+IOR_QUEUE ior_strs;
 
 int
 parse_args (int argc, char *argv[])
@@ -26,13 +28,21 @@ parse_args (int argc, char *argv[])
     switch (c)
     {
     case 'k':
-      if (ior1 == 0) ior1 = get_opts.opt_arg ();
-      else ior2 = get_opts.opt_arg ();
+      {
+      ACE_SString ior(get_opts.opt_arg ());
+      if (ior_strs.enqueue_tail (ior) != 0)
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "Unable to enqueue IOR: %s\n",
+                           ior.c_str ()),
+                          -1);
+      else
+        ACE_DEBUG ((LM_DEBUG, "Enqueued IOR: %s\n", ior.c_str ()));
+      }
       break;
     default:
       ACE_ERROR_RETURN ((LM_ERROR,
                          "Usage:  %s "
-                         "-k IOR_1 -k IOR_2\n",
+                         "-k IOR ...\n",
                          argv[0]),
                         -1);
     }
@@ -56,26 +66,40 @@ main (int argc, char *argv[])
 
       if (::parse_args (argc, argv) != 0) return -1;
 
+      if (ior_strs.is_empty ())
+        ACE_ERROR_RETURN ((LM_ERROR,
+                           "No IOR provided\n"),
+                          -1);
+
       // Start out with the first IOR.  Interaction with the second
       // IOR occurs during the various interceptions executed during
       // this test.
 
       CORBA::Object_var object;
 
-      if (ior2 != 0)
+      if (ior_strs.size() > 1)
       {
         // merge case
 
-        CORBA::Object_var object_primary;
-        CORBA::Object_var object_secondary;
+        ACE_DEBUG ((LM_DEBUG, "We got %d iors\n", ior_strs.size ()));
+        IOR_QUEUE::ITERATOR ior_go = ior_strs.begin ();
+        ACE_SString *pior = 0;
+         while (ior_go.next (pior) != 0)
+           {
+             ACE_DEBUG ((LM_DEBUG, "IOR: %s\n", pior->c_str ()));
+             ior_go.advance ();
+           }
 
-        object_primary = orb->string_to_object (
-          ior1 ACE_ENV_ARG_PARAMETER);
 
-        ACE_CHECK_RETURN (-1);
+        IOR_QUEUE::ITERATOR ior_iter = ior_strs.begin ();
+
+        ACE_SString *ior = 0;
+        ior_iter.next (ior);
 
-        object_secondary = orb->string_to_object (
-          ior2 ACE_ENV_ARG_PARAMETER);
+        CORBA::Object_var object_primary;
+
+        object_primary =
+          orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
 
         ACE_CHECK_RETURN (-1);
 
@@ -92,11 +116,23 @@ main (int argc, char *argv[])
 
 
         // Create the list
-        TAO_IOP::TAO_IOR_Manipulation::IORList iors (2);
-        iors.length(2);
-        iors [0] = CORBA::Object::_duplicate (object_primary.in ());
-        iors [1] = CORBA::Object::_duplicate (object_secondary.in ());
-
+        TAO_IOP::TAO_IOR_Manipulation::IORList iors (ior_strs.size ());
+        iors.length(ior_strs.size ());
+        size_t cntr = 0;
+        iors [cntr] = CORBA::Object::_duplicate (object_primary.in ());
+        
+        while (ior_iter.advance ())
+          {
+            ++cntr;
+            ior_iter.next (ior);
+            ACE_DEBUG ((LM_DEBUG, "IOR%d: %s\n",cntr, ior->c_str ()));
+            iors [cntr] =
+              orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
+
+            ACE_CHECK_RETURN (-1);
+          }
+
+        ACE_DEBUG ((LM_DEBUG, "Prepare to merge IORs.\n"));
         // Create a merged set 1;
         object = iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
 
@@ -140,7 +176,12 @@ main (int argc, char *argv[])
       }
       else
       {
-        object = orb->string_to_object (ior1 ACE_ENV_ARG_PARAMETER);
+        ACE_SString *ior = 0;
+        if (ior_strs.get (ior) != 0)
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Unable to extract the only IOR string\n"),
+                            -1);
+        object = orb->string_to_object (ior->c_str() ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }