ChangeLogTag:Mon Mar 26 13:06:10 2001 Carlos O'Ryan <coryan@uci.edu>

21 files changed, 52 insertions, 26 deletions

diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 21df4573b40..8273d5089ca 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -18,8 +18,9 @@
 //
 // ============================================================================
 
-#include "tao/corba.h"
 #include "tao/DynamicInterface/Request.h"
+#include "tao/corba.h"
+#include "tao/debug.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index 81a18dd43e6..c0bfb09ba5d 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
-#include "ace/Env_Value_T.h"
-#include "ace/Read_Buffer.h"
 #include "Cubit_Client.h"
+#include "RTI_IO.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/TAO_Internal.h"
-#include "RTI_IO.h"
+#include "tao/debug.h"
+
+#include "ace/Env_Value_T.h"
+#include "ace/Read_Buffer.h"
 
 ACE_RCSID(IDL_Cubit, Cubit_Client, "Cubit_Client.cpp,v 1.31 1999/08/04 07:15:14 nanbor Exp")
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index adba5a30843..f54292b49bb 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -2,6 +2,7 @@
 
 #include "Cubit_Server.h"
 #include "tao/TAO_Internal.h"
+#include "tao/debug.h"
 
 ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$")
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index cf43571a2e5..91ad25fbc62 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -13,13 +13,15 @@
 //
 // ============================================================================
 
-#include "tao/corba.h"
-#include "ace/Auto_Ptr.h"
 #include "Cubit_Client.h"
 #include "Cubit_i.h"
+#include "RTI_IO.h"
 
+#include "tao/corba.h"
+#include "tao/debug.h"
 #include "tao/Timeprobe.h"
-#include "RTI_IO.h"
+
+#include "ace/Auto_Ptr.h"
 
 ACE_RCSID(IDL_Cubit, Cubit_Client, "Cubit_i.cpp,v 1.8 1999/07/07 15:01:28 irfan Exp")
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 6ba2e717743..88eccdfb857 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
+#include "Cubit_Client.h"
+#include "Cubit_Server.h"
+
 #include "ace/Synch.h"
 #include "ace/Get_Opt.h"
 #include "ace/ARGV.h"
-#include "Cubit_Client.h"
-#include "Cubit_Server.h"
+#include "ace/Thread_Manager.h"
 
 ACE_RCSID(IDL_Cubit, collocation_test, "$Id$")
 
diff --git a/TAO/performance-tests/Latency/ami-latency-client.cpp b/TAO/performance-tests/Latency/ami-latency-client.cpp
index 6b4349a464b..89a1c3d3f9a 100644
--- a/TAO/performance-tests/Latency/ami-latency-client.cpp
+++ b/TAO/performance-tests/Latency/ami-latency-client.cpp
@@ -1,11 +1,12 @@
 // $Id$
 
+#include "testS.h"
+#include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
-#include "testS.h"
 
 ACE_RCSID(Latency, client, "$Id$")
 
diff --git a/TAO/performance-tests/Latency/ami-throughput-client.cpp b/TAO/performance-tests/Latency/ami-throughput-client.cpp
index feec94f45c7..bb038b48d5b 100644
--- a/TAO/performance-tests/Latency/ami-throughput-client.cpp
+++ b/TAO/performance-tests/Latency/ami-throughput-client.cpp
@@ -1,11 +1,12 @@
 // $Id$
 
+#include "testS.h"
+#include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
-#include "testS.h"
 
 ACE_RCSID(Latency, client, "$Id$")
 
diff --git a/TAO/performance-tests/Latency/client.cpp b/TAO/performance-tests/Latency/client.cpp
index 11a15d61a18..983c3b50725 100644
--- a/TAO/performance-tests/Latency/client.cpp
+++ b/TAO/performance-tests/Latency/client.cpp
@@ -1,11 +1,12 @@
 // $Id$
 
+#include "testC.h"
+#include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
-#include "testC.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
diff --git a/TAO/performance-tests/Latency/st_client.cpp b/TAO/performance-tests/Latency/st_client.cpp
index ee8b4ea1278..c750a23b227 100644
--- a/TAO/performance-tests/Latency/st_client.cpp
+++ b/TAO/performance-tests/Latency/st_client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "testC.h"
+#include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index 4639d8380cd..b657312df7b 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -17,6 +17,7 @@
 
 
 #include "demux_test_client.h"
+#include "tao/debug.h"
 
 ACE_RCSID(CodeGen, client, "$Id$")
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 76ebc264c62..c6a774aa9b8 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #include "demux_test_client.h"
+#include "tao/debug.h"
 
 // Constructor
 Demux_Test_Client::Demux_Test_Client (void)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index bdab3241871..b2bf2d2b63d 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -2,6 +2,7 @@
 // Implementation of TAO's Demux_Test interface
 
 #include "demux_test_i.h"
