tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

speed up the wait loop by sleeping 5 ms before reaping status instead of failing and sleeping 1 S

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-11-26 09:07:29 +01:00
parent 3e0ae1ccab
commit 677d278fda
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/utils/execmd.cpp
View File

@ -27,6 +27,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <time.h>
#include <vector> #include <vector>
#include <string> #include <string>
@ -101,6 +102,13 @@ void ExecCmd::putenv(const string &ea)
{ {
m_env.push_back(ea); m_env.push_back(ea);
} }
static void msleep(int millis)
{
struct timespec spec;
spec.tv_sec = millis / 1000;
spec.tv_nsec = (millis % 1000) * 1000000;
nanosleep(&spec, 0);
}
/** A resource manager to ensure that execcmd cleans up if an exception is /** A resource manager to ensure that execcmd cleans up if an exception is
* raised in the callback, or at different places on errors occurring * raised in the callback, or at different places on errors occurring
@ -134,11 +142,11 @@ public:
int ret = killpg(grp, SIGTERM); int ret = killpg(grp, SIGTERM);
if (ret == 0) { if (ret == 0) {
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
msleep(i == 0 ? 5 : (i == 1 ? 100 : 2000));
int status; int status;
(void)waitpid(m_parent->m_pid, &status, WNOHANG); (void)waitpid(m_parent->m_pid, &status, WNOHANG);
if (kill(m_parent->m_pid, 0) != 0) if (kill(m_parent->m_pid, 0) != 0)
break; break;
sleep(1);
if (i == 2) { if (i == 2) {
LOGDEB(("ExecCmd: killpg(%d, SIGKILL)\n", grp)); LOGDEB(("ExecCmd: killpg(%d, SIGKILL)\n", grp));
killpg(grp, SIGKILL); killpg(grp, SIGKILL);