upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-21 16:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

check the timeout on all builds

Browse Source 
wait for 1ms instead of 1s each iteration
This commit is contained in:
Gunter Labes 2007-12-05 15:56:10 +00:00
parent 4b309bafcf
commit 327b5cc4d9
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/network_worker.cpp
View File

@ -144,7 +144,8 @@ int receive_bytes(TCPsocket s, char* buf, size_t nbytes)
#endif
}
bool receive_with_timeout(TCPsocket s, char* buf, size_t nbytes, bool update_stats=false, int timeout_ms=60000)
bool receive_with_timeout(TCPsocket s, char* buf, size_t nbytes,
bool update_stats=false, int timeout_ms=60000)
{
int nsleeps = 0;
while(nbytes > 0) {
@ -161,6 +162,10 @@ bool receive_with_timeout(TCPsocket s, char* buf, size_t nbytes, bool update_sta
if(true)
#endif
{
//TODO: consider replacing this with a select call
if(++nsleeps == timeout_ms) {
return false;
}
#ifdef USE_POLL
struct pollfd fd = { ((_TCPsocket*)s)->channel, POLLIN, 0 };
int poll_res;
@ -185,12 +190,9 @@ bool receive_with_timeout(TCPsocket s, char* buf, size_t nbytes, bool update_sta
if(retval > 0)
continue;
else return false;
#elif
//TODO: consider replacing this with a select call
if(++nsleeps == timeout_ms) {
return false;
}
SDL_Delay(1000);
SDL_Delay(1);
#endif
} else {
return false;
@ -460,7 +462,7 @@ static int process_queue(void*)
// unreachable
}
}
} //anonymous namespace
namespace network_worker_pool
{

2
src/wml_exception.cpp
View File

@ -25,7 +25,7 @@
//! Helper function, don't call this directly.
//!
//! @param cond The textual presentation if the test that failed.
//! @param cond The textual presentation of the test that failed.
//! @param file The file in which the test failed.
//! @param line The line at which the test failed.
//! @param function The funtion in which the test failed.