4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-13 20:06:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

abstract_tcp_server2: fix busy calling of idle IO service

Browse Source 
This would make monerod use 100% CPU when running with torsocks
without Tor running
This commit is contained in:
moneromooo-monero 2018-06-09 12:37:15 +01:00
parent 25e7a7d96f
commit 3381b6517e
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/epee/include/net/abstract_tcp_server2.inl
View File

@ -383,7 +383,7 @@ PRAGMA_WARNING_DISABLE_VS(4355)
//ask it inside(!) critical region if we still able to go in event wait... //ask it inside(!) critical region if we still able to go in event wait...
size_t cnt = socket_.get_io_service().poll_one(); size_t cnt = socket_.get_io_service().poll_one();
if(!cnt) if(!cnt)
misc_utils::sleep_no_w(0); misc_utils::sleep_no_w(1);
} }
return true; return true;
@ -836,7 +836,9 @@ POP_WARNINGS
{ {
try try
{ {
io_service_.run(); size_t cnt = io_service_.run();
if (cnt == 0)
misc_utils::sleep_no_w(1);
} }
catch(const std::exception& ex) catch(const std::exception& ex)
{ {