OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 13:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

EINTR is not crash-worthy

Browse Source 
This is how it should have been handled anyway. This fixes a (benign)
race condition when the server is killed, as well as gprof builds.

Also updated tdata.
This commit is contained in:
dongresource 2020-12-08 20:10:02 +01:00
parent d5409ed3f1
commit 86e0b1bc13
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CNProtocol.cpp
View File

@ -312,6 +312,10 @@ void CNServer::start() {
// the timeout is to ensure shard timers are ticking // the timeout is to ensure shard timers are ticking
int n = poll(fds.data(), fds.size(), 50); int n = poll(fds.data(), fds.size(), 50);
if (SOCKETERROR(n)) { if (SOCKETERROR(n)) {
#ifndef _WIN32
if (errno == EINTR)
continue;
#endif
std::cout << "[FATAL] poll() returned error" << std::endl; std::cout << "[FATAL] poll() returned error" << std::endl;
terminate(0); terminate(0);
} }

2
tdata

@ -1 +1 @@
Subproject commit e9e03fd0f0ddc09a29db03cc68a5e5276712f2a7 Subproject commit 9a3991958689087a5846cac71edd16c82edbf09d