projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: ustctl need to send the second fd upon error of 1st fd
[lttng-ust.git]
/
liblttng-ust
/
lttng-ust-comm.c
diff --git
a/liblttng-ust/lttng-ust-comm.c
b/liblttng-ust/lttng-ust-comm.c
index b90df8610edb6cee07e0bef8ac4ec82cb787b5a2..0116b5f744160cab7d4077146d4a532f606359d8 100644
(file)
--- a/
liblttng-ust/lttng-ust-comm.c
+++ b/
liblttng-ust/lttng-ust-comm.c
@@
-325,14
+325,20
@@
end:
|| lum->cmd == LTTNG_UST_CHANNEL
|| lum->cmd == LTTNG_UST_METADATA)
&& lur.ret_code == USTCOMM_OK) {
|| lum->cmd == LTTNG_UST_CHANNEL
|| lum->cmd == LTTNG_UST_METADATA)
&& lur.ret_code == USTCOMM_OK) {
+ int sendret = 0;
+
/* we also need to send the file descriptors. */
ret = ustcomm_send_fds_unix_sock(sock,
&shm_fd, &shm_fd,
1, sizeof(int));
if (ret < 0) {
perror("send shm_fd");
/* we also need to send the file descriptors. */
ret = ustcomm_send_fds_unix_sock(sock,
&shm_fd, &shm_fd,
1, sizeof(int));
if (ret < 0) {
perror("send shm_fd");
-
goto error
;
+
sendret = ret
;
}
}
+ /*
+ * The sessiond expects 2 file descriptors, even upon
+ * error.
+ */
ret = ustcomm_send_fds_unix_sock(sock,
&wait_fd, &wait_fd,
1, sizeof(int));
ret = ustcomm_send_fds_unix_sock(sock,
&wait_fd, &wait_fd,
1, sizeof(int));
@@
-340,6
+346,10
@@
end:
perror("send wait_fd");
goto error;
}
perror("send wait_fd");
goto error;
}
+ if (sendret) {
+ ret = sendret;
+ goto error;
+ }
}
/*
* We still have the memory map reference, and the fds have been
}
/*
* We still have the memory map reference, and the fds have been
@@
-396,7
+406,7
@@
void cleanup_sock_info(struct sock_info *sock_info, int exiting)
int ret;
if (sock_info->socket != -1) {
int ret;
if (sock_info->socket != -1) {
- ret =
close
(sock_info->socket);
+ ret =
ustcomm_close_unix_sock
(sock_info->socket);
if (ret) {
ERR("Error closing apps socket");
}
if (ret) {
ERR("Error closing apps socket");
}
@@
-676,7
+686,7
@@
restart:
}
if (sock_info->socket != -1) {
}
if (sock_info->socket != -1) {
- ret =
close
(sock_info->socket);
+ ret =
ustcomm_close_unix_sock
(sock_info->socket);
if (ret) {
ERR("Error closing %s apps socket", sock_info->name);
}
if (ret) {
ERR("Error closing %s apps socket", sock_info->name);
}
@@
-840,6
+850,7
@@
void __attribute__((constructor)) lttng_ust_init(void)
*/
lttng_fixup_event_tls();
lttng_fixup_ringbuffer_tls();
*/
lttng_fixup_event_tls();
lttng_fixup_ringbuffer_tls();
+ lttng_fixup_vtid_tls();
/*
* We want precise control over the order in which we construct
/*
* We want precise control over the order in which we construct
This page took
0.024177 seconds
and
4
git commands to generate.