X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Fclone.h;h=581595be05d8522ee41ea9ef549e4c69d5530acf;hp=6685c6f6e9ed084ac5817beb5abe4c4f635a0e9f;hb=b1325effaf300e21bb804113cc202b0e42ea61da;hpb=7657ae75b85d728d84c2f540df6a3739a167090c

diff --git a/src/common/compat/clone.h b/src/common/compat/clone.h
index 6685c6f6e..581595be0 100644
--- a/src/common/compat/clone.h
+++ b/src/common/compat/clone.h
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <dgoulet@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  * more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef _COMPAT_CLONE_H
@@ -23,7 +23,7 @@
 #include <sched.h>
 
 static inline
-int lttng_clone_files(int (*fn)(void *), void *child_stack, void *arg)
+pid_t lttng_clone_files(int (*fn)(void *), void *child_stack, void *arg)
 {
 	return clone(fn, child_stack, CLONE_FILES | SIGCHLD, arg);
 }
@@ -33,9 +33,27 @@ int lttng_clone_files(int (*fn)(void *), void *child_stack, void *arg)
 #include <unistd.h>
 
 static inline
-int lttng_clone_files(int (*fn)(void *), void *child_stack, void *arg)
+pid_t lttng_clone_files(int (*fn)(void *), void *child_stack, void *arg)
 {
-	return rfork(RFPROC | RFTHREAD);
+	pid_t pid;
+
+	pid = rfork(RFPROC | RFTHREAD);
+	if (pid == 0) {
+		/* child */
+		int ret;
+
+		ret = fn(arg);
+		exit(ret);
+	} else if (pid > 0) {
+		/* parent */
+		/*
+		 * Just return, the caller will wait for the child.
+		 */
+		return pid;
+	} else {
+		/* Error */
+		return pid;
+	}
 }
 
 #else