Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-12-22 19:39:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed memory leaks

Browse source
This commit is contained in:
SChernykh 2022-06-07 19:40:13 +02:00
parent 8b681d6efb
commit 8af9e9b27d
5 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/json_rpc_request.cpp
View file

@ -338,6 +338,10 @@ void CurlContext::on_close(uv_handle_t* h)
void Call(const std::string& address, int port, const std::string& req, const std::string& auth, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop)
{
if (!loop) {
loop = uv_default_loop();
}
CallOnLoop(loop,
[=]()
{

2
src/json_rpc_request.h
View file

@ -40,7 +40,7 @@ private:
void Call(const std::string& address, int port, const std::string& req, const std::string& auth, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop);
template<typename T, typename U>
FORCEINLINE void call(const std::string& address, int port, const std::string& req, const std::string& auth, T&& cb, U&& close_cb, uv_loop_t* loop = uv_default_loop_checked())
FORCEINLINE void call(const std::string& address, int port, const std::string& req, const std::string& auth, T&& cb, U&& close_cb, uv_loop_t* loop = nullptr)
{
Call(address, port, req, auth, new Callback<T>(std::move(cb)), new Callback<U>(std::move(close_cb)), loop);
}

6
src/p2p_server.cpp
View file

@ -124,6 +124,10 @@ P2PServer::~P2PServer()
delete m_block;
delete m_cache;
for (const Broadcast* data : m_broadcastQueue) {
delete data;
}
}
void P2PServer::add_cached_block(const PoolBlock& block)
@ -785,7 +789,7 @@ void P2PServer::on_broadcast()
ON_SCOPE_LEAVE([&broadcast_queue]()
{
for (Broadcast* data : broadcast_queue) {
for (const Broadcast* data : broadcast_queue) {
delete data;
}
});

2
src/tcp_server.inl
View file

@ -473,7 +473,7 @@ void TCPServer<READ_BUF_SIZE, WRITE_BUF_SIZE>::shutdown_tcp()
}
else {
LOGWARN(1, "timed out while waiting for event loop to stop");
uv_async_init(&m_loop, &asy, nullptr);
uv_async_init(&m_loop, &asy, [](uv_async_t* h) { uv_close(reinterpret_cast<uv_handle_t*>(h), nullptr); });
uv_stop(&m_loop);
uv_async_send(&asy);
break;

2
src/uv_util.h
View file

@ -139,7 +139,7 @@ UV_LoopUserData* GetLoopUserData(uv_loop_t* loop, bool create = true);
template<typename T>
void CallOnLoop(uv_loop_t* loop, T&& callback)
{
UV_LoopUserData* data = GetLoopUserData(loop);
UV_LoopUserData* data = GetLoopUserData(loop, false);
UV_LoopCallbackBase* cb = new UV_LoopCallback<T>(std::move(callback));
{