diff options
| author | Ted Ross <tross@apache.org> | 2008-05-22 13:42:05 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2008-05-22 13:42:05 +0000 |
| commit | fe0ce73ac72ac4c2300b62f67275dd7221fa4c7d (patch) | |
| tree | 6fb301cc130c7b37596b9fb44a7ef6c3c5b91d90 /qpid/cpp/managementgen | |
| parent | 919041601b94608602cc19cb161f168c76547835 (diff) | |
| download | qpid-python-fe0ce73ac72ac4c2300b62f67275dd7221fa4c7d.tar.gz | |
QPID-1088
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@659110 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/managementgen')
| -rwxr-xr-x | qpid/cpp/managementgen/schema.py | 6 | ||||
| -rw-r--r-- | qpid/cpp/managementgen/templates/Class.cpp | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/qpid/cpp/managementgen/schema.py b/qpid/cpp/managementgen/schema.py index 68e9bfd4e2..7a9f23ea76 100755 --- a/qpid/cpp/managementgen/schema.py +++ b/qpid/cpp/managementgen/schema.py @@ -76,7 +76,7 @@ class SchemaType: def genAccessor (self, stream, varName, changeFlag = None): if self.accessor == "direct": stream.write (" inline void set_" + varName + " (" + self.cpp + " val){\n"); - stream.write (" sys::RWlock::ScopedWlock writeLock (accessLock);\n") + stream.write (" sys::Mutex::ScopedLock mutex(accessLock);\n") if self.style != "mma": stream.write (" " + varName + " = val;\n"); if self.style == "wm": @@ -96,7 +96,6 @@ class SchemaType: stream.write (" }\n"); elif self.accessor == "counter": stream.write (" inline void inc_" + varName + " (" + self.cpp + " by = 1){\n"); - stream.write (" sys::RWlock::ScopedWlock writeLock (accessLock);\n") stream.write (" " + varName + " += by;\n") if self.style == "wm": stream.write (" if (" + varName + "High < " + varName + ")\n") @@ -105,7 +104,6 @@ class SchemaType: stream.write (" " + changeFlag + " = true;\n") stream.write (" }\n"); stream.write (" inline void dec_" + varName + " (" + self.cpp + " by = 1){\n"); - stream.write (" sys::RWlock::ScopedWlock writeLock (accessLock);\n") stream.write (" " + varName + " -= by;\n") if self.style == "wm": stream.write (" if (" + varName + "Low > " + varName + ")\n") @@ -114,7 +112,7 @@ class SchemaType: stream.write (" " + changeFlag + " = true;\n") stream.write (" }\n"); stream.write (" inline void set_" + varName + " (" + self.cpp + " val){\n"); - stream.write (" sys::RWlock::ScopedWlock writeLock (accessLock);\n") + stream.write (" sys::Mutex::ScopedLock mutex(accessLock);\n") stream.write (" " + varName + " = val;\n"); if self.style == "wm": stream.write (" if (" + varName + "Low > val)\n") diff --git a/qpid/cpp/managementgen/templates/Class.cpp b/qpid/cpp/managementgen/templates/Class.cpp index 5862685670..733e29188e 100644 --- a/qpid/cpp/managementgen/templates/Class.cpp +++ b/qpid/cpp/managementgen/templates/Class.cpp @@ -87,7 +87,7 @@ void /*MGEN:Class.NameCap*/::writeSchema (Buffer& buf) void /*MGEN:Class.NameCap*/::writeConfig (Buffer& buf) { - sys::RWlock::ScopedRlock readLock (accessLock); + sys::Mutex::ScopedLock mutex(accessLock); configChanged = false; writeTimestamps (buf); @@ -96,7 +96,7 @@ void /*MGEN:Class.NameCap*/::writeConfig (Buffer& buf) void /*MGEN:Class.NameCap*/::writeInstrumentation (Buffer& buf, bool skipHeaders) { - sys::RWlock::ScopedWlock writeLock (accessLock); + sys::Mutex::ScopedLock mutex(accessLock); instChanged = false; if (!skipHeaders) |