projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: status_loc argument of waitpid() is used on error
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 9cde946495436f04590339475e96f95b5ea7421c..d9355b0199cc242d542e781d2ff1808d7b723afb 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-79,6
+79,14
@@
#define CONSUMERD_FILE "lttng-consumerd"
#define CONSUMERD_FILE "lttng-consumerd"
+static const char *help_msg =
+#ifdef LTTNG_EMBED_HELP
+#include <lttng-sessiond.8.h>
+#else
+NULL
+#endif
+;
+
const char *progname;
const char *tracing_group_name = DEFAULT_TRACING_GROUP;
static int tracing_group_name_override;
const char *progname;
const char *tracing_group_name = DEFAULT_TRACING_GROUP;
static int tracing_group_name_override;
@@
-592,8
+600,7
@@
static void wait_consumer(struct consumer_data *consumer_data)
ret = waitpid(consumer_data->pid, &status, 0);
if (ret == -1) {
PERROR("consumerd waitpid pid: %d", consumer_data->pid)
ret = waitpid(consumer_data->pid, &status, 0);
if (ret == -1) {
PERROR("consumerd waitpid pid: %d", consumer_data->pid)
- }
- if (!WIFEXITED(status)) {
+ } else if (!WIFEXITED(status)) {
ERR("consumerd termination with error: %d",
WEXITSTATUS(ret));
}
ERR("consumerd termination with error: %d",
WEXITSTATUS(ret));
}
@@
-4757,9
+4764,9
@@
static int set_option(int opt, const char *arg, const char *optname)
tracing_group_name_override = 1;
}
} else if (string_match(optname, "help") || opt == 'h') {
tracing_group_name_override = 1;
}
} else if (string_match(optname, "help") || opt == 'h') {
- ret = utils_show_
man_page(8, "lttng-sessiond"
);
+ ret = utils_show_
help(8, "lttng-sessiond", help_msg
);
if (ret) {
if (ret) {
- ERR("Cannot
view man page lttng-sessiond(8)
");
+ ERR("Cannot
show --help for `lttng-sessiond`
");
perror("exec");
}
exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
perror("exec");
}
exit(ret ? EXIT_FAILURE : EXIT_SUCCESS);
This page took
0.025136 seconds
and
5
git commands to generate.