Wed Dec 7 10:59:55 USMST 2005 Yan Dai <dai_y@ociweb.com>

4 files changed, 36 insertions, 2 deletions

diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
index d4158bf5324..8438b572ce2 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
@@ -23,6 +23,6 @@ Callback_i::test_method(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 void
 Callback_i::gather_stats(Foo_B_Statistics& stats) 
 {
-  stats.actual_callbacks(this->num_callbacks_.value ());
+  stats.actual_callbacks(this->num_callbacks_);
 }
 
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
index f0493fb8397..8948435ceed 100644
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
@@ -24,7 +24,7 @@ class CSD_TP_Foo_B_Export Callback_i
 
   private:
 
-     ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> num_callbacks_;
+     unsigned num_callbacks_;
 };
 
 
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 c2f9b07d6c9..c2306c2a250 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
@@ -90,6 +90,8 @@ Foo_B_Statistics::actual_vs_expected()
   // Verify the checking results in servant operation code.
   if (this->servant_error_count_ > 0)
     {
+      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+        "servant_error_count_=%u\n", servant_error_count_));
       return false;
     }
 
@@ -97,6 +99,9 @@ Foo_B_Statistics::actual_vs_expected()
   // client.
   if (actual_callbacks_ != expected_callbacks_)
     {
+      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+        "actual_callbacks_=%u expected_callbacks_=%u \n", 
+        actual_callbacks_, expected_callbacks_));
       return false;
     }
 
@@ -105,6 +110,9 @@ Foo_B_Statistics::actual_vs_expected()
     {
       if (this->expected_op_count_[z] != this->actual_op_count_[z])
         {
+          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+            "expected_op_count_[%u]=%u actual_op_count_[%u]=%u \n", 
+            z, expected_op_count_[z], z, actual_op_count_[z]));
           return false;
         }
     }
@@ -124,6 +132,8 @@ Foo_B_Statistics::actual_vs_expected()
               = this->num_clients_ * stats.expected_op_count_[i];
             if (actual_size != expected_size)
               {
+                ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+                  "actual_size=%u expected_size=%u\n", actual_size, expected_size));
                 return false;
               }
             sort (this->actual_in_long_[i]);
@@ -132,6 +142,9 @@ Foo_B_Statistics::actual_vs_expected()
               {
                 if (this->actual_in_long_[i][j] != this->actual_in_long_[i][j + 1] - 1)
                   {
+                    ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+                      "actual_in_long_[%u][%u]=%d actual_in_long_[%u][%u]=%d\n", 
+                      i, j, actual_in_long_[i][j], i, j+1, actual_in_long_[i][j + 1]));
                     return false;
                   }
               }
@@ -146,6 +159,8 @@ Foo_B_Statistics::actual_vs_expected()
               = this->num_clients_ * stats.expected_op_count_[i];
             if (actual_size != expected_size)
               {
+                ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+                  "actual_size=%u expected_size=%u\n", actual_size, expected_size));
                 return false;
               }
 
@@ -158,6 +173,9 @@ Foo_B_Statistics::actual_vs_expected()
                 sscanf (this->actual_in_string_[i][k].c_str(), "%u %s", &client_id, buffer);
                 if (ACE_OS::strcmp (buffer, ONEWAY_ARG_TEST_STR) != 0)
                   {
+                    ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+                      "actual_in_string_[%u][%u]=%s \n", 
+                      i, k, actual_in_string_[i][k].c_str()));
                     return false;
                   }
                 lvec.push_back (client_id);
@@ -169,6 +187,9 @@ Foo_B_Statistics::actual_vs_expected()
               {
                 if (lvec[j] != lvec[j + 1] - 1)
                   {
+                    ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
+                      "lvec[%u]=%d lvec[%u]=%d\n", 
+                      j, lvec[j], j+1, lvec[j + 1]));
                     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 0fc1f37b12e..5ee8d0b8690 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
@@ -93,6 +93,8 @@ Foo_B_i::op7(Callback_ptr cb
   if (CORBA::is_nil (cb))
     {
       error_count_ ++;
+      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::op7  nil callback error_count %u\n",
+        error_count_));
       ACE_THROW (FooException ());
     }
   else
@@ -145,6 +147,9 @@ Foo_B_i::test_fixed_array_arg(const Fixed_Array message
       if (message[i] != message[i + 1] -1)
         {
           error_count_ ++;
+          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_fixed_array_arg:  value checking failed "
+            "- message[%u]=%d message[%u]=%d error_count=%u\n",
+            i, message[i], i+1, message[i + 1], error_count_));
           break;
         }
     }
@@ -218,6 +223,8 @@ Foo_B_i::test_var_array_arg(const Var_Array messages
     if (str_id != i)
     {
       error_count_ ++;
+      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_var_array_arg:  str_id checking failed "
+        "- str_id=%u i=%u error_count_=%u\n", str_id, i, error_count_));
     }
 
     if (i == 0)
@@ -227,6 +234,9 @@ Foo_B_i::test_var_array_arg(const Var_Array messages
     else if (client_id != cur_client_id) 
     {
        error_count_ ++;
+       ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_var_array_arg:  client_id checking failed "
+        "- client_id=%u cur_client_id=%u error_count_=%u\n", 
+        client_id, cur_client_id, error_count_));
     }
   }
   this->in_string_[13].push_back (messages[0].in ());
@@ -247,6 +257,9 @@ Foo_B_i::test_special_basic_arg(CORBA::Boolean value,
   if (expected_special_value != value)
     {
       error_count_ ++;
+      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_special_basic_arg  "
+        "value checking failed - client_id %d got value %d error_count=%u\n",
+        client_id, value, error_count_));
     }
 }