projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: compile all unit tests as C++
[lttng-tools.git]
/
tests
/
utils
/
testapp
/
gen-ust-events-ns
/
gen-ust-events-ns.c
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 c5f25dd7bb1308cc17f34492052e0d2ed339a7dd..dadfc3d3a00301bc81ba044ef19403585812ccda 100644
(file)
--- 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
@@
-55,6
+55,9
@@
#ifndef CLONE_NEWNET
#define CLONE_NEWNET 0x40000000
#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 int nr_iter = 100;
static int debug = 0;
@@
-88,7
+91,7
@@
static void debug_printf(const char *format, ...)
static int get_ns_inum(const char *ns, ino_t *ns_inum)
{
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];
struct stat sb;
char proc_ns_path[LTTNG_PROC_NS_PATH_MAX];
@@
-99,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;
"/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;
}
}
goto end;
}
@@
-109,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;
"/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;
}
}
goto end;
}
@@
-233,7
+234,7
@@
int main(int argc, const char **argv)
goto end;
}
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");
ret = do_the_needful(CLONE_NEWCGROUP, "cgroup");
} else if (strncmp(ns_opt, "ipc", 3) == 0) {
ret = do_the_needful(CLONE_NEWIPC, "ipc");
@@
-243,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");
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.
/*
* Will always fail, requires a single threaded application,
* which can't happen with UST.
This page took
0.024511 seconds
and
4
git commands to generate.