[rhmessaging-commits] rhmessaging commits: r2077 - store/trunk/cpp/lib/gen/qpid/management.

rhmessaging-commits at lists.jboss.org rhmessaging-commits at lists.jboss.org
Thu May 22 11:53:51 EDT 2008


Author: tedross
Date: 2008-05-22 11:53:50 -0400 (Thu, 22 May 2008)
New Revision: 2077

Modified:
   store/trunk/cpp/lib/gen/qpid/management/Journal.cpp
   store/trunk/cpp/lib/gen/qpid/management/Journal.h
   store/trunk/cpp/lib/gen/qpid/management/Store.cpp
   store/trunk/cpp/lib/gen/qpid/management/Store.h
Log:
Regenerated management files

Modified: store/trunk/cpp/lib/gen/qpid/management/Journal.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Journal.cpp	2008-05-21 15:55:53 UTC (rev 2076)
+++ store/trunk/cpp/lib/gen/qpid/management/Journal.cpp	2008-05-22 15:53:50 UTC (rev 2077)
@@ -377,7 +377,7 @@
 
 void Journal::writeConfig (Buffer& buf)
 {
-    sys::RWlock::ScopedRlock readLock (accessLock);
+    sys::Mutex::ScopedLock mutex(accessLock);
     configChanged = false;
 
     writeTimestamps (buf);
@@ -393,7 +393,7 @@
 
 void Journal::writeInstrumentation (Buffer& buf, bool skipHeaders)
 {
-    sys::RWlock::ScopedWlock writeLock (accessLock);
+    sys::Mutex::ScopedLock mutex(accessLock);
     instChanged = false;
 
     if (!skipHeaders)

Modified: store/trunk/cpp/lib/gen/qpid/management/Journal.h
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Journal.h	2008-05-21 15:55:53 UTC (rev 2076)
+++ store/trunk/cpp/lib/gen/qpid/management/Journal.h	2008-05-22 15:53:50 UTC (rev 2077)
@@ -105,71 +105,69 @@
 
     // Accessor Methods
     inline void set_name (std::string val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         name = val;
         configChanged = true;
     }
     inline void set_journalDirectory (std::string val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalDirectory = val;
         configChanged = true;
     }
     inline void set_journalBaseFileName (std::string val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalBaseFileName = val;
         configChanged = true;
     }
     inline void set_journalWritePageSize (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalWritePageSize = val;
         configChanged = true;
     }
     inline void set_journalWritePages (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalWritePages = val;
         configChanged = true;
     }
     inline void set_journalReadPageSize (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalReadPageSize = val;
         configChanged = true;
     }
     inline void set_journalReadPages (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalReadPages = val;
         configChanged = true;
     }
     inline void set_initialFileCount (uint16_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         initialFileCount = val;
         instChanged = true;
     }
     inline void set_dataFileSize (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         dataFileSize = val;
         instChanged = true;
     }
     inline void set_journalCurrentFileCount (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalCurrentFileCount = val;
         instChanged = true;
     }
     inline void inc_journalRecordDepth (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalRecordDepth += by;
         if (journalRecordDepthHigh < journalRecordDepth)
             journalRecordDepthHigh = journalRecordDepth;
         instChanged = true;
     }
     inline void dec_journalRecordDepth (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalRecordDepth -= by;
         if (journalRecordDepthLow > journalRecordDepth)
             journalRecordDepthLow = journalRecordDepth;
         instChanged = true;
     }
     inline void set_journalRecordDepth (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalRecordDepth = val;
         if (journalRecordDepthLow  > val)
             journalRecordDepthLow  = val;
@@ -178,51 +176,45 @@
         instChanged = true;
     }
     inline void inc_journalRecordEnqueues (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalRecordEnqueues += by;
         instChanged = true;
     }
     inline void dec_journalRecordEnqueues (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalRecordEnqueues -= by;
         instChanged = true;
     }
     inline void set_journalRecordEnqueues (uint64_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalRecordEnqueues = val;
         instChanged = true;
     }
     inline void inc_journalRecordDequeues (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalRecordDequeues += by;
         instChanged = true;
     }
     inline void dec_journalRecordDequeues (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalRecordDequeues -= by;
         instChanged = true;
     }
     inline void set_journalRecordDequeues (uint64_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalRecordDequeues = val;
         instChanged = true;
     }
     inline void inc_journalOutstandingAIOs (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalOutstandingAIOs += by;
         if (journalOutstandingAIOsHigh < journalOutstandingAIOs)
             journalOutstandingAIOsHigh = journalOutstandingAIOs;
         instChanged = true;
     }
     inline void dec_journalOutstandingAIOs (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalOutstandingAIOs -= by;
         if (journalOutstandingAIOsLow > journalOutstandingAIOs)
             journalOutstandingAIOsLow = journalOutstandingAIOs;
         instChanged = true;
     }
     inline void set_journalOutstandingAIOs (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalOutstandingAIOs = val;
         if (journalOutstandingAIOsLow  > val)
             journalOutstandingAIOsLow  = val;
@@ -231,21 +223,19 @@
         instChanged = true;
     }
     inline void inc_journalFreeFileCount (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalFreeFileCount += by;
         if (journalFreeFileCountHigh < journalFreeFileCount)
             journalFreeFileCountHigh = journalFreeFileCount;
         instChanged = true;
     }
     inline void dec_journalFreeFileCount (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalFreeFileCount -= by;
         if (journalFreeFileCountLow > journalFreeFileCount)
             journalFreeFileCountLow = journalFreeFileCount;
         instChanged = true;
     }
     inline void set_journalFreeFileCount (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalFreeFileCount = val;
         if (journalFreeFileCountLow  > val)
             journalFreeFileCountLow  = val;
@@ -254,21 +244,19 @@
         instChanged = true;
     }
     inline void inc_journalAvailableFileCount (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalAvailableFileCount += by;
         if (journalAvailableFileCountHigh < journalAvailableFileCount)
             journalAvailableFileCountHigh = journalAvailableFileCount;
         instChanged = true;
     }
     inline void dec_journalAvailableFileCount (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalAvailableFileCount -= by;
         if (journalAvailableFileCountLow > journalAvailableFileCount)
             journalAvailableFileCountLow = journalAvailableFileCount;
         instChanged = true;
     }
     inline void set_journalAvailableFileCount (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalAvailableFileCount = val;
         if (journalAvailableFileCountLow  > val)
             journalAvailableFileCountLow  = val;
@@ -277,81 +265,71 @@
         instChanged = true;
     }
     inline void inc_journalWriteWaitFailures (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalWriteWaitFailures += by;
         instChanged = true;
     }
     inline void dec_journalWriteWaitFailures (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalWriteWaitFailures -= by;
         instChanged = true;
     }
     inline void set_journalWriteWaitFailures (uint64_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalWriteWaitFailures = val;
         instChanged = true;
     }
     inline void inc_journalWriteBusyFailures (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalWriteBusyFailures += by;
         instChanged = true;
     }
     inline void dec_journalWriteBusyFailures (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalWriteBusyFailures -= by;
         instChanged = true;
     }
     inline void set_journalWriteBusyFailures (uint64_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalWriteBusyFailures = val;
         instChanged = true;
     }
     inline void inc_journalReadRecordCount (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalReadRecordCount += by;
         instChanged = true;
     }
     inline void dec_journalReadRecordCount (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalReadRecordCount -= by;
         instChanged = true;
     }
     inline void set_journalReadRecordCount (uint64_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalReadRecordCount = val;
         instChanged = true;
     }
     inline void inc_journalReadBusyFailures (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalReadBusyFailures += by;
         instChanged = true;
     }
     inline void dec_journalReadBusyFailures (uint64_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalReadBusyFailures -= by;
         instChanged = true;
     }
     inline void set_journalReadBusyFailures (uint64_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalReadBusyFailures = val;
         instChanged = true;
     }
     inline void inc_journalWritePageCacheDepth (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalWritePageCacheDepth += by;
         if (journalWritePageCacheDepthHigh < journalWritePageCacheDepth)
             journalWritePageCacheDepthHigh = journalWritePageCacheDepth;
         instChanged = true;
     }
     inline void dec_journalWritePageCacheDepth (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalWritePageCacheDepth -= by;
         if (journalWritePageCacheDepthLow > journalWritePageCacheDepth)
             journalWritePageCacheDepthLow = journalWritePageCacheDepth;
         instChanged = true;
     }
     inline void set_journalWritePageCacheDepth (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalWritePageCacheDepth = val;
         if (journalWritePageCacheDepthLow  > val)
             journalWritePageCacheDepthLow  = val;
@@ -360,21 +338,19 @@
         instChanged = true;
     }
     inline void inc_journalReadPageCacheDepth (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalReadPageCacheDepth += by;
         if (journalReadPageCacheDepthHigh < journalReadPageCacheDepth)
             journalReadPageCacheDepthHigh = journalReadPageCacheDepth;
         instChanged = true;
     }
     inline void dec_journalReadPageCacheDepth (uint32_t by = 1){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
         journalReadPageCacheDepth -= by;
         if (journalReadPageCacheDepthLow > journalReadPageCacheDepth)
             journalReadPageCacheDepthLow = journalReadPageCacheDepth;
         instChanged = true;
     }
     inline void set_journalReadPageCacheDepth (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         journalReadPageCacheDepth = val;
         if (journalReadPageCacheDepthLow  > val)
             journalReadPageCacheDepthLow  = val;

Modified: store/trunk/cpp/lib/gen/qpid/management/Store.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Store.cpp	2008-05-21 15:55:53 UTC (rev 2076)
+++ store/trunk/cpp/lib/gen/qpid/management/Store.cpp	2008-05-22 15:53:50 UTC (rev 2077)
@@ -129,7 +129,7 @@
 
 void Store::writeConfig (Buffer& buf)
 {
-    sys::RWlock::ScopedRlock readLock (accessLock);
+    sys::Mutex::ScopedLock mutex(accessLock);
     configChanged = false;
 
     writeTimestamps (buf);
@@ -143,7 +143,7 @@
 
 void Store::writeInstrumentation (Buffer& buf, bool skipHeaders)
 {
-    sys::RWlock::ScopedWlock writeLock (accessLock);
+    sys::Mutex::ScopedLock mutex(accessLock);
     instChanged = false;
 
     if (!skipHeaders)

Modified: store/trunk/cpp/lib/gen/qpid/management/Store.h
===================================================================
--- store/trunk/cpp/lib/gen/qpid/management/Store.h	2008-05-21 15:55:53 UTC (rev 2076)
+++ store/trunk/cpp/lib/gen/qpid/management/Store.h	2008-05-22 15:53:50 UTC (rev 2077)
@@ -77,27 +77,27 @@
 
     // Accessor Methods
     inline void set_brokerRef (uint64_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         brokerRef = val;
         configChanged = true;
     }
     inline void set_location (std::string val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         location = val;
         configChanged = true;
     }
     inline void set_async (uint8_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         async = val;
         configChanged = true;
     }
     inline void set_defaultInitialFileCount (uint16_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         defaultInitialFileCount = val;
         configChanged = true;
     }
     inline void set_defaultDataFileSize (uint32_t val){
-        sys::RWlock::ScopedWlock writeLock (accessLock);
+        sys::Mutex::ScopedLock mutex(accessLock);
         defaultDataFileSize = val;
         configChanged = true;
     }




More information about the rhmessaging-commits mailing list