projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: report to client when snapshot will be empty
[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 2ce1c1fdafa763a180e15d894de041fb55369664..6b4a742f8e5fa95066e29b3e922ff13bd449eb31 100644
(file)
--- a/
src/bin/lttng-relayd/health-relayd.c
+++ b/
src/bin/lttng-relayd/health-relayd.c
@@
-54,8
+54,6
@@
/* Global health check unix path */
static char health_unix_sock_path[PATH_MAX];
/* Global health check unix path */
static char health_unix_sock_path[PATH_MAX];
-static char *relayd_path;
-static char *lttng_rundir;
int health_quit_pipe[2];
int health_quit_pipe[2];
@@
-135,12
+133,12
@@
static
int setup_health_path(void)
{
int is_root, ret = 0;
int setup_health_path(void)
{
int is_root, ret = 0;
- char *home_path = NULL;
+ char *home_path = NULL
, *rundir = NULL, *relayd_path
;
is_root = !getuid();
if (is_root) {
is_root = !getuid();
if (is_root) {
-
lttng_
rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+ rundir = strdup(DEFAULT_LTTNG_RUNDIR);
} else {
/*
* Create rundir from home path. This will create something like
} else {
/*
* Create rundir from home path. This will create something like
@@
-155,20
+153,20
@@
int setup_health_path(void)
goto end;
}
goto end;
}
- ret = asprintf(&
lttng_
rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
+ ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
}
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
}
- ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH,
lttng_
rundir);
+ ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, rundir);
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
- ret = create_lttng_rundir_with_perm(
lttng_
rundir);
+ ret = create_lttng_rundir_with_perm(rundir);
if (ret < 0) {
goto end;
}
if (ret < 0) {
goto end;
}
@@
-197,6
+195,7
@@
int setup_health_path(void)
}
end:
}
end:
+ free(rundir);
return ret;
}
return ret;
}
@@
-379,11
+378,6
@@
error:
}
DBG("Health check thread dying");
unlink(health_unix_sock_path);
}
DBG("Health check thread dying");
unlink(health_unix_sock_path);
- (void) rmdir(relayd_path);
- free(relayd_path);
- (void) rmdir(lttng_rundir);
- free(lttng_rundir);
-
if (sock >= 0) {
ret = close(sock);
if (ret) {
if (sock >= 0) {
ret = close(sock);
if (ret) {
@@
-391,6
+385,11
@@
error:
}
}
}
}
+ /*
+ * We do NOT rmdir rundir nor the relayd path because there are
+ * other processes using them.
+ */
+
lttng_poll_clean(&events);
rcu_unregister_thread();
lttng_poll_clean(&events);
rcu_unregister_thread();
This page took
0.024719 seconds
and
4
git commands to generate.