From 853b12e91f8fb572334ea43252de8543a11f6602 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 17 Sep 2015 12:47:00 -0400 Subject: [PATCH] Port: removed unused clone() compat MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- src/common/compat/Makefile.am | 2 +- src/common/compat/clone.h | 63 ----------------------------------- 2 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 src/common/compat/clone.h diff --git a/src/common/compat/Makefile.am b/src/common/compat/Makefile.am index 7cd3f91fc..9b1211701 100644 --- a/src/common/compat/Makefile.am +++ b/src/common/compat/Makefile.am @@ -8,6 +8,6 @@ else COMPAT=compat-poll.c endif -libcompat_la_SOURCES = poll.h fcntl.h endian.h mman.h clone.h \ +libcompat_la_SOURCES = poll.h fcntl.h endian.h mman.h \ socket.h compat-fcntl.c uuid.h tid.h \ getenv.h string.h $(COMPAT) diff --git a/src/common/compat/clone.h b/src/common/compat/clone.h deleted file mode 100644 index 581595be0..000000000 --- a/src/common/compat/clone.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (C) 2011 - David Goulet - * - * 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., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef _COMPAT_CLONE_H -#define _COMPAT_CLONE_H - -#ifdef __linux__ - -#include - -static inline -pid_t lttng_clone_files(int (*fn)(void *), void *child_stack, void *arg) -{ - return clone(fn, child_stack, CLONE_FILES | SIGCHLD, arg); -} - -#elif defined(__FreeBSD__) - -#include - -static inline -pid_t lttng_clone_files(int (*fn)(void *), void *child_stack, void *arg) -{ - 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 -#error "Please add support for your OS." -#endif /* __linux__ , __FreeBSD__ */ - -#endif /* _COMPAT_CLONE_H */ -- 2.34.1