rhmessaging-commits
December 2008
rhmessaging-commits@lists.jboss.org
- 1 participants
- 133 discussions
rhmessaging commits: r2900 - mgmt/trunk/mint/python/mint.
by rhmessaging-commits＠lists.jboss.org
Author: nunofsantos
Date: 2008-12-01 14:56:35 -0500 (Mon, 01 Dec 2008)
New Revision: 2900
Added:
mgmt/trunk/mint/python/mint/dbexpire.py
Modified:
mgmt/trunk/mint/python/mint/__init__.py
mgmt/trunk/mint/python/mint/schema.py
mgmt/trunk/mint/python/mint/schemaparser.py
mgmt/trunk/mint/python/mint/sql.py
Log:
Add a thread to do periodic cleanup of expired/old records in the database; currently set to delete any stats records older then 24 hours, as well as Job records older than 24 hours
Modified: mgmt/trunk/mint/python/mint/__init__.py
===================================================================
--- mgmt/trunk/mint/python/mint/__init__.py 2008-12-01 16:49:16 UTC (rev 2899)
+++ mgmt/trunk/mint/python/mint/__init__.py 2008-12-01 19:56:35 UTC (rev 2900)
@@ -12,6 +12,7 @@
from mint.schema import *
from mint import update
from mint.cache import MintCache
+from mint.dbexpire import DBExpireThread
from qmf.console import ClassKey
log = logging.getLogger("mint")
@@ -324,6 +325,7 @@
self.__lock = RLock()
self.dbConn = None
+ self.dbExpireThread = dbexpire.DBExpireThread(self)
self.updateThread = update.ModelUpdateThread(self)
self.mgmtSession = qmf.console.Session(self, manageConnections=True)
self.outstandingMethodCalls = dict()
@@ -350,9 +352,11 @@
def start(self):
self.updateThread.start()
+ self.dbExpireThread.start()
def stop(self):
self.updateThread.stop()
+ self.dbExpireThread.stop()
def getSession(self):
return self.mgmtSession
Added: mgmt/trunk/mint/python/mint/dbexpire.py
===================================================================
--- mgmt/trunk/mint/python/mint/dbexpire.py (rev 0)
+++ mgmt/trunk/mint/python/mint/dbexpire.py 2008-12-01 19:56:35 UTC (rev 2900)
@@ -0,0 +1,69 @@
+import logging
+import mint
+import time
+from threading import Thread
+from mint.schema import *
+from sql import *
+
+log = logging.getLogger("mint.dbexpire")
+
+class DBExpireThread(Thread):
+ def __init__(self, model, frequency=600, expiration=24*3600):
+ super(DBExpireThread, self).__init__()
+
+ self.model = model
+ self.setDaemon(False)
+ self.stopRequested = False
+ self.frequency = frequency
+ self.expiration = expiration
+
+ frequency_out, frequency_unit = self.convertTimeUnits(frequency)
+ expiration_out, expiration_unit = self.convertTimeUnits(expiration)
+ log.debug("Expiring database records older than %d %s, every %d %s" \
+ % (expiration_out, expiration_unit, frequency_out, frequency_unit))
+
+ def run(self):
+ ops = []
+ for cls in mint.schema.statsClasses:
+ ops.append(SqlExpire(eval(cls)))
+ ops.append(SqlExpire(Job))
+
+ attrs = dict()
+ attrs["expiration"] = self.expiration
+
+ conn = self.model.dbConn.getConnection()
+
+ while True:
+ try:
+ if self.stopRequested:
+ break
+
+ cursor = conn.cursor()
+ rowcount = 0
+ for op in ops:
+ rowcount += op.execute(cursor, attrs)
+ log.debug("%d records expired" % (rowcount))
+ conn.commit()
+
+ time.sleep(self.frequency)
+ except:
+ conn.rollback()
+ log.exception("DB cleanup failed")
+
+ def stop(self):
+ self.stopRequested = True
+
+ def convertTimeUnits(self, t):
+ if t / (24*3600) >= 1:
+ t_out = t / (24*3600)
+ t_unit = "days"
+ elif t / 3600 >= 1:
+ t_out = t / 3600
+ t_unit = "hours"
+ elif t / 60 >= 1:
+ t_out = t / 60
+ t_unit = "minutes"
+ else:
+ t_out = t
+ t_unit = "seconds"
+ return (t_out, t_unit)
Property changes on: mgmt/trunk/mint/python/mint/dbexpire.py
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: mgmt/trunk/mint/python/mint/schema.py
===================================================================
--- mgmt/trunk/mint/python/mint/schema.py 2008-12-01 16:49:16 UTC (rev 2899)
+++ mgmt/trunk/mint/python/mint/schema.py 2008-12-01 19:56:35 UTC (rev 2900)
@@ -1479,3 +1479,7 @@
Sysimage.sqlmeta.addJoin(SQLMultipleJoin('SysimageStats', joinMethodName='stats'))
+
+entityClasses = ['Slot', 'Job', 'Scheduler', 'Submitter', 'Negotiator', 'Collector', 'Master', 'Acl', 'Cluster', 'Store', 'Journal', 'System', 'Broker', 'Agent', 'Vhost', 'Queue', 'Exchange', 'Binding', 'ClientConnection', 'Link', 'Bridge', 'Session', 'Sysimage']
+
+statsClasses = ['SlotStats', 'JobStats', 'SchedulerStats', 'SubmitterStats', 'NegotiatorStats', 'CollectorStats', 'MasterStats', 'AclStats', 'ClusterStats', 'StoreStats', 'JournalStats', 'SystemStats', 'BrokerStats', 'AgentStats', 'VhostStats', 'QueueStats', 'ExchangeStats', 'BindingStats', 'ClientConnectionStats', 'LinkStats', 'BridgeStats', 'SessionStats', 'SysimageStats']
Modified: mgmt/trunk/mint/python/mint/schemaparser.py
===================================================================
--- mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-01 16:49:16 UTC (rev 2899)
+++ mgmt/trunk/mint/python/mint/schemaparser.py 2008-12-01 19:56:35 UTC (rev 2900)
@@ -13,6 +13,8 @@
self.currentClass = ""
self.pythonOutput = ""
self.finalPythonOutput = ""
+ self.entityClasses = []
+ self.statsClasses = []
self.groups = dict()
# mapping between xml schema types and database column types
# see xml/MintTypes.xml
@@ -139,10 +141,12 @@
self.pythonOutput += "\nclass %s(SQLObject):\n" % (pythonName)
self.generateLazyUpdate()
if (stats):
+ self.statsClasses.append(str(pythonName))
self.generateTimestampAttrib("Update")
self.generateForeignKeyAttrib(colPythonName[0].lower() + colPythonName[1:], keyPythonName)
self.generateMultipleJoin(origPythonName, pythonName, "stats")
else:
+ self.entityClasses.append(str(pythonName))
self.generateAttrib("qmfBrokerId", "StringCol", "length=1000")
self.generateAttrib("qmfScopeId", "BigIntCol")
self.generateAttrib("qmfObjectId", "BigIntCol")
@@ -231,6 +235,8 @@
self.generateClassAttribs(cls["@name"], self.groups[clsGroup["@name"]][1])
self.endClass()
self.pythonOutput += "\n\n"
+ self.finalPythonOutput += "\nentityClasses = %s\n" % (self.entityClasses)
+ self.finalPythonOutput += "\nstatsClasses = %s\n" % (self.statsClasses)
outputFile.write(self.pythonOutput + self.finalPythonOutput)
outputFile.close()
Modified: mgmt/trunk/mint/python/mint/sql.py
===================================================================
--- mgmt/trunk/mint/python/mint/sql.py 2008-12-01 16:49:16 UTC (rev 2899)
+++ mgmt/trunk/mint/python/mint/sql.py 2008-12-01 19:56:35 UTC (rev 2900)
@@ -50,6 +50,7 @@
self.time = clock() - start
else:
cursor.execute(self.text, values)
+ return cursor.rowcount
except:
log.warn("Text: %s", self.text)
@@ -138,6 +139,28 @@
return sql
+class SqlExpire(SqlOperation):
+ def __init__(self, cls):
+ super(SqlExpire, self).__init__("expire")
+
+ self.cls = cls
+
+ def generate(self):
+ table = self.cls.sqlmeta.table
+ if table.endswith("_stats"):
+ parent_table = table[0:table.find("_stats")]
+ sql = """
+ delete from %s
+ where qmf_update_time < now() - interval '%%(expiration)s seconds'
+ and id not in (select stats_curr_id from %s)
+ """ % (table, parent_table)
+ else:
+ sql = """
+ delete from %s
+ where qmf_create_time < now() - interval '%%(expiration)s seconds'
+ """ % (table)
+ return sql
+
class SqlGetBrokerRegistration(SqlOperation):
def __init__(self):
super(SqlGetBrokerRegistration, self).__init__("get_broker_reg")
17 years, 4 months
- 1
- 0
rhmessaging commits: r2899 - mgmt/trunk/sesame/cpp.
by rhmessaging-commits＠lists.jboss.org
Author: tedross
Date: 2008-12-01 11:49:16 -0500 (Mon, 01 Dec 2008)
New Revision: 2899
Modified:
mgmt/trunk/sesame/cpp/Makefile.am
Log:
Lowered automake requirement for RHEL4
Modified: mgmt/trunk/sesame/cpp/Makefile.am
===================================================================
--- mgmt/trunk/sesame/cpp/Makefile.am 2008-12-01 15:41:15 UTC (rev 2898)
+++ mgmt/trunk/sesame/cpp/Makefile.am 2008-12-01 16:49:16 UTC (rev 2899)
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = 1.9.6 foreign
+AUTOMAKE_OPTIONS = 1.9.2 foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src etc
17 years, 4 months
- 1
- 0
rhmessaging commits: r2898 - store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store.
by rhmessaging-commits＠lists.jboss.org
Author: tedross
Date: 2008-12-01 10:41:15 -0500 (Mon, 01 Dec 2008)
New Revision: 2898
Modified:
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp
store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h
Log:
Regenerated management files
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2008-11-29 22:06:22 UTC (rev 2897)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.cpp 2008-12-01 15:41:15 UTC (rev 2898)
@@ -131,7 +131,7 @@
buf.putShort (1); // Method Count
// Properties
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "queueRef");
ft.setInt (TYPE, TYPE_REF);
ft.setInt (ACCESS, ACCESS_RO);
@@ -139,7 +139,7 @@
ft.setInt (IS_OPTIONAL, 0);
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "name");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
@@ -147,7 +147,7 @@
ft.setInt (IS_OPTIONAL, 0);
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "directory");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
@@ -156,7 +156,7 @@
ft.setString (DESC, "Directory containing journal files");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "baseFileName");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
@@ -165,7 +165,7 @@
ft.setString (DESC, "Base filename prefix for journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "writePageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -175,7 +175,7 @@
ft.setString (DESC, "Page size in write-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "writePages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -185,7 +185,7 @@
ft.setString (DESC, "Number of pages in write-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "readPageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -195,7 +195,7 @@
ft.setString (DESC, "Page size in read-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "readPages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -205,7 +205,7 @@
ft.setString (DESC, "Number of pages in read-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "initialFileCount");
ft.setInt (TYPE, TYPE_U16);
ft.setInt (ACCESS, ACCESS_RO);
@@ -215,7 +215,7 @@
ft.setString (DESC, "Number of files initially allocated to this journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "dataFileSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -225,7 +225,7 @@
ft.setString (DESC, "Size of each journal data file");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "currentFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -237,196 +237,196 @@
// Statistics
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "recordDepth");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "record");
ft.setString (DESC, "Number of currently enqueued records (durable messages)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "recordDepthHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "record");
ft.setString (DESC, "Number of currently enqueued records (durable messages) (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "recordDepthLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "record");
ft.setString (DESC, "Number of currently enqueued records (durable messages) (Low)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "enqueues");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total enqueued records on journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "dequeues");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total dequeued records on journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "txnEnqueues");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total transactional enqueued records on journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "txnDequeues");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total transactional dequeued records on journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "txnCommits");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total transactional commit records on journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "txnAborts");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total transactional abort records on journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "outstandingAIOs");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "outstandingAIOsHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "outstandingAIOsLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system (Low)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "freeFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes.");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "freeFileCountHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes. (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "freeFileCountLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files free on this journal. Includes free files trapped in holes. (Low)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "availableFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files available to be written. Excluding holes");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "availableFileCountHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files available to be written. Excluding holes (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "availableFileCountLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "file");
ft.setString (DESC, "Number of files available to be written. Excluding holes (Low)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "writeWaitFailures");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "AIO Wait failures on write");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "writeBusyFailures");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "AIO Busy failures on write");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "readRecordCount");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Records read from the journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "readBusyFailures");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "AIO Busy failures on read");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "writePageCacheDepth");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Current depth of write-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "writePageCacheDepthHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Current depth of write-page-cache (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "writePageCacheDepthLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "wpage");
ft.setString (DESC, "Current depth of write-page-cache (Low)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "readPageCacheDepth");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "rpage");
ft.setString (DESC, "Current depth of read-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "readPageCacheDepthHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "rpage");
ft.setString (DESC, "Current depth of read-page-cache (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "readPageCacheDepthLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "rpage");
@@ -435,13 +435,13 @@
// Methods
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "expand");
ft.setInt (ARGCOUNT, 1);
ft.setString (DESC, "Increase number of files allocated for this journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "by");
ft.setInt (TYPE, TYPE_U32);
ft.setString (DIR, "I");
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2008-11-29 22:06:22 UTC (rev 2897)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Journal.h 2008-12-01 15:41:15 UTC (rev 2898)
@@ -150,7 +150,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
queueRef = val;
configChanged = true;
- setUpdateTime();
}
inline const ::qpid::management::ObjectId& get_queueRef() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -160,7 +159,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
name = val;
configChanged = true;
- setUpdateTime();
}
inline const std::string& get_name() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -170,7 +168,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
directory = val;
configChanged = true;
- setUpdateTime();
}
inline const std::string& get_directory() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -180,7 +177,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
baseFileName = val;
configChanged = true;
- setUpdateTime();
}
inline const std::string& get_baseFileName() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -190,7 +186,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
writePageSize = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_writePageSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -200,7 +195,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
writePages = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_writePages() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -210,7 +204,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
readPageSize = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_readPageSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -220,7 +213,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
readPages = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_readPages() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -230,7 +222,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
initialFileCount = val;
configChanged = true;
- setUpdateTime();
}
inline uint16_t get_initialFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -240,7 +231,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
dataFileSize = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_dataFileSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -250,7 +240,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
currentFileCount = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_currentFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -262,7 +251,6 @@
if (recordDepthHigh < recordDepth)
recordDepthHigh = recordDepth;
instChanged = true;
- setUpdateTime();
}
inline void dec_recordDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -270,67 +258,54 @@
if (recordDepthLow > recordDepth)
recordDepthLow = recordDepth;
instChanged = true;
- setUpdateTime();
}
inline void inc_enqueues (uint64_t by = 1) {
getThreadStats()->enqueues += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_enqueues (uint64_t by = 1) {
getThreadStats()->enqueues -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_dequeues (uint64_t by = 1) {
getThreadStats()->dequeues += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_dequeues (uint64_t by = 1) {
getThreadStats()->dequeues -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_txnEnqueues (uint64_t by = 1) {
getThreadStats()->txnEnqueues += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_txnEnqueues (uint64_t by = 1) {
getThreadStats()->txnEnqueues -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_txnDequeues (uint64_t by = 1) {
getThreadStats()->txnDequeues += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_txnDequeues (uint64_t by = 1) {
getThreadStats()->txnDequeues -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_txnCommits (uint64_t by = 1) {
getThreadStats()->txnCommits += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_txnCommits (uint64_t by = 1) {
getThreadStats()->txnCommits -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_txnAborts (uint64_t by = 1) {
getThreadStats()->txnAborts += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_txnAborts (uint64_t by = 1) {
getThreadStats()->txnAborts -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_outstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -338,7 +313,6 @@
if (outstandingAIOsHigh < outstandingAIOs)
outstandingAIOsHigh = outstandingAIOs;
instChanged = true;
- setUpdateTime();
}
inline void dec_outstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -346,7 +320,6 @@
if (outstandingAIOsLow > outstandingAIOs)
outstandingAIOsLow = outstandingAIOs;
instChanged = true;
- setUpdateTime();
}
inline void inc_freeFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -354,7 +327,6 @@
if (freeFileCountHigh < freeFileCount)
freeFileCountHigh = freeFileCount;
instChanged = true;
- setUpdateTime();
}
inline void dec_freeFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -362,7 +334,6 @@
if (freeFileCountLow > freeFileCount)
freeFileCountLow = freeFileCount;
instChanged = true;
- setUpdateTime();
}
inline void inc_availableFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -370,7 +341,6 @@
if (availableFileCountHigh < availableFileCount)
availableFileCountHigh = availableFileCount;
instChanged = true;
- setUpdateTime();
}
inline void dec_availableFileCount (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -378,47 +348,38 @@
if (availableFileCountLow > availableFileCount)
availableFileCountLow = availableFileCount;
instChanged = true;
- setUpdateTime();
}
inline void inc_writeWaitFailures (uint64_t by = 1) {
getThreadStats()->writeWaitFailures += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_writeWaitFailures (uint64_t by = 1) {
getThreadStats()->writeWaitFailures -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_writeBusyFailures (uint64_t by = 1) {
getThreadStats()->writeBusyFailures += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_writeBusyFailures (uint64_t by = 1) {
getThreadStats()->writeBusyFailures -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_readRecordCount (uint64_t by = 1) {
getThreadStats()->readRecordCount += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_readRecordCount (uint64_t by = 1) {
getThreadStats()->readRecordCount -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_readBusyFailures (uint64_t by = 1) {
getThreadStats()->readBusyFailures += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_readBusyFailures (uint64_t by = 1) {
getThreadStats()->readBusyFailures -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_writePageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -426,7 +387,6 @@
if (writePageCacheDepthHigh < writePageCacheDepth)
writePageCacheDepthHigh = writePageCacheDepth;
instChanged = true;
- setUpdateTime();
}
inline void dec_writePageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -434,7 +394,6 @@
if (writePageCacheDepthLow > writePageCacheDepth)
writePageCacheDepthLow = writePageCacheDepth;
instChanged = true;
- setUpdateTime();
}
inline void inc_readPageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -442,7 +401,6 @@
if (readPageCacheDepthHigh < readPageCacheDepth)
readPageCacheDepthHigh = readPageCacheDepth;
instChanged = true;
- setUpdateTime();
}
inline void dec_readPageCacheDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -450,7 +408,6 @@
if (readPageCacheDepthLow > readPageCacheDepth)
readPageCacheDepthLow = readPageCacheDepth;
instChanged = true;
- setUpdateTime();
}
};
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2008-11-29 22:06:22 UTC (rev 2897)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.cpp 2008-12-01 15:41:15 UTC (rev 2898)
@@ -117,7 +117,7 @@
buf.putShort (0); // Method Count
// Properties
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "brokerRef");
ft.setInt (TYPE, TYPE_REF);
ft.setInt (ACCESS, ACCESS_RO);
@@ -125,7 +125,7 @@
ft.setInt (IS_OPTIONAL, 0);
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "location");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
@@ -134,7 +134,7 @@
ft.setString (DESC, "Logical directory on disk");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "defaultInitialFileCount");
ft.setInt (TYPE, TYPE_U16);
ft.setInt (ACCESS, ACCESS_RO);
@@ -144,7 +144,7 @@
ft.setString (DESC, "Default number of files initially allocated to each journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "defaultDataFileSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -154,7 +154,7 @@
ft.setString (DESC, "Default size of each journal data file");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplIsInitialized");
ft.setInt (TYPE, TYPE_BOOL);
ft.setInt (ACCESS, ACCESS_RO);
@@ -163,7 +163,7 @@
ft.setString (DESC, "Transaction prepared list has been initialized by a transactional prepare");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplDirectory");
ft.setInt (TYPE, TYPE_SSTR);
ft.setInt (ACCESS, ACCESS_RO);
@@ -172,7 +172,7 @@
ft.setString (DESC, "Transaction prepared list directory");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplWritePageSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -182,7 +182,7 @@
ft.setString (DESC, "Page size in transaction prepared list write-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplWritePages");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -192,7 +192,7 @@
ft.setString (DESC, "Number of pages in transaction prepared list write-page-cache");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplInitialFileCount");
ft.setInt (TYPE, TYPE_U16);
ft.setInt (ACCESS, ACCESS_RO);
@@ -202,7 +202,7 @@
ft.setString (DESC, "Number of files initially allocated to transaction prepared list journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplDataFileSize");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -212,7 +212,7 @@
ft.setString (DESC, "Size of each journal data file in transaction prepared list journal");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplCurrentFileCount");
ft.setInt (TYPE, TYPE_U32);
ft.setInt (ACCESS, ACCESS_RO);
@@ -224,63 +224,63 @@
// Statistics
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplTransactionDepth");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "txn");
ft.setString (DESC, "Number of currently enqueued prepared transactions");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplTransactionDepthHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "txn");
ft.setString (DESC, "Number of currently enqueued prepared transactions (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplTransactionDepthLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "txn");
ft.setString (DESC, "Number of currently enqueued prepared transactions (Low)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplTxnPrepares");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total transaction prepares on transaction prepared list");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplTxnCommits");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total transaction commits on transaction prepared list");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplTxnAborts");
ft.setInt (TYPE, TYPE_U64);
ft.setString (UNIT, "record");
ft.setString (DESC, "Total transaction aborts on transaction prepared list");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplOutstandingAIOs");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplOutstandingAIOsHigh");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
ft.setString (DESC, "Number of currently outstanding AIO requests in Async IO system (High)");
buf.put (ft);
- ft = FieldTable ();
+ ft.clear();
ft.setString (NAME, "tplOutstandingAIOsLow");
ft.setInt (TYPE, TYPE_U32);
ft.setString (UNIT, "aio_op");
Modified: store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h
===================================================================
--- store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2008-11-29 22:06:22 UTC (rev 2897)
+++ store/trunk/cpp/lib/gen/qmf/com/redhat/rhm/store/Store.h 2008-12-01 15:41:15 UTC (rev 2898)
@@ -122,7 +122,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
brokerRef = val;
configChanged = true;
- setUpdateTime();
}
inline const ::qpid::management::ObjectId& get_brokerRef() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -132,7 +131,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
location = val;
configChanged = true;
- setUpdateTime();
}
inline const std::string& get_location() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -142,7 +140,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
defaultInitialFileCount = val;
configChanged = true;
- setUpdateTime();
}
inline uint16_t get_defaultInitialFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -152,7 +149,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
defaultDataFileSize = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_defaultDataFileSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -162,7 +158,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplIsInitialized = val;
configChanged = true;
- setUpdateTime();
}
inline uint8_t get_tplIsInitialized() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -172,7 +167,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplDirectory = val;
configChanged = true;
- setUpdateTime();
}
inline const std::string& get_tplDirectory() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -182,7 +176,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplWritePageSize = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_tplWritePageSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -192,7 +185,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplWritePages = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_tplWritePages() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -202,7 +194,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplInitialFileCount = val;
configChanged = true;
- setUpdateTime();
}
inline uint16_t get_tplInitialFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -212,7 +203,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplDataFileSize = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_tplDataFileSize() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -222,7 +212,6 @@
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
tplCurrentFileCount = val;
configChanged = true;
- setUpdateTime();
}
inline uint32_t get_tplCurrentFileCount() {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -234,7 +223,6 @@
if (tplTransactionDepthHigh < tplTransactionDepth)
tplTransactionDepthHigh = tplTransactionDepth;
instChanged = true;
- setUpdateTime();
}
inline void dec_tplTransactionDepth (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -242,37 +230,30 @@
if (tplTransactionDepthLow > tplTransactionDepth)
tplTransactionDepthLow = tplTransactionDepth;
instChanged = true;
- setUpdateTime();
}
inline void inc_tplTxnPrepares (uint64_t by = 1) {
getThreadStats()->tplTxnPrepares += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_tplTxnPrepares (uint64_t by = 1) {
getThreadStats()->tplTxnPrepares -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_tplTxnCommits (uint64_t by = 1) {
getThreadStats()->tplTxnCommits += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_tplTxnCommits (uint64_t by = 1) {
getThreadStats()->tplTxnCommits -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_tplTxnAborts (uint64_t by = 1) {
getThreadStats()->tplTxnAborts += by;
instChanged = true;
- setUpdateTime();
}
inline void dec_tplTxnAborts (uint64_t by = 1) {
getThreadStats()->tplTxnAborts -= by;
instChanged = true;
- setUpdateTime();
}
inline void inc_tplOutstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -280,7 +261,6 @@
if (tplOutstandingAIOsHigh < tplOutstandingAIOs)
tplOutstandingAIOsHigh = tplOutstandingAIOs;
instChanged = true;
- setUpdateTime();
}
inline void dec_tplOutstandingAIOs (uint32_t by = 1) {
::qpid::sys::Mutex::ScopedLock mutex(accessLock);
@@ -288,7 +268,6 @@
if (tplOutstandingAIOsLow > tplOutstandingAIOs)
tplOutstandingAIOsLow = tplOutstandingAIOs;
instChanged = true;
- setUpdateTime();
}
};
17 years, 4 months
- 1
- 0