Fri Oct 21 14:12:49 MST 2005 Yan Dai <dai_y@ociweb.com>

26 files changed, 85 insertions, 9 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 912aff7afd7..d1bbe1c694e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,42 @@
+Fri Oct 21 14:12:49 MST 2005  Yan Dai  <dai_y@ociweb.com>
+
+        * examples/CSD_Strategy/ThreadPool6/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ClientApp.cpp:
+        * examples/CSD_Strategy/ThreadPool5/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool3/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool2/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool4/ServerApp.cpp:
+        * examples/CSD_Strategy/ThreadPool/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ClientApp.cpp:
+        * tests/CSD_Strategy_Tests/Broken/ServerApp.cpp:
+        * performance-tests/CSD_Strategy/TestApps/ServerApp.cpp:
+        
+          Added PI.h include to force statically initialization happen
+          before the TAO_CSD_Object_Adapter::init() is called. This would 
+          resolve the problem that CSD test failures on static builds. 
+          
+        * examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc:
+        * examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc:
+        * examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc:
+        * examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc:
+        * examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc:
+        * examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc:
+        
+          Added dependency on pi base project since the PI.h is included 
+          in the test application.
+          
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp:
+        * tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp:
+          
+          Corrected the conversion specifier (using %u) for unsigned value.
+
 Fri Oct 21 12:25:56 MST 2005  Yan Dai  <dai_y@ociweb.com>
 
         * tao/PI_Server/PI_Server_Loader.cpp:
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
index 33b7e1a515b..eaca4dba4c3 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server) : csd_threadpool, taoexe, portableserver {
+project(*Server) : csd_threadpool, taoexe, portableserver, pi {
   exename = server_main
 
   Source_Files {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
index b036b9ff205..8a107eff964 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
@@ -5,6 +5,9 @@
 #include "ace/Get_Opt.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
index c14935e056d..d29af164197 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): csd_threadpool, taoexe, portableserver {
+project(*Server): csd_threadpool, taoexe, portableserver, pi {
   exename = server_main
 
   Source_Files {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
index a9986df9ec5..30670fa4ee3 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
@@ -6,6 +6,9 @@
 #include "ace/Get_Opt.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
index 04902011dd3..2027024ea50 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): csd_threadpool, taoexe, portableserver {
+project(*Server): csd_threadpool, taoexe, portableserver, pi {
   exename = server_main
 
   Source_Files {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
index 0625e2baf67..0c7aecbc33d 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
@@ -6,6 +6,9 @@
 #include "ace/Get_Opt.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
index 386d4964863..6f6130ec113 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): csd_threadpool, messaging, taoexe, portableserver {
+project(*Server): csd_threadpool, messaging, taoexe, portableserver, pi {
   exename = server_main
 
   Source_Files {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
index 9db3f5c7785..f5e5a1006d8 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
@@ -9,6 +9,9 @@
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
index a5c323adc01..4d65e1d53bf 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): csd_threadpool, taoexe, portableserver {
+project(*Server): csd_threadpool, taoexe, portableserver, pi {
   exename = server_main
 
   Source_Files {
@@ -20,7 +20,7 @@ project(*Server): csd_threadpool, taoexe, portableserver {
   }
 }
 
-project(*Client): csd_threadpool, taoexe, portableserver {
+project(*Client): csd_threadpool, taoexe, portableserver, pi {
   exename = client_main
 
   Source_Files {
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
index 02db9e8a2f2..36adb94e0d8 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
@@ -6,6 +6,9 @@
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ClientApp::ClientApp()
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
index 2e996f83e15..b8cd5ed04a1 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
@@ -7,6 +7,9 @@
 #include "ace/Get_Opt.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
index fc53a3a81c2..293bcefe2a6 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): csd_threadpool, taoexe, portableserver, minimum_corba {
+project(*Server): csd_threadpool, taoexe, portableserver, minimum_corba, pi {
   exename = server_main
   idlflags -= -Sc
 
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
index 08584619c8a..62de607a4fb 100644
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
@@ -6,6 +6,9 @@
 #include "ace/Get_Opt.h"
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
index 2a01df0f410..e4b93d660e5 100644
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
@@ -9,6 +9,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/Time_Value.h"
 #include "ace/High_Res_Timer.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
index f9d264a5ed7..85078bb438d 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
@@ -6,6 +6,9 @@
 #include "TestAppExceptionC.h"
 #include "Foo_B_ClientEngine.h"
 #include "ace/Get_Opt.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ClientApp::ClientApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
index e84221c8a35..9d256770725 100644
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
@@ -8,6 +8,9 @@
 #include "Callback_i.h"
 #include "ace/OS.h"
 #include "ace/Get_Opt.h"
+// To force static load the service.
+#include "tao/PI/PI.h"
+#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 
 ServerApp::ServerApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
index d282c058b8e..c2f9b07d6c9 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
@@ -155,7 +155,7 @@ Foo_B_Statistics::actual_vs_expected()
             for (unsigned k = 0; k < actual_size; k++)
               {
                 unsigned client_id;
-                sscanf (this->actual_in_string_[i][k].c_str(), "%d %s", &client_id, buffer);
+                sscanf (this->actual_in_string_[i][k].c_str(), "%u %s", &client_id, buffer);
                 if (ACE_OS::strcmp (buffer, ONEWAY_ARG_TEST_STR) != 0)
                   {
                     return false;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
index 73105ff1713..c7e648bb2af 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
@@ -212,7 +212,7 @@ Foo_B_i::test_var_array_arg(const Var_Array messages
     unsigned client_id = 0;
     unsigned str_id = 0;
     char test_str[20];
-    sscanf (messages[i].in (), "%d %s %d", &client_id, test_str, &str_id);
+    sscanf (messages[i].in (), "%u %s %u", &client_id, test_str, &str_id);
 
     if (str_id != i)
     {
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
index a386c21d049..df0e6d771c6 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
@@ -8,6 +8,7 @@
 #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
 #include "tao/Intrusive_Ref_Count_Handle_T.h"
 // To force static load the service.
+#include "tao/PI/PI.h"
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 ServerApp::ServerApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
index 8219f7bf2f1..30c2666fb95 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
@@ -8,6 +8,7 @@
 #include "ace/OS.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
+#include "tao/PI/PI.h"
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 ServerApp::ServerApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
index 85ddc34bb47..0f7663010e8 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
@@ -7,6 +7,7 @@
 #include "Foo_B_ClientEngine.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
+#include "tao/PI/PI.h"
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 ClientApp::ClientApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
index 3366a6abd73..495a9363218 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
@@ -10,6 +10,7 @@
 #include "ace/OS.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
+#include "tao/PI/PI.h"
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 ServerApp::ServerApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
index 93c4ba59b53..ba969ea6906 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
@@ -10,6 +10,7 @@
 #include "ace/OS.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
+#include "tao/PI/PI.h"
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 ServerApp::ServerApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
index 4fc25f46c1c..38dd8c26647 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
@@ -6,6 +6,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 // To force static load the service.
+#include "tao/PI/PI.h"
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
 
 ClientApp::ClientApp()
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
index 348e7987ba8..e1754fb3085 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
@@ -6,6 +6,7 @@
 #include "AppShutdown.h"
 #include "ace/Get_Opt.h"
 // To force static load the service.
+#include "tao/PI/PI.h"
 #include "tao/CSD_ThreadPool/CSD_ThreadPool.h"