X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Futils%2Ftestapp%2Fgen-ust-events-ns%2Fgen-ust-events-ns.c;h=dadfc3d3a00301bc81ba044ef19403585812ccda;hb=f895927f329180ca1e6f4426e9d3c6250ae698ba;hp=58a2066322ac79ed3695cc4382bc62bcac3fd478;hpb=8a5583046c46a5b424a8997fc563e7924f0c8724;p=lttng-tools.git

diff --git a/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.c b/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.c
index 58a206632..dadfc3d3a 100644
--- a/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.c
+++ b/tests/utils/testapp/gen-ust-events-ns/gen-ust-events-ns.c
@@ -1,18 +1,8 @@
 /*
  * Copyright (C) 2019 Michael Jeanson <mjeanson@efficios.com>
  *
- * This library is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation; version 2.1 of the License.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library 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 Lesser General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #ifndef _GNU_SOURCE
@@ -38,6 +28,37 @@
 
 #define LTTNG_PROC_NS_PATH_MAX 40
 
+/*
+ * The runner of this test validates that the kernel supports the
+ * namespace for which it is invoked. However, these defines are added
+ * to allow tests to run on systems that support a given namespace,
+ * but that use a libc that doesn't define its associated clone flag.
+ */
+#ifndef CLONE_NEWNS
+#define CLONE_NEWNS     0x00020000
+#endif
+#ifndef CLONE_NEWCGROUP
+#define CLONE_NEWCGROUP 0x02000000
+#endif
+#ifndef CLONE_NEWUTS
+#define CLONE_NEWUTS    0x04000000
+#endif
+#ifndef CLONE_NEWIPC
+#define CLONE_NEWIPC    0x08000000
+#endif
+#ifndef CLONE_NEWUSER
+#define CLONE_NEWUSER   0x10000000
+#endif
+#ifndef CLONE_NEWPID
+#define CLONE_NEWPID    0x20000000
+#endif
+#ifndef CLONE_NEWNET
+#define CLONE_NEWNET    0x40000000
+#endif
+#ifndef CLONE_NEWTIME
+#define CLONE_NEWTIME   0x00000080
+#endif
+
 static int nr_iter = 100;
 static int debug = 0;
 static char *ns_opt = NULL;
@@ -70,7 +91,7 @@ static void debug_printf(const char *format, ...)
 
 static int get_ns_inum(const char *ns, ino_t *ns_inum)
 {
-	int ret = 0;
+	int ret = -1;
 	struct stat sb;
 	char proc_ns_path[LTTNG_PROC_NS_PATH_MAX];
 
@@ -81,8 +102,7 @@ static int get_ns_inum(const char *ns, ino_t *ns_inum)
 			"/proc/thread-self/ns/%s", ns) >= 0) {
 		if (stat(proc_ns_path, &sb) == 0) {
 			*ns_inum = sb.st_ino;
-		} else {
-			ret = -1;
+			ret = 0;
 		}
 		goto end;
 	}
@@ -91,8 +111,7 @@ static int get_ns_inum(const char *ns, ino_t *ns_inum)
 			"/proc/self/task/%d/%s/net", lttng_gettid(), ns) >= 0) {
 		if (stat(proc_ns_path, &sb) == 0) {
 			*ns_inum = sb.st_ino;
-		} else {
-			ret = -1;
+			ret = 0;
 		}
 		goto end;
 	}
@@ -215,7 +234,7 @@ int main(int argc, const char **argv)
 		goto end;
 	}
 
-	if (strncmp(ns_opt, "cgroup", 3) == 0) {
+	if (strncmp(ns_opt, "cgroup", 6) == 0) {
 		ret = do_the_needful(CLONE_NEWCGROUP, "cgroup");
 	} else if (strncmp(ns_opt, "ipc", 3) == 0) {
 		ret = do_the_needful(CLONE_NEWIPC, "ipc");
@@ -225,7 +244,9 @@ int main(int argc, const char **argv)
 		ret = do_the_needful(CLONE_NEWNET, "net");
 	} else if (strncmp(ns_opt, "pid", 3) == 0) {
 		ret = do_the_needful(CLONE_NEWPID, "pid");
-	} else if (strncmp(ns_opt, "user", 3) == 0) {
+	} else if (strncmp(ns_opt, "time", 4) == 0) {
+		ret = do_the_needful(CLONE_NEWTIME, "time");
+	} else if (strncmp(ns_opt, "user", 4) == 0) {
 		/*
 		 * Will always fail, requires a single threaded application,
 		 * which can't happen with UST.