projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: print format type mismatch
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
health-relayd.c
diff --git
a/src/bin/lttng-relayd/health-relayd.c
b/src/bin/lttng-relayd/health-relayd.c
index 89b6402fabad3e62ff69c5e9e8b62e5c15d0d0b8..402b44277777b07a7ccd9e49d47e69e1049549d7 100644
(file)
--- a/
src/bin/lttng-relayd/health-relayd.c
+++ b/
src/bin/lttng-relayd/health-relayd.c
@@
-160,6
+160,10
@@
int setup_health_path(void)
if (is_root) {
rundir = strdup(DEFAULT_LTTNG_RUNDIR);
if (is_root) {
rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+ if (!rundir) {
+ ret = -ENOMEM;
+ goto end;
+ }
} else {
/*
* Create rundir from home path. This will create something like
} else {
/*
* Create rundir from home path. This will create something like
@@
-325,6
+329,11
@@
restart:
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
revents = LTTNG_POLL_GETEV(&events, i);
pollfd = LTTNG_POLL_GETFD(&events, i);
+ if (!revents) {
+ /* No activity for this FD (poll implementation). */
+ continue;
+ }
+
/* Thread quit pipe has been closed. Killing thread. */
ret = check_health_quit_pipe(pollfd, revents);
if (ret) {
/* Thread quit pipe has been closed. Killing thread. */
ret = check_health_quit_pipe(pollfd, revents);
if (ret) {
@@
-368,7
+377,7
@@
restart:
assert(msg.cmd == HEALTH_CMD_CHECK);
assert(msg.cmd == HEALTH_CMD_CHECK);
-
reply.ret_code = 0
;
+
memset(&reply, 0, sizeof(reply))
;
for (i = 0; i < NR_HEALTH_RELAYD_TYPES; i++) {
/*
* health_check_state return 0 if thread is in
for (i = 0; i < NR_HEALTH_RELAYD_TYPES; i++) {
/*
* health_check_state return 0 if thread is in
This page took
0.027245 seconds
and
4
git commands to generate.