Repository :
http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
---------------------------------------------------------------
commit 19c4c42635e8f5e7ae64bfe6915d66f5fb7c9be0
Author: Daniel Kopecek <dkopecek(a)redhat.com>
Date: Wed Oct 22 13:10:06 2014 +0200
Remove locking code from XTable::Operation structure implementation
---------------------------------------------------------------
src/Daemon/Backends/Linux/XTables.hpp | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/src/Daemon/Backends/Linux/XTables.hpp
b/src/Daemon/Backends/Linux/XTables.hpp
index 6994300..1c9a428 100644
--- a/src/Daemon/Backends/Linux/XTables.hpp
+++ b/src/Daemon/Backends/Linux/XTables.hpp
@@ -71,7 +71,6 @@ namespace firewalld
String _name;
StringVector _direct;
ChainMap _chains;
- Glib::Threads::Mutex _mutex;
friend class XTables;
};
@@ -97,36 +96,31 @@ namespace firewalld
struct Operation {
Operation(XTable& _table, Command _command)
- : _lock(_table._mutex),
- table(_table),
+ : table(_table),
chain(""),
command(_command),
specification(""),
rule_priority(-1) {}
Operation(XTable& _table, const String& _chain, Command _command, const
String& _specification = "")
- : _lock(_table._mutex),
- table(_table),
+ : table(_table),
chain(_chain),
command(_command),
specification(_specification),
rule_priority(-1) {}
Operation(XTable& _table, const String& _chain, Command _command, int
_rule_priority)
- : _lock(_table._mutex),
- table(_table),
+ : table(_table),
chain(_chain),
command(_command),
specification(""),
rule_priority(_rule_priority) {}
Operation(XTable& _table, const String& _chain, Command _command, const
String& _specification, int _rule_priority)
- : _lock(_table._mutex),
- table(_table),
+ : table(_table),
chain(_chain),
command(_command),
specification(_specification),
rule_priority(_rule_priority) {}
Operation(XTable& _table, Command _command, const String& _specification)
- : _lock(_table._mutex),
- table(_table),
+ : table(_table),
chain(""),
command(_command),
specification(_specification),
@@ -137,8 +131,6 @@ namespace firewalld
Command command;
const String& specification;
int rule_priority;
- private:
- Glib::Threads::Mutex::Lock _lock;
};
virtual const StringVector listTables() const = 0;