Mon Apr 12 12:33:31 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * performance-tests/Benchmark/RoundTrip/client.cpp:
          Const change

        * ciao/Servants/Connector_Servant_Impl_Base.cpp:
        * ciao/Servants/Servant_Impl_Base.cpp:
          Use regular guards instead of rw guards

4 files changed, 33 insertions, 24 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index db24b477146..65c2f84cc60 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,12 @@
+Mon Apr 12 12:33:31 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * performance-tests/Benchmark/RoundTrip/client.cpp:
+          Const change
+
+        * ciao/Servants/Connector_Servant_Impl_Base.cpp:
+        * ciao/Servants/Servant_Impl_Base.cpp:
+          Use regular guards instead of rw guards
+
 Mon Apr 12 12:20:31 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * performance-tests/Benchmark/Multi_Threaded/Client_Task.cpp
diff --git a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
index 756d4d3f203..417ef484e49 100644
--- a/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Connector_Servant_Impl_Base.cpp
@@ -474,8 +474,8 @@ namespace CIAO
     entry.second = safe._retn ();
 
     {
-      ACE_WRITE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_,
-                                CORBA::NO_RESOURCES ());
+      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_,
+                          CORBA::NO_RESOURCES ());
 
       (void) this->facet_table_.insert (entry);
     }
@@ -496,10 +496,10 @@ namespace CIAO
         return CORBA::Object::_nil ();
       }
 
-    ACE_READ_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                             mon,
-                             this->lock_,
-                             CORBA::NO_RESOURCES ());
+    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
+                        mon,
+                        this->lock_,
+                        CORBA::NO_RESOURCES ());
 
     FacetTable::const_iterator iter = this->facet_table_.find (port_name);
 
@@ -529,10 +529,10 @@ namespace CIAO
     ::Components::FacetDescription_var fd;
 
     {
-      ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                             mon,
-                             this->lock_,
-                             0);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
+                        mon,
+                        this->lock_,
+                        0);
       FacetTable::const_iterator iter =
         this->facet_table_.find (port_name);
 
diff --git a/CIAO/ciao/Servants/Servant_Impl_Base.cpp b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
index 13f7e557af9..b61d8647790 100644
--- a/CIAO/ciao/Servants/Servant_Impl_Base.cpp
+++ b/CIAO/ciao/Servants/Servant_Impl_Base.cpp
@@ -294,8 +294,8 @@ namespace CIAO
     entry.first = port_name;
     entry.second = safe._retn ();
 
-    ACE_WRITE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_,
-                              CORBA::NO_RESOURCES ());
+    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, mon, this->lock_,
+                        CORBA::NO_RESOURCES ());
 
     (void) this->consumer_table_.insert (entry);
 #endif
@@ -312,10 +312,10 @@ namespace CIAO
         return ::Components::EventConsumerBase::_nil ();
       }
 
-    ACE_READ_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                             mon,
-                             this->lock_,
-                             CORBA::NO_RESOURCES ());
+    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
+                        mon,
+                        this->lock_,
+                        CORBA::NO_RESOURCES ());
 
     ConsumerTable::const_iterator iter =
       this->consumer_table_.find (port_name);
@@ -352,10 +352,10 @@ namespace CIAO
     ConsumerTable::const_iterator iter;
 
     {
-      ACE_READ_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
-                               mon,
-                               this->lock_,
-                               CORBA::NO_RESOURCES ());
+      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX,
+                          mon,
+                          this->lock_,
+                          CORBA::NO_RESOURCES ());
 
       iter = this->consumer_table_.find (port_name);
 
diff --git a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index dd85e7b77d1..a365068b76f 100644
--- a/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -133,18 +133,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
       for (int i = 0; i < niterations; ++i)
         {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
+          ACE_hrtime_t const start = ACE_OS::gethrtime ();
 
-          //Test value to be sent to the server
+          // Test value to be sent to the server
           long test = 0;
 
           (void) round_trip->makeCall (test);
 
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
+          ACE_hrtime_t const now = ACE_OS::gethrtime ();
           history.sample (now - start);
         }
 
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
+      ACE_hrtime_t const test_end = ACE_OS::gethrtime ();
 
       ACE_DEBUG ((LM_DEBUG, "test finished\n"));