X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-fork%2Fustfork.c;h=ac191971fd7b18cca7143fd79f5c1efeec00fcaf;hb=68d9f89e9fced1108fdde97c53504d05d183ccdb;hp=5e6acba16e87fb9893ee7c9fe3b756afae12dd38;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git diff --git a/liblttng-ust-fork/ustfork.c b/liblttng-ust-fork/ustfork.c index 5e6acba1..ac191971 100644 --- a/liblttng-ust-fork/ustfork.c +++ b/liblttng-ust-fork/ustfork.c @@ -33,7 +33,7 @@ struct user_desc; pid_t fork(void) { static pid_t (*plibc_func)(void) = NULL; - ust_fork_info_t fork_info; + sigset_t sigset; pid_t retval; if (plibc_func == NULL) { @@ -44,14 +44,14 @@ pid_t fork(void) } } - ust_before_fork(&fork_info); + ust_before_fork(&sigset); /* Do the real fork */ retval = plibc_func(); if (retval == 0) { /* child */ - ust_after_fork_child(&fork_info); + ust_after_fork_child(&sigset); } else { - ust_after_fork_parent(&fork_info); + ust_after_fork_parent(&sigset); } return retval; } @@ -59,7 +59,7 @@ pid_t fork(void) struct ustfork_clone_info { int (*fn)(void *); void *arg; - ust_fork_info_t fork_info; + sigset_t sigset; }; static int clone_fn(void *arg) @@ -67,7 +67,7 @@ static int clone_fn(void *arg) struct ustfork_clone_info *info = (struct ustfork_clone_info *) arg; /* clone is now done and we are in child */ - ust_after_fork_child(&info->fork_info); + ust_after_fork_child(&info->sigset); return info->fn(info->arg); } @@ -109,11 +109,11 @@ int clone(int (*fn)(void *), void *child_stack, int flags, void *arg, ...) /* Creating a real process, we need to intervene. */ struct ustfork_clone_info info = { fn: fn, arg: arg }; - ust_before_fork(&info.fork_info); + ust_before_fork(&info.sigset); retval = plibc_func(clone_fn, child_stack, flags, &info, ptid, tls, ctid); /* The child doesn't get here. */ - ust_after_fork_parent(&info.fork_info); + ust_after_fork_parent(&info.sigset); } return retval; }