Wed Jan 24 14:00:12 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

9 files changed, 29 insertions, 50 deletions

diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index 9a013dadf0b..d1c1b3866e6 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -35,12 +35,10 @@ main (int argc, char *argv [])
     {
       int r = demux_test_client.init (argc, argv
                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
       if (r == -1)
         return -1;
 
-      demux_test_client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      demux_test_client.run ();
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index c8a5bcd7a4b..62eb0bcd746 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -68,7 +68,6 @@ Demux_Test_Client::init (int argc, char *argv []
       ACE_RE_THROW_EX (GET_ORB);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // now parse the rest of the arguments to determine the POA depth, the number
   // of objects with each POA and other info
@@ -130,7 +129,6 @@ Demux_Test_Client::init (int argc, char *argv []
             ACE_RE_THROW_EX (IOR);
           }
         ACE_ENDTRY;
-        ACE_CHECK_RETURN (-1);
       } // j and i loop
 
   ACE_OS::fclose (this->ior_fp_);
@@ -255,7 +253,7 @@ Demux_Test_Client::parse_args (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
+Demux_Test_Client::run (void)
 {
   // open a temporary results file
   if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -270,19 +268,19 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
       switch (this->is_)
         {
         case Demux_Test_Client::LINEAR:
-          (void) this->run_linear_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_linear_test ();
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::RANDOM:
-          (void) this->run_random_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_random_test ();
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::BEST:
-          (void) this->run_best_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_best_test ();
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::WORST:
-          (void) this->run_worst_test (ACE_ENV_SINGLE_ARG_PARAMETER);
+          (void) this->run_worst_test ();
           ACE_TRY_CHECK_EX (RUN);
           break;
         }
@@ -297,14 +295,13 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
       ACE_RE_THROW_EX (RUN);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   ACE_OS::fclose (this->result_fp_);
 
   ACE_TRY_EX (SHUTDOWN)
     {
       // call the shutdown method one the first object
-      this->demux_test_[0][0]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->demux_test_[0][0]->shutdown ();
       ACE_TRY_CHECK_EX (SHUTDOWN);
     }
   ACE_CATCHANY
@@ -317,7 +314,6 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
       ACE_RE_THROW_EX (SHUTDOWN) ;
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
       // now print the results
   if (this->print_results () == -1)
@@ -332,7 +328,7 @@ Demux_Test_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL)
+Demux_Test_Client::run_linear_test (void)
 {
   CORBA::ULong j, k, l, m;
   ACE_hrtime_t start, end;
@@ -362,7 +358,7 @@ Demux_Test_Client::run_linear_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Demux_Test_Client::run_random_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_random_test (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Random test\n"));
@@ -370,7 +366,7 @@ Demux_Test_Client::run_random_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-Demux_Test_Client::run_best_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_best_test (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Best Test\n"));
@@ -378,7 +374,7 @@ Demux_Test_Client::run_best_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-Demux_Test_Client::run_worst_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+Demux_Test_Client::run_worst_test (void)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Worst test\n"));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index 7b0a3714f32..23645d7c95d 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -54,7 +54,7 @@ public:
   int init (int argc, char *argv [] ACE_ENV_ARG_DECL_WITH_DEFAULTS);
   // initialize the client test bed
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run (void);
   // run the tests
 
 private:
@@ -65,16 +65,16 @@ private:
   int init_operation_db (void);
   // initialize the operation database
 
-  int run_linear_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_linear_test (void);
   // run linear strategy
 
-  int run_random_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_random_test (void);
   // run random strategy
 
-  int run_best_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_best_test (void);
   // run best strategy (w.r.t to linear)
 
-  int run_worst_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  int run_worst_test (void);
   // run worst strategy (w.r.t to linear)
 
   int print_results (void);
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.inl b/TAO/performance-tests/POA/Demux/demux_test_client.inl
index 0d2081ee78c..3661e2ecafb 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.inl
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.inl
@@ -2,13 +2,13 @@
 static void M302 (Demux_Test_ptr objref
                   ACE_ENV_ARG_DECL)
 {
-  objref->M302 (ACE_ENV_SINGLE_ARG_PARAMETER);
+  objref->M302 ();
 }
 
 static void shutdown (Demux_Test_ptr objref
                       ACE_ENV_ARG_DECL)
 {
-  objref->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
+  objref->shutdown ();
 }
 
 int Demux_Test_Client::init_operation_db (void)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index c8810c36650..0d0a304bf28 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -12,12 +12,12 @@ Demux_Test_i::Demux_Test_i (void)
 Demux_Test_i::~Demux_Test_i (void)
 {}
 
-void Demux_Test_i::M302 (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Demux_Test_i::M302 (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void Demux_Test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+void Demux_Test_i::shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index 6d302340364..f82ed896160 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -29,10 +29,10 @@ public:
       return PortableServer::POA::_duplicate (this->poa_.in ());
     };
 
-  virtual void M302 (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void M302 (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  virtual void shutdown (void)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 308a59127c6..a75df48a556 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -69,7 +69,6 @@ Demux_Test_Server::init (int argc, char *argv []
       ACE_RE_THROW_EX (GET_ORB);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // Grab the ROOT POA
   ACE_TRY_EX (GET_ROOT_POA)
@@ -99,14 +98,13 @@ Demux_Test_Server::init (int argc, char *argv []
       ACE_RE_THROW_EX (GET_ROOT_POA);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // grab the POA Manager
   ACE_TRY_EX (GET_POA_MGR)
     {
 
       this->poa_mgr_ =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->root_poa_->the_POAManager ();
       ACE_TRY_CHECK_EX (GET_POA_MGR);
     }
   ACE_CATCHANY
@@ -116,7 +114,6 @@ Demux_Test_Server::init (int argc, char *argv []
       ACE_RE_THROW_EX (GET_POA_MGR);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // now parse the rest of the arguments to determine the POA depth, the number
   // of objects with each POA and other info
@@ -194,7 +191,6 @@ Demux_Test_Server::init (int argc, char *argv []
       ACE_RE_THROW_EX (POLICY);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // now create a POA hierarchy of the desired depth and populate each POA with
   // the specified number of objects. Finally, activate these objects.
@@ -243,7 +239,6 @@ Demux_Test_Server::init (int argc, char *argv []
           ACE_RE_THROW_EX (CREATE_POA);
         }
       ACE_ENDTRY;
-      ACE_CHECK_RETURN (-1);
 
       for (j = 0; j < this->num_objs_; j++)
         {
@@ -271,7 +266,6 @@ Demux_Test_Server::init (int argc, char *argv []
                   ACE_RE_THROW_EX (ACTIVATE_OBJ);
                 }
               ACE_ENDTRY;
-              ACE_CHECK_RETURN (-1);
 
               // Get the IOR and output it to the file
               ACE_TRY_EX (IOR)
@@ -294,7 +288,6 @@ Demux_Test_Server::init (int argc, char *argv []
                   ACE_RE_THROW_EX (IOR);
                 }
               ACE_ENDTRY;
-              ACE_CHECK_RETURN (-1);
             }
           else
             {
@@ -323,17 +316,14 @@ Demux_Test_Server::init (int argc, char *argv []
                   this->child_poa_[i]->activate_object_with_id (oid.in (),
                                                                 demux_test_i_ptr
                                                                 ACE_ENV_ARG_PARAMETER);
-                  ACE_TRY_CHECK;
 
                   // Get Object reference for demux_test_i impl object.
-                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+                  CORBA::Object_var demux_var = demux_test_i_ptr->_this ();
 
-                  ACE_TRY_CHECK;
 
                   CORBA::String_var ior = this->orb_->object_to_string
                     (demux_var.in () ACE_ENV_ARG_PARAMETER);
 
-                  ACE_TRY_CHECK;
 
                   ACE_OS::fprintf (this->ior_fp_, "%s\n", ior.in ());
 
@@ -345,7 +335,6 @@ Demux_Test_Server::init (int argc, char *argv []
                   ACE_RE_THROW;
                 }
               ACE_ENDTRY;
-              ACE_CHECK_RETURN (-1);
 
             }// end of if (!use_user_id_)
 
@@ -362,7 +351,7 @@ Demux_Test_Server::init (int argc, char *argv []
 
   ACE_TRY_EX (ACTIVATE)
     {
-      this->poa_mgr_->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->poa_mgr_->activate ();
 
       ACE_TRY_CHECK_EX (ACTIVATE);
     }
@@ -373,7 +362,6 @@ Demux_Test_Server::init (int argc, char *argv []
       ACE_RE_THROW_EX (ACTIVATE);
     }
   ACE_ENDTRY;
-  ACE_CHECK_RETURN (-1);
 
   // success
   return 0;
@@ -471,12 +459,11 @@ Demux_Test_Server::init_naming_service (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Server::run (ACE_ENV_SINGLE_ARG_DECL)
+Demux_Test_Server::run (void)
 {
   ACE_TRY
     {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      this->orb_->run ();
     }
   ACE_CATCHANY
     {
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index e26ce828e0c..63408010b76 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -39,7 +39,7 @@ public:
   ~Demux_Test_Server (void);
   // dtor
 
-  int run (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
+  int run (void);
   // Execute client code.
 
   int init (int argc, char **argv ACE_ENV_ARG_DECL_NOT_USED);
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index 629bb31cf5f..3cbd4a9d955 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -35,13 +35,11 @@ int main (int argc, char *argv [])
     {
       int r =
         demux_test_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
 
       if (r == -1)
         return -1;
 
-      demux_test_server.run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      demux_test_server.run ();
     }
   ACE_CATCH (CORBA::SystemException, sysex)
     {