projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix UST SIGPIPE handling
[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 8b2e775a779d3ff966c4d241d3e18c6532c189d6..078b56a01bb68c49c2322fc2a8f454d597305314 100644
(file)
--- a/
liblttng-ust-comm/lttng-ust-comm.c
+++ b/
liblttng-ust-comm/lttng-ust-comm.c
@@
-29,8
+29,9
@@
#include <unistd.h>
#include <assert.h>
#include <errno.h>
#include <unistd.h>
#include <assert.h>
#include <errno.h>
+#include <fcntl.h>
-#include <
lttng/
ust-comm.h>
+#include <ust-comm.h>
/*
* Human readable error message.
/*
* Human readable error message.
@@
-119,12
+120,17
@@
int ustcomm_connect_unix_sock(const char *pathname)
* 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.
*/
- fd = socket(PF_UNIX, SOCK_STREAM
| SOCK_CLOEXEC
, 0);
+ fd = socket(PF_UNIX, SOCK_STREAM, 0);
if (fd < 0) {
perror("socket");
ret = fd;
goto error;
}
if (fd < 0) {
perror("socket");
ret = fd;
goto error;
}
+ ret = fcntl(fd, F_SETFD, FD_CLOEXEC);
+ if (ret < 0) {
+ perror("fcntl");
+ goto error_fcntl;
+ }
memset(&sun, 0, sizeof(sun));
sun.sun_family = AF_UNIX;
memset(&sun, 0, sizeof(sun));
sun.sun_family = AF_UNIX;
@@
-144,6
+150,7
@@
int ustcomm_connect_unix_sock(const char *pathname)
return fd;
error_connect:
return fd;
error_connect:
+error_fcntl:
close(fd);
error:
return ret;
close(fd);
error:
return ret;
@@
-237,17
+244,21
@@
int ustcomm_listen_unix_sock(int sock)
*/
ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
{
*/
ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
{
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
struct iovec iov[1];
ssize_t ret = -1;
+ memset(&msg, 0, sizeof(msg));
+
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
- ret = recvmsg(sock, &msg, 0);
- if (ret < 0) {
+ do {
+ ret = recvmsg(sock, &msg, 0);
+ } while (ret < 0 && errno == EINTR);
+ if (ret < 0 && errno != EPIPE) {
perror("recvmsg");
}
perror("recvmsg");
}
@@
-262,10
+273,12
@@
ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
*/
ssize_t ustcomm_send_unix_sock(int sock, void *buf, size_t len)
{
*/
ssize_t ustcomm_send_unix_sock(int sock, void *buf, size_t len)
{
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
struct iovec iov[1];
ssize_t ret = -1;
+ memset(&msg, 0, sizeof(msg));
+
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
iov[0].iov_base = buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
@@
-278,8
+291,10
@@
ssize_t ustcomm_send_unix_sock(int sock, void *buf, size_t len)
* by ignoring SIGPIPE, but we don't have this luxury on the
* libust side.
*/
* by ignoring SIGPIPE, but we don't have this luxury on the
* libust side.
*/
- ret = sendmsg(sock, &msg, MSG_NOSIGNAL);
- if (ret < 0) {
+ do {
+ ret = sendmsg(sock, &msg, MSG_NOSIGNAL);
+ } while (ret < 0 && errno == EINTR);
+ if (ret < 0 && errno != EPIPE) {
perror("sendmsg");
}
perror("sendmsg");
}
@@
-295,10
+310,9
@@
int ustcomm_close_unix_sock(int sock)
{
int ret;
{
int ret;
- /* Shutdown receptions and transmissions */
- ret = shutdown(sock, SHUT_RDWR);
+ ret = close(sock);
if (ret < 0) {
if (ret < 0) {
- perror("
shutdown
");
+ perror("
close
");
}
return ret;
}
return ret;
@@
-311,13
+325,15
@@
int ustcomm_close_unix_sock(int sock)
*/
ssize_t ustcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd, size_t len)
{
*/
ssize_t ustcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd, size_t len)
{
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret = -1;
unsigned int sizeof_fds = nb_fd * sizeof(int);
char tmp[CMSG_SPACE(sizeof_fds)];
struct cmsghdr *cmptr;
struct iovec iov[1];
ssize_t ret = -1;
unsigned int sizeof_fds = nb_fd * sizeof(int);
char tmp[CMSG_SPACE(sizeof_fds)];
+ memset(&msg, 0, sizeof(msg));
+
/*
* Note: the consumerd receiver only supports receiving one FD per
* message.
/*
* Note: the consumerd receiver only supports receiving one FD per
* message.
@@
-340,8
+356,10
@@
ssize_t ustcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd,
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
- ret = sendmsg(sock, &msg, 0);
- if (ret < 0) {
+ do {
+ ret = sendmsg(sock, &msg, MSG_NOSIGNAL);
+ } while (ret < 0 && errno == EINTR);
+ if (ret < 0 && errno != EPIPE) {
perror("sendmsg");
}
perror("sendmsg");
}
@@
-355,16
+373,15
@@
int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum)
len = ustcomm_send_unix_sock(sock, lum, sizeof(*lum));
switch (len) {
case sizeof(*lum):
len = ustcomm_send_unix_sock(sock, lum, sizeof(*lum));
switch (len) {
case sizeof(*lum):
- printf("message successfully sent\n");
break;
case -1:
if (errno == ECONNRESET) {
break;
case -1:
if (errno == ECONNRESET) {
-
printf(
"remote end closed connection\n");
+
fprintf(stderr,
"remote end closed connection\n");
return 0;
}
return -1;
default:
return 0;
}
return -1;
default:
-
printf(
"incorrect message size: %zd\n", len);
+
fprintf(stderr,
"incorrect message size: %zd\n", len);
return -1;
}
return 0;
return -1;
}
return 0;
@@
-379,33
+396,35
@@
int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur,
len = ustcomm_recv_unix_sock(sock, lur, sizeof(*lur));
switch (len) {
case 0: /* orderly shutdown */
len = ustcomm_recv_unix_sock(sock, lur, sizeof(*lur));
switch (len) {
case 0: /* orderly shutdown */
- printf("Application has performed an orderly shutdown\n");
return -EINVAL;
case sizeof(*lur):
return -EINVAL;
case sizeof(*lur):
- printf("result message received\n");
if (lur->handle != expected_handle) {
if (lur->handle != expected_handle) {
-
printf(
"Unexpected result message handle\n");
+
fprintf(stderr,
"Unexpected result message handle\n");
return -EINVAL;
}
if (lur->cmd != expected_cmd) {
return -EINVAL;
}
if (lur->cmd != expected_cmd) {
-
printf(
"Unexpected result message command\n");
+
fprintf(stderr,
"Unexpected result message command\n");
return -EINVAL;
}
if (lur->ret_code != USTCOMM_OK) {
return -EINVAL;
}
if (lur->ret_code != USTCOMM_OK) {
- printf("remote operation failed with code %d.\n",
- lur->ret_code);
+ /*
+ * Some errors are normal.. we should put this
+ * in a debug level message...
+ * fprintf(stderr, "remote operation failed with code %d.\n",
+ * lur->ret_code);
+ */
return lur->ret_code;
}
return 0;
case -1:
if (errno == ECONNRESET) {
return lur->ret_code;
}
return 0;
case -1:
if (errno == ECONNRESET) {
-
printf(
"remote end closed connection\n");
+
fprintf(stderr,
"remote end closed connection\n");
return -EINVAL;
}
return -1;
default:
return -EINVAL;
}
return -1;
default:
-
printf(
"incorrect message size: %zd\n", len);
+
fprintf(stderr,
"incorrect message size: %zd\n", len);
return len > 0 ? -1 : len;
}
}
return len > 0 ? -1 : len;
}
}
@@
-438,13
+457,15
@@
int ustcomm_recv_fd(int sock)
int data_fd;
struct cmsghdr *cmsg;
char recv_fd[CMSG_SPACE(sizeof(int))];
int data_fd;
struct cmsghdr *cmsg;
char recv_fd[CMSG_SPACE(sizeof(int))];
- struct msghdr msg
= { 0 }
;
+ struct msghdr msg;
union {
unsigned char vc[4];
int vi;
} tmp;
int i;
union {
unsigned char vc[4];
int vi;
} tmp;
int i;
+ memset(&msg, 0, sizeof(msg));
+
/* Prepare to receive the structures */
iov[0].iov_base = &data_fd;
iov[0].iov_len = sizeof(data_fd);
/* Prepare to receive the structures */
iov[0].iov_base = &data_fd;
iov[0].iov_len = sizeof(data_fd);
@@
-453,23
+474,27
@@
int ustcomm_recv_fd(int sock)
msg.msg_control = recv_fd;
msg.msg_controllen = sizeof(recv_fd);
msg.msg_control = recv_fd;
msg.msg_controllen = sizeof(recv_fd);
- printf("Waiting to receive fd\n");
- if ((ret = recvmsg(sock, &msg, 0)) < 0) {
- perror("recvmsg");
+ do {
+ ret = recvmsg(sock, &msg, 0);
+ } while (ret < 0 && errno == EINTR);
+ if (ret < 0) {
+ if (errno != EPIPE) {
+ perror("recvmsg");
+ }
goto end;
}
if (ret != sizeof(data_fd)) {
goto end;
}
if (ret != sizeof(data_fd)) {
-
printf("Received %d bytes, expected %l
d", ret, sizeof(data_fd));
+
fprintf(stderr, "Received %d bytes, expected %z
d", ret, sizeof(data_fd));
goto end;
}
cmsg = CMSG_FIRSTHDR(&msg);
if (!cmsg) {
goto end;
}
cmsg = CMSG_FIRSTHDR(&msg);
if (!cmsg) {
-
printf(
"Invalid control message header\n");
+
fprintf(stderr,
"Invalid control message header\n");
ret = -1;
goto end;
}
if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
ret = -1;
goto end;
}
if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
-
printf(
"Didn't received any fd\n");
+
fprintf(stderr,
"Didn't received any fd\n");
ret = -1;
goto end;
}
ret = -1;
goto end;
}
@@
-477,7
+502,10
@@
int ustcomm_recv_fd(int sock)
for (i = 0; i < sizeof(int); i++)
tmp.vc[i] = CMSG_DATA(cmsg)[i];
ret = tmp.vi;
for (i = 0; i < sizeof(int); i++)
tmp.vc[i] = CMSG_DATA(cmsg)[i];
ret = tmp.vi;
- printf("received fd %d\n", ret);
+ /*
+ * Useful for fd leak debug.
+ * fprintf(stderr, "received fd %d\n", ret);
+ */
end:
return ret;
}
end:
return ret;
}
This page took
0.053934 seconds
and
4
git commands to generate.