projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add snapshot output init call that uses URIs
[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 a117a1f1cfc8dd12cd02049455dbe82384825e04..048c1e16d83feb66ff4c499470189e655e163727 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-406,13
+406,13
@@
static void close_consumer_sockets(void)
if (ustconsumer32_data.err_sock >= 0) {
ret = close(ustconsumer32_data.err_sock);
if (ret < 0) {
if (ustconsumer32_data.err_sock >= 0) {
ret = close(ustconsumer32_data.err_sock);
if (ret < 0) {
- PERROR("UST consumer32 err_sock close");
+ PERROR("UST consumer
d
32 err_sock close");
}
}
if (ustconsumer64_data.err_sock >= 0) {
ret = close(ustconsumer64_data.err_sock);
if (ret < 0) {
}
}
if (ustconsumer64_data.err_sock >= 0) {
ret = close(ustconsumer64_data.err_sock);
if (ret < 0) {
- PERROR("UST consumer64 err_sock close");
+ PERROR("UST consumer
d
64 err_sock close");
}
}
if (kconsumer_data.cmd_sock >= 0) {
}
}
if (kconsumer_data.cmd_sock >= 0) {
@@
-424,13
+424,13
@@
static void close_consumer_sockets(void)
if (ustconsumer32_data.cmd_sock >= 0) {
ret = close(ustconsumer32_data.cmd_sock);
if (ret < 0) {
if (ustconsumer32_data.cmd_sock >= 0) {
ret = close(ustconsumer32_data.cmd_sock);
if (ret < 0) {
- PERROR("UST consumer32 cmd_sock close");
+ PERROR("UST consumer
d
32 cmd_sock close");
}
}
if (ustconsumer64_data.cmd_sock >= 0) {
ret = close(ustconsumer64_data.cmd_sock);
if (ret < 0) {
}
}
if (ustconsumer64_data.cmd_sock >= 0) {
ret = close(ustconsumer64_data.cmd_sock);
if (ret < 0) {
- PERROR("UST consumer64 cmd_sock close");
+ PERROR("UST consumer
d
64 cmd_sock close");
}
}
}
}
}
}
@@
-1149,12
+1149,14
@@
error:
if (ret) {
PERROR("close");
}
if (ret) {
PERROR("close");
}
+ consumer_data->err_sock = -1;
}
if (consumer_data->cmd_sock >= 0) {
ret = close(consumer_data->cmd_sock);
if (ret) {
PERROR("close");
}
}
if (consumer_data->cmd_sock >= 0) {
ret = close(consumer_data->cmd_sock);
if (ret) {
PERROR("close");
}
+ consumer_data->cmd_sock = -1;
}
if (consumer_data->metadata_sock.fd >= 0) {
ret = close(consumer_data->metadata_sock.fd);
}
if (consumer_data->metadata_sock.fd >= 0) {
ret = close(consumer_data->metadata_sock.fd);
@@
-4143,6
+4145,16
@@
static int set_consumer_sockets(struct consumer_data *consumer_data,
goto error;
}
goto error;
}
+ /*
+ * Set the CLOEXEC flag. Return code is useless because either way, the
+ * show must go on.
+ */
+ ret = utils_set_fd_cloexec(consumer_data->err_sock);
+ if (ret < 0) {
+ PERROR("utils_set_fd_cloexec");
+ /* continue anyway */
+ }
+
/* File permission MUST be 660 */
ret = chmod(consumer_data->err_unix_sock_path,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
/* File permission MUST be 660 */
ret = chmod(consumer_data->err_unix_sock_path,
S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP);
This page took
0.02491 seconds
and
4
git commands to generate.