From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 22 Feb 2012 22:09:37 +0000 (-0500)
Subject: Revert "Add freebsd rfork support"
X-Git-Tag: v2.0.0-rc2~33
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=999120147ad5227719d8eef73bd87a976efbe1a3;p=lttng-ust.git

Revert "Add freebsd rfork support"

This reverts commit 16295480956eae5c1c3a83546353143bef1885ba.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust-fork/ustfork.c b/liblttng-ust-fork/ustfork.c
index 8fade56e..ac191971 100644
--- a/liblttng-ust-fork/ustfork.c
+++ b/liblttng-ust-fork/ustfork.c
@@ -28,6 +28,8 @@
 
 #include <lttng/ust.h>
 
+struct user_desc;
+
 pid_t fork(void)
 {
 	static pid_t (*plibc_func)(void) = NULL;
@@ -54,10 +56,6 @@ pid_t fork(void)
 	return retval;
 }
 
-#ifdef __linux__
-
-struct user_desc;
-
 struct ustfork_clone_info {
 	int (*fn)(void *);
 	void *arg;
@@ -119,41 +117,3 @@ int clone(int (*fn)(void *), void *child_stack, int flags, void *arg, ...)
 	}
 	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