projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: ust-tracepoint-event.h: extract `__num_fields` in a variable
[lttng-ust.git]
/
liblttng-ust-comm
/
lttng-ust-comm.c
diff --git
a/liblttng-ust-comm/lttng-ust-comm.c
b/liblttng-ust-comm/lttng-ust-comm.c
index 92d86d4ecbfb0c2309a7126366ae5da6fdd7272b..814ccde17954b82200242e4ec03304907c2fac5c 100644
(file)
--- a/
liblttng-ust-comm/lttng-ust-comm.c
+++ b/
liblttng-ust-comm/lttng-ust-comm.c
@@
-19,6
+19,7
@@
#define _GNU_SOURCE
#include <limits.h>
#define _GNU_SOURCE
#include <limits.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-106,6
+107,7
@@
int ustcomm_connect_unix_sock(const char *pathname, long timeout)
/*
* libust threads require the close-on-exec flag for all
* resources so it does not leak file descriptors upon exec.
/*
* libust threads require the close-on-exec flag for all
* resources so it does not leak file descriptors upon exec.
+ * SOCK_CLOEXEC is not used since it is linux specific.
*/
fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
*/
fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
@@
-438,8
+440,6
@@
ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
/*
* Recv a message accompanied by fd(s) from a unix socket.
*
/*
* Recv a message accompanied by fd(s) from a unix socket.
*
- * Returns the size of received data, or negative error value.
- *
* Expect at most "nb_fd" file descriptors. Returns the number of fd
* actually received in nb_fd.
* Returns -EPIPE on orderly shutdown.
* Expect at most "nb_fd" file descriptors. Returns the number of fd
* actually received in nb_fd.
* Returns -EPIPE on orderly shutdown.
@@
-453,6
+453,7
@@
ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
char recv_fd[CMSG_SPACE(sizeof_fds)];
struct msghdr msg;
char dummy;
char recv_fd[CMSG_SPACE(sizeof_fds)];
struct msghdr msg;
char dummy;
+ int i;
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
@@
-508,8
+509,19
@@
ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+
memcpy(fds, CMSG_DATA(cmsg), sizeof_fds);
memcpy(fds, CMSG_DATA(cmsg), sizeof_fds);
- ret = sizeof_fds;
+
+ /* Set FD_CLOEXEC */
+ for (i = 0; i < nb_fd; i++) {
+ ret = fcntl(fds[i], F_SETFD, FD_CLOEXEC);
+ if (ret < 0) {
+ PERROR("fcntl failed to set FD_CLOEXEC on fd %d",
+ fds[i]);
+ }
+ }
+
+ ret = nb_fd;
end:
return ret;
}
end:
return ret;
}
@@
-630,12
+642,12
@@
ssize_t ustcomm_recv_channel_from_sessiond(int sock,
ret = lttng_ust_add_fd_to_tracker(wakeup_fd);
if (ret < 0) {
ret = lttng_ust_add_fd_to_tracker(wakeup_fd);
if (ret < 0) {
- lttng_ust_unlock_fd_tracker();
ret = close(wakeup_fd);
if (ret) {
PERROR("close on wakeup_fd");
}
len = -EIO;
ret = close(wakeup_fd);
if (ret) {
PERROR("close on wakeup_fd");
}
len = -EIO;
+ lttng_ust_unlock_fd_tracker();
goto error_recv;
}
goto error_recv;
}
@@
-676,19
+688,18
@@
int ustcomm_recv_stream_from_sessiond(int sock,
ret = lttng_ust_add_fd_to_tracker(fds[0]);
if (ret < 0) {
ret = lttng_ust_add_fd_to_tracker(fds[0]);
if (ret < 0) {
- lttng_ust_unlock_fd_tracker();
ret = close(fds[0]);
if (ret) {
PERROR("close on received shm_fd");
}
ret = -EIO;
ret = close(fds[0]);
if (ret) {
PERROR("close on received shm_fd");
}
ret = -EIO;
+ lttng_ust_unlock_fd_tracker();
goto error;
}
*shm_fd = ret;
ret = lttng_ust_add_fd_to_tracker(fds[1]);
if (ret < 0) {
goto error;
}
*shm_fd = ret;
ret = lttng_ust_add_fd_to_tracker(fds[1]);
if (ret < 0) {
- lttng_ust_unlock_fd_tracker();
ret = close(*shm_fd);
if (ret) {
PERROR("close on shm_fd");
ret = close(*shm_fd);
if (ret) {
PERROR("close on shm_fd");
@@
-699,6
+710,7
@@
int ustcomm_recv_stream_from_sessiond(int sock,
PERROR("close on received wakeup_fd");
}
ret = -EIO;
PERROR("close on received wakeup_fd");
}
ret = -EIO;
+ lttng_ust_unlock_fd_tracker();
goto error;
}
*wakeup_fd = ret;
goto error;
}
*wakeup_fd = ret;
This page took
0.024886 seconds
and
4
git commands to generate.