mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 07:25:18 +00:00
Code Issues Releases Wiki Activity

[#1021] removed mutex

Browse Source
This commit is contained in:
Wlodek Wencel
2020-02-19 09:54:59 +01:00
committed by Razvan Becheriu
parent f2a1594816
commit 73032ef6b2
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/perfdhcp/test_control.h
View File

@@ -25,7 +25,6 @@
#include <boost/function.hpp> #include <boost/function.hpp>
#include <boost/date_time/posix_time/posix_time.hpp> #include <boost/date_time/posix_time/posix_time.hpp>
#include <mutex>
#include <string> #include <string>
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
@@ -300,19 +299,13 @@ public:
/// Method prints information about data offsets /// Method prints information about data offsets
/// in packet templates and their contents. /// in packet templates and their contents.
void printTemplates() const; void printTemplates() const;
std::mutex unique_addr_mutex_;
std::mutex unique_reply_addr_mutex_;
std::set <std::string> getAllUniqueAddrReply() { std::set <std::string> getAllUniqueAddrReply() {
std::lock_guard<std::mutex> lock(unique_reply_addr_mutex_); return unique_reply_address_;
auto result = unique_reply_address_;
return result;
} }
std::set <std::string> getAllUniqueAddrAdvert() { std::set <std::string> getAllUniqueAddrAdvert() {
std::lock_guard<std::mutex> lock(unique_addr_mutex_); return unique_address_;
auto result = unique_address_;
return result;
} }
// We would really like following methods and members to be private but // We would really like following methods and members to be private but
@@ -588,7 +581,6 @@ protected:
case ExchangeType::SA: { case ExchangeType::SA: {
for (auto current_it = current.begin(); for (auto current_it = current.begin();
current_it != current.end(); ++current_it) { current_it != current.end(); ++current_it) {
std::lock_guard<std::mutex> lock(unique_addr_mutex_);
auto ret = unique_address_.emplace(*current_it); auto ret = unique_address_.emplace(*current_it);
if (!ret.second) { if (!ret.second) {
stats_mgr_.updateNonUniqueAddrNum(ExchangeType::SA); stats_mgr_.updateNonUniqueAddrNum(ExchangeType::SA);
@@ -599,7 +591,6 @@ protected:
case ExchangeType::RR: { case ExchangeType::RR: {
for (auto current_it = current.begin(); for (auto current_it = current.begin();
current_it != current.end(); ++current_it) { current_it != current.end(); ++current_it) {
std::lock_guard<std::mutex> lock(unique_reply_addr_mutex_);
auto ret = unique_reply_address_.emplace(*current_it); auto ret = unique_reply_address_.emplace(*current_it);
if (!ret.second) { if (!ret.second) {
stats_mgr_.updateNonUniqueAddrNum(ExchangeType::RR); stats_mgr_.updateNonUniqueAddrNum(ExchangeType::RR);
@@ -613,7 +604,6 @@ protected:
case ExchangeType::DO: { case ExchangeType::DO: {
for (auto current_it = current.begin(); for (auto current_it = current.begin();
current_it != current.end(); ++current_it) { current_it != current.end(); ++current_it) {
std::lock_guard<std::mutex> lock(unique_addr_mutex_);
auto ret = unique_address_.emplace(*current_it); auto ret = unique_address_.emplace(*current_it);
if (!ret.second) { if (!ret.second) {
stats_mgr_.updateNonUniqueAddrNum(ExchangeType::DO); stats_mgr_.updateNonUniqueAddrNum(ExchangeType::DO);
@@ -624,7 +614,6 @@ protected:
case ExchangeType::RA: { case ExchangeType::RA: {
for (auto current_it = current.begin(); for (auto current_it = current.begin();
current_it != current.end(); ++current_it) { current_it != current.end(); ++current_it) {
std::lock_guard<std::mutex> lock(unique_reply_addr_mutex_);
auto ret = unique_reply_address_.emplace(*current_it); auto ret = unique_reply_address_.emplace(*current_it);
if (!ret.second) { if (!ret.second) {
stats_mgr_.updateNonUniqueAddrNum(ExchangeType::RA); stats_mgr_.updateNonUniqueAddrNum(ExchangeType::RA);
@@ -648,13 +637,11 @@ protected:
for (auto addr_it = addr.begin(); for (auto addr_it = addr.begin();
addr_it != addr.end(); ++addr_it) { addr_it != addr.end(); ++addr_it) {
std::lock_guard<std::mutex> lock(unique_addr_mutex_);
auto it = unique_address_.find(*addr_it); auto it = unique_address_.find(*addr_it);
if (it != unique_address_.end()) { if (it != unique_address_.end()) {
unique_address_.erase(it); unique_address_.erase(it);
} }
std::lock_guard<std::mutex> lock2(unique_reply_addr_mutex_);
auto it2 = unique_reply_address_.find(*addr_it); auto it2 = unique_reply_address_.find(*addr_it);
if (it2 != unique_reply_address_.end()) { if (it2 != unique_reply_address_.end()) {
unique_reply_address_.erase(it2); unique_reply_address_.erase(it2);