thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-12-13 09:52:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

extend lifetime of returned network interface object

Browse Source 
Signed-off-by: Duc Canh Le <duccanh.le@ahrefs.com>
This commit is contained in:
Duc Canh Le 2023-09-22 04:57:29 +00:00
parent 7883ae0d8c
commit 3b48b5aa5e
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Common/isLocalAddress.cpp
View File

@ -36,13 +36,6 @@ struct NetworkInterfaces : public boost::noncopyable
} }
} }
void swap(NetworkInterfaces && other)
{
auto * tmp = ifaddr;
ifaddr = other.ifaddr;
other.ifaddr = tmp;
}
bool hasAddress(const Poco::Net::IPAddress & address) const bool hasAddress(const Poco::Net::IPAddress & address) const
{ {
ifaddrs * iface; ifaddrs * iface;
@ -87,23 +80,24 @@ struct NetworkInterfaces : public boost::noncopyable
freeifaddrs(ifaddr); freeifaddrs(ifaddr);
} }
static const NetworkInterfaces & instance() static std::shared_ptr<const NetworkInterfaces> instance()
{ {
static constexpr int NET_INTERFACE_VALID_PERIOD_MS = 30000; static constexpr int NET_INTERFACE_VALID_PERIOD_MS = 30000;
static NetworkInterfaces nf; static std::shared_ptr<const NetworkInterfaces> nf = std::make_shared<const NetworkInterfaces>();
static std::atomic<std::chrono::steady_clock::time_point> last_updated_time = std::chrono::steady_clock::now(); static std::atomic<std::chrono::steady_clock::time_point> last_updated_time = std::chrono::steady_clock::now();
static std::shared_mutex nf_mtx; static std::shared_mutex nf_mtx;
auto now = std::chrono::steady_clock::now(); auto now = std::chrono::steady_clock::now();
auto last_updated_time_snapshot = last_updated_time.load();
if (std::chrono::duration_cast<std::chrono::milliseconds>(now - last_updated_time_snapshot).count() > NET_INTERFACE_VALID_PERIOD_MS) if (std::chrono::duration_cast<std::chrono::milliseconds>(now - last_updated_time.load()).count() > NET_INTERFACE_VALID_PERIOD_MS)
{ {
std::unique_lock lock(nf_mtx); std::unique_lock lock(nf_mtx);
if (last_updated_time.load() != last_updated_time_snapshot) /// it's possible that last_updated_time after we get the snapshot /// It's possible that last_updated_time after we get lock
return nf; if (std::chrono::duration_cast<std::chrono::milliseconds>(now - last_updated_time.load()).count() > NET_INTERFACE_VALID_PERIOD_MS)
nf.swap(NetworkInterfaces()); {
last_updated_time.store(now); nf = std::make_shared<const NetworkInterfaces>();
last_updated_time.store(now);
}
return nf; return nf;
} }
else else
@ -149,7 +143,7 @@ bool isLocalAddress(const Poco::Net::IPAddress & address)
} }
} }
return NetworkInterfaces::instance().hasAddress(address); return NetworkInterfaces::instance()->hasAddress(address);
} }