+#include "tao/ORB_Core.h"
 
 // ctor
 Demux_Test_i::Demux_Test_i (void)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index b9f3e59ce4d..821f2bd00e4 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -14,6 +14,7 @@
 // ============================================================================
 
 #include "demux_test_server.h"
+#include "tao/debug.h"
 
 ACE_RCSID(CodeGen, demux_test_server, "$Id$")
 
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index d23adde825b..f8fd3773138 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -17,6 +17,7 @@
 
 
 #include "demux_test_server.h"
+#include "tao/debug.h"
 
 ACE_RCSID(CodeGen, server, "$Id$")
 
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index cfa1d925660..82b943363e6 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -19,6 +19,8 @@
 // ================================================================
 
 #include "testS.h"
+#include "tao/Server_Strategy_Factory.h"
+#include "tao/ORB_Core.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 9d4c63047e7..d70834d4f29 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "ace/Read_Buffer.h"
 #include "PP_Test_Client.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/TAO_Internal.h"
+#include "tao/debug.h"
+
+#include "ace/Read_Buffer.h"
 
 ACE_RCSID(IDL_Cubit, Cubit_Client, "$Id$")
 
@@ -275,14 +277,14 @@ PP_Test_Client::shutdown_server (int do_shutdown)
     {
       if (do_shutdown)
         {
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "shutdown on Pluggable_Test object\n"));
 
           this->objref_->shutdown (ACE_TRY_ENV);
 
           ACE_TRY_CHECK;
 
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "server, please ACE_OS::exit"));
         }
     }
@@ -317,7 +319,7 @@ PP_Test_Client::run_oneway (void)
 
       if (this->shutdown_)
         {
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "shutdown on Pluggable_Test object\n"));
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
@@ -325,7 +327,7 @@ PP_Test_Client::run_oneway (void)
           this->objref_->shutdown (ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "server, please ACE_OS::exit"));
         }
     }
@@ -360,7 +362,7 @@ PP_Test_Client::run_void (void)
 
       if (this->shutdown_)
         {
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "shutdown on Pluggable_Test object\n"));
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
@@ -368,7 +370,7 @@ PP_Test_Client::run_void (void)
           this->objref_->shutdown (ACE_TRY_ENV);
           ACE_TRY_CHECK;
 
-          ACE_DEBUG ((LM_DEBUG, 
+          ACE_DEBUG ((LM_DEBUG,
                       "server, please ACE_OS::exit"));
         }
     }
@@ -476,4 +478,3 @@ PP_Test_Client::init (int argc, char **argv)
   ACE_ENDTRY;
   return 0;
 }
-
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index 1f6a7ed4bd7..8f91dae07e7 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -2,6 +2,7 @@
 
 #include "PP_Test_Server.h"
 #include "tao/TAO_Internal.h"
+#include "tao/debug.h"
 
 ACE_RCSID(IDL_Cubit, Cubit_Server, "$Id$")
 
@@ -27,7 +28,7 @@ PP_Test_Server::parse_args (void)
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
-                             get_opts.optarg), 
+                             get_opts.optarg),
                             -1);
         break;
       case '?':
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 97c1a9d380b..f3f6cb0a454 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "testC.h"
+#include "tao/RT_CORBA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ace/Stats.h"
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 54b0228aa24..7b768d0ea90 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "test_i.h"
-#include "tao/debug.h"
 #include "ace/ACE.h"
 
 ACE_RCSID(Reliable, test_i, "$Id$")
diff --git a/TAO/performance-tests/Thruput/TAO/client.cpp b/TAO/performance-tests/Thruput/TAO/client.cpp
index 5098c471fd7..3110c6ec9d6 100644
--- a/TAO/performance-tests/Thruput/TAO/client.cpp
+++ b/TAO/performance-tests/Thruput/TAO/client.cpp
@@ -16,11 +16,14 @@
 //
 // ============================================================================
 
+#include "ttcpC.h"
+#include "ttcp_decl.h"
+
+#include "tao/debug.h"
+
 #include "ace/ACE.h"
 #include "ace/Read_Buffer.h"
 #include "ace/Get_Opt.h"
-#include "ttcpC.h"
-#include "ttcp_decl.h"
 
 ACE_RCSID(TAO, client, "$Id$")
 
diff --git a/TAO/performance-tests/Thruput/TAO/server.cpp b/TAO/performance-tests/Thruput/TAO/server.cpp
index e85995bca84..842ef5903a4 100644
--- a/TAO/performance-tests/Thruput/TAO/server.cpp
+++ b/TAO/performance-tests/Thruput/TAO/server.cpp
@@ -14,11 +14,13 @@
 //
 // ============================================================================
 
+#include "ttcp_i.h"
+
+#include "tao/debug.h"
+
 #include "ace/ACE.h"
 #include "ace/Get_Opt.h"
 
-#include "ttcp_i.h"
-
 ACE_RCSID(TAO, server, "$Id$")
 
 char Usage[] = "\