X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-fork%2Fustfork.c;h=8fade56e84c5413bd30c679d7f3fd5c30b4e3c70;hb=ad496c21b85087f600271299c9cd2a3ffe00c4c1;hp=5e6acba16e87fb9893ee7c9fe3b756afae12dd38;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/liblttng-ust-fork/ustfork.c b/liblttng-ust-fork/ustfork.c
index 5e6acba1..8fade56e 100644
--- a/liblttng-ust-fork/ustfork.c
+++ b/liblttng-ust-fork/ustfork.c
@@ -28,12 +28,10 @@
 
 #include <lttng/ust.h>
 
-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,22 +42,26 @@ 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;
 }
 
+#ifdef __linux__
+
+struct user_desc;
+
 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 +69,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 +111,49 @@ 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;
+}
+
+#elif defined (__FreeBSD__)
+
+pid_t rfork(int flags)
+{
+	static pid_t (*plibc_func)(void) = NULL;
+	sigset_t sigset;
+	pid_t retval;
+
+	if (plibc_func == NULL) {
+		plibc_func = dlsym(RTLD_NEXT, "rfork");
+		if (plibc_func == NULL) {
+			fprintf(stderr, "libustfork: unable to find \"rfork\" symbol\n");
+			return -1;
+		}
+	}
+
+	ust_before_fork(&sigset);
+	/* Do the real rfork */
+	retval = plibc_func();
+	if (retval == 0) {
+		/* child */
+		ust_after_fork_child(&sigset);
+	} else {
+		ust_after_fork_parent(&sigset);
 	}
 	return retval;
 }
+
+/*
+ * On BSD, no need to override vfork, because it runs in the context of
+ * the parent, with parent waiting until execve or exit is executed in
+ * the child.
+ */
+
+#else
+#warning "Unknown OS. You might want to ensure that fork/clone/vfork/fork handling is complete."
+#endif