diff options
author | Chris Wilson <chris+github@qwirx.com> | 2015-08-06 19:12:58 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2015-08-06 19:12:58 +0000 |
commit | 1332437a177df06bdba365fad5f816b9bc9cda40 (patch) | |
tree | 81ff24fabc97b35eabd0894a8a9293364c6d0cfc /lib/server/ServerControl.cpp | |
parent | a2985a584a751c02a87eedb537f309f61463feff (diff) |
Shorten minimum sleep while waiting for test daemons to die
Diffstat (limited to 'lib/server/ServerControl.cpp')
-rw-r--r-- | lib/server/ServerControl.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/server/ServerControl.cpp b/lib/server/ServerControl.cpp index c698319f..5e7b7e59 100644 --- a/lib/server/ServerControl.cpp +++ b/lib/server/ServerControl.cpp @@ -15,6 +15,7 @@ #include <signal.h> #endif +#include "BoxTime.h" #include "ServerControl.h" #include "Test.h" @@ -197,18 +198,18 @@ bool KillServer(int pid, bool WaitForProcess) } #endif - for (int i = 0; i < 30; i++) + printf("Waiting for server to die (pid %d): ", pid); + + for (int i = 0; i < 300; i++) { - if (i == 0) + if (i % 10 == 0) { - printf("Waiting for server to die (pid %d): ", pid); + printf("."); + fflush(stdout); } - printf("."); - fflush(stdout); - if (!ServerIsAlive(pid)) break; - ::sleep(1); + ShortSleep(MilliSecondsToBoxTime(100), false); if (!ServerIsAlive(pid)) break; } |