projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: update tests following renaming of UST statedump event
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
unix.c
diff --git
a/src/common/sessiond-comm/unix.c
b/src/common/sessiond-comm/unix.c
index cf285c7e2dc83e8bb8c92d9d45769d589c1015a5..8d2e03a5b3f7b1ed894da2eae4dc67693b9a0d3d 100644
(file)
--- a/
src/common/sessiond-comm/unix.c
+++ b/
src/common/sessiond-comm/unix.c
@@
-182,7
+182,7
@@
ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
do {
len_last = iov[0].iov_len;
do {
len_last = iov[0].iov_len;
- ret =
recvmsg(sock, &msg, MSG_NOSIGNAL
);
+ ret =
lttng_recvmsg_nosigpipe(sock, &msg
);
if (ret > 0) {
iov[0].iov_base += ret;
iov[0].iov_len -= ret;
if (ret > 0) {
iov[0].iov_base += ret;
iov[0].iov_len -= ret;
@@
-205,7
+205,7
@@
ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
* Return the size of sent data.
*/
LTTNG_HIDDEN
* Return the size of sent data.
*/
LTTNG_HIDDEN
-ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
+ssize_t lttcomm_send_unix_sock(int sock,
const
void *buf, size_t len)
{
struct msghdr msg;
struct iovec iov[1];
{
struct msghdr msg;
struct iovec iov[1];
@@
-213,7
+213,7
@@
ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
- iov[0].iov_base = buf;
+ iov[0].iov_base =
(void *)
buf;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
iov[0].iov_len = len;
msg.msg_iov = iov;
msg.msg_iovlen = 1;
@@
-524,7
+524,7
@@
ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
}
memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
}
memcpy(creds, CMSG_DATA(cmptr), sizeof_cred);
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__)
|| defined(__sun__)
)
{
int peer_ret;
{
int peer_ret;
@@
-557,7
+557,7
@@
int lttcomm_setsockopt_creds_unix_sock(int sock)
}
return ret;
}
}
return ret;
}
-#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__)
|| defined(__sun__)
)
LTTNG_HIDDEN
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
LTTNG_HIDDEN
int lttcomm_setsockopt_creds_unix_sock(int sock)
{
This page took
0.03814 seconds
and
4
git commands to generate.