mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-15 04:11:02 +01:00
Code Issues Projects Releases Wiki Activity

scripted-diff: rename m_cs_banned -> m_banned_mutex

Browse source 
-BEGIN VERIFY SCRIPT-
s() { sed -i 's/m_cs_banned/m_banned_mutex/g' $1; }
s src/banman.cpp
s src/banman.h
-END VERIFY SCRIPT-
This commit is contained in:
w0xlt 2022-01-18 03:26:37 -03:00 • committed by Hennadii Stepanov
parent 46709c5f27
commit 784c316f9c
No known key found for this signature in database
GPG key ID: 410108112E7EA81F
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/banman.cpp
View file

@ -27,7 +27,7 @@ BanMan::~BanMan()
void BanMan::LoadBanlist() void BanMan::LoadBanlist()
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
if (m_client_interface) m_client_interface->InitMessage(_("Loading banlist…").translated); if (m_client_interface) m_client_interface->InitMessage(_("Loading banlist…").translated);
@ -51,7 +51,7 @@ void BanMan::DumpBanlist()
banmap_t banmap; banmap_t banmap;
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
SweepBanned(); SweepBanned();
if (!m_is_dirty) return; if (!m_is_dirty) return;
banmap = m_banned; banmap = m_banned;
@ -60,7 +60,7 @@ void BanMan::DumpBanlist()
int64_t n_start = GetTimeMillis(); int64_t n_start = GetTimeMillis();
if (!m_ban_db.Write(banmap)) { if (!m_ban_db.Write(banmap)) {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
m_is_dirty = true; m_is_dirty = true;
} }
@ -71,7 +71,7 @@ void BanMan::DumpBanlist()
void BanMan::ClearBanned() void BanMan::ClearBanned()
{ {
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
m_banned.clear(); m_banned.clear();
m_is_dirty = true; m_is_dirty = true;
} }
@ -81,14 +81,14 @@ void BanMan::ClearBanned()
bool BanMan::IsDiscouraged(const CNetAddr& net_addr) bool BanMan::IsDiscouraged(const CNetAddr& net_addr)
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
return m_discouraged.contains(net_addr.GetAddrBytes()); return m_discouraged.contains(net_addr.GetAddrBytes());
} }
bool BanMan::IsBanned(const CNetAddr& net_addr) bool BanMan::IsBanned(const CNetAddr& net_addr)
{ {
auto current_time = GetTime(); auto current_time = GetTime();
LOCK(m_cs_banned); LOCK(m_banned_mutex);
for (const auto& it : m_banned) { for (const auto& it : m_banned) {
CSubNet sub_net = it.first; CSubNet sub_net = it.first;
CBanEntry ban_entry = it.second; CBanEntry ban_entry = it.second;
@ -103,7 +103,7 @@ bool BanMan::IsBanned(const CNetAddr& net_addr)
bool BanMan::IsBanned(const CSubNet& sub_net) bool BanMan::IsBanned(const CSubNet& sub_net)
{ {
auto current_time = GetTime(); auto current_time = GetTime();
LOCK(m_cs_banned); LOCK(m_banned_mutex);
banmap_t::iterator i = m_banned.find(sub_net); banmap_t::iterator i = m_banned.find(sub_net);
if (i != m_banned.end()) { if (i != m_banned.end()) {
CBanEntry ban_entry = (*i).second; CBanEntry ban_entry = (*i).second;
@ -122,7 +122,7 @@ void BanMan::Ban(const CNetAddr& net_addr, int64_t ban_time_offset, bool since_u
void BanMan::Discourage(const CNetAddr& net_addr) void BanMan::Discourage(const CNetAddr& net_addr)
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
m_discouraged.insert(net_addr.GetAddrBytes()); m_discouraged.insert(net_addr.GetAddrBytes());
} }
@ -139,7 +139,7 @@ void BanMan::Ban(const CSubNet& sub_net, int64_t ban_time_offset, bool since_uni
ban_entry.nBanUntil = (normalized_since_unix_epoch ? 0 : GetTime()) + normalized_ban_time_offset; ban_entry.nBanUntil = (normalized_since_unix_epoch ? 0 : GetTime()) + normalized_ban_time_offset;
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
if (m_banned[sub_net].nBanUntil < ban_entry.nBanUntil) { if (m_banned[sub_net].nBanUntil < ban_entry.nBanUntil) {
m_banned[sub_net] = ban_entry; m_banned[sub_net] = ban_entry;
m_is_dirty = true; m_is_dirty = true;
@ -161,7 +161,7 @@ bool BanMan::Unban(const CNetAddr& net_addr)
bool BanMan::Unban(const CSubNet& sub_net) bool BanMan::Unban(const CSubNet& sub_net)
{ {
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
if (m_banned.erase(sub_net) == 0) return false; if (m_banned.erase(sub_net) == 0) return false;
m_is_dirty = true; m_is_dirty = true;
} }
@ -172,7 +172,7 @@ bool BanMan::Unban(const CSubNet& sub_net)
void BanMan::GetBanned(banmap_t& banmap) void BanMan::GetBanned(banmap_t& banmap)
{ {
LOCK(m_cs_banned); LOCK(m_banned_mutex);
// Sweep the banlist so expired bans are not returned // Sweep the banlist so expired bans are not returned
SweepBanned(); SweepBanned();
banmap = m_banned; //create a thread safe copy banmap = m_banned; //create a thread safe copy
@ -180,7 +180,7 @@ void BanMan::GetBanned(banmap_t& banmap)
void BanMan::SweepBanned() void BanMan::SweepBanned()
{ {
AssertLockHeld(m_cs_banned); AssertLockHeld(m_banned_mutex);
int64_t now = GetTime(); int64_t now = GetTime();
bool notify_ui = false; bool notify_ui = false;

12
src/banman.h
View file

@ -80,17 +80,17 @@ public:
void DumpBanlist(); void DumpBanlist();
private: private:
void LoadBanlist() EXCLUSIVE_LOCKS_REQUIRED(!m_cs_banned); void LoadBanlist() EXCLUSIVE_LOCKS_REQUIRED(!m_banned_mutex);
//!clean unused entries (if bantime has expired) //!clean unused entries (if bantime has expired)
void SweepBanned() EXCLUSIVE_LOCKS_REQUIRED(m_cs_banned); void SweepBanned() EXCLUSIVE_LOCKS_REQUIRED(m_banned_mutex);
RecursiveMutex m_cs_banned; RecursiveMutex m_banned_mutex;
banmap_t m_banned GUARDED_BY(m_cs_banned); banmap_t m_banned GUARDED_BY(m_banned_mutex);
bool m_is_dirty GUARDED_BY(m_cs_banned){false}; bool m_is_dirty GUARDED_BY(m_banned_mutex){false};
CClientUIInterface* m_client_interface = nullptr; CClientUIInterface* m_client_interface = nullptr;
CBanDB m_ban_db; CBanDB m_ban_db;
const int64_t m_default_ban_time; const int64_t m_default_ban_time;
CRollingBloomFilter m_discouraged GUARDED_BY(m_cs_banned) {50000, 0.000001}; CRollingBloomFilter m_discouraged GUARDED_BY(m_banned_mutex) {50000, 0.000001};
}; };
#endif // BITCOIN_BANMAN_H #endif // BITCOIN_BANMAN_H