deac/ruby-lxc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Reimplement lxc_wait_for_pid_status as it is no longer exported by liblxc

Browse source 
Signed-off-by: Jakub Skokan <jakub.skokan@havefun.cz>
This commit is contained in:
Jakub Skokan 2020-10-12 17:04:27 +02:00
parent 60e87d45c8
commit 2d171f980f
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ext/lxc/lxc.c
View file

@ -41,8 +41,6 @@ extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
#define RELEASING_GVL2(func, arg, killfunc, killarg) func(arg) #define RELEASING_GVL2(func, arg, killfunc, killarg) func(arg)
#endif #endif
extern int lxc_wait_for_pid_status(pid_t pid);
static VALUE Container; static VALUE Container;
static VALUE Error; static VALUE Error;
@ -677,10 +675,30 @@ err:
return NULL; return NULL;
} }
static RETURN_WITHOUT_GVL_TYPE static int
lxc_wait_for_pid_status_without_gvl(void *pid) wait_for_pid_status(pid_t pid)
{ {
RETURN_WITHOUT_GVL(lxc_wait_for_pid_status(*(pid_t*)pid)); int status, ret;
again:
ret = waitpid(pid, &status, 0);
if (ret == -1) {
if (errno == EINTR)
goto again;
return -1;
}
if (ret != pid)
goto again;
return status;
}
static RETURN_WITHOUT_GVL_TYPE
wait_for_pid_status_without_gvl(void *pid)
{
RETURN_WITHOUT_GVL(wait_for_pid_status(*(pid_t*)pid));
} }
#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) || defined(HAVE_RB_THREAD_BLOCKING_REGION) #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) || defined(HAVE_RB_THREAD_BLOCKING_REGION)
@ -748,7 +766,7 @@ container_attach(int argc, VALUE *argv, VALUE self)
goto out; goto out;
if (wait) { if (wait) {
ret = RELEASING_GVL2(lxc_wait_for_pid_status_without_gvl, &pid, ret = RELEASING_GVL2(wait_for_pid_status_without_gvl, &pid,
kill_pid_without_gvl, &pid); kill_pid_without_gvl, &pid);
/* handle case where attach fails */ /* handle case where attach fails */
if (WIFEXITED(ret) && WEXITSTATUS(ret) == 255) if (WIFEXITED(ret) && WEXITSTATUS(ret) == 255)