projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement snapshot commands in lttng-sessiond
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
inet.c
diff --git
a/src/common/sessiond-comm/inet.c
b/src/common/sessiond-comm/inet.c
index f9ea17dbf975b246448e463b69ff64978745c9bc..f55482e422f173dd28921201b2815651299ad205 100644
(file)
--- a/
src/common/sessiond-comm/inet.c
+++ b/
src/common/sessiond-comm/inet.c
@@
-26,8
+26,7
@@
#include <unistd.h>
#include <errno.h>
#include <unistd.h>
#include <errno.h>
-#include <common/defaults.h>
-#include <common/error.h>
+#include <common/common.h>
#include "inet.h"
#include "inet.h"
@@
-47,7
+46,7
@@
static const struct lttcomm_proto_ops inet_ops = {
/*
* Creates an PF_INET socket.
*/
/*
* Creates an PF_INET socket.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_create_inet_sock(struct lttcomm_sock *sock, int type, int proto)
{
int val = 1, ret;
int lttcomm_create_inet_sock(struct lttcomm_sock *sock, int type, int proto)
{
int val = 1, ret;
@@
-78,7
+77,7
@@
error:
/*
* Bind socket and return.
*/
/*
* Bind socket and return.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
int ret;
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
int ret;
@@
-95,7
+94,7
@@
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
/*
* Connect PF_INET socket.
*/
/*
* Connect PF_INET socket.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_connect_inet_sock(struct lttcomm_sock *sock)
{
int ret, closeret;
int lttcomm_connect_inet_sock(struct lttcomm_sock *sock)
{
int ret, closeret;
@@
-125,7
+124,7
@@
error_connect:
* Do an accept(2) on the sock and return the new lttcomm socket. The socket
* MUST be bind(2) before.
*/
* Do an accept(2) on the sock and return the new lttcomm socket. The socket
* MUST be bind(2) before.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
{
int new_fd;
struct lttcomm_sock *lttcomm_accept_inet_sock(struct lttcomm_sock *sock)
{
int new_fd;
@@
-169,7
+168,7
@@
error:
/*
* Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
*/
/*
* Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_listen_inet_sock(struct lttcomm_sock *sock, int backlog)
{
int ret;
int lttcomm_listen_inet_sock(struct lttcomm_sock *sock, int backlog)
{
int ret;
@@
-200,13
+199,14
@@
end:
*
* Return the size of received data.
*/
*
* Return the size of received data.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
size_t len, int flags)
{
struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
size_t len, int flags)
{
struct msghdr msg;
struct iovec iov[1];
ssize_t ret = -1;
+ size_t len_last;
memset(&msg, 0, sizeof(msg));
memset(&msg, 0, sizeof(msg));
@@
-218,16
+218,21
@@
ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
msg.msg_name = (struct sockaddr *) &sock->sockaddr.addr.sin;
msg.msg_namelen = sizeof(sock->sockaddr.addr.sin);
- if (flags == 0) {
- flags = MSG_WAITALL;
- }
-
do {
do {
+ len_last = iov[0].iov_len;
ret = recvmsg(sock->fd, &msg, flags);
ret = recvmsg(sock->fd, &msg, flags);
- } while (ret < 0 && errno == EINTR);
+ if (ret > 0) {
+ iov[0].iov_base += ret;
+ iov[0].iov_len -= ret;
+ assert(ret <= len_last);
+ }
+ } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
if (ret < 0) {
PERROR("recvmsg inet");
if (ret < 0) {
PERROR("recvmsg inet");
+ } else if (ret > 0) {
+ ret = len;
}
}
+ /* Else ret = 0 meaning an orderly shutdown. */
return ret;
}
return ret;
}
@@
-237,7
+242,7
@@
ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
*
* Return the size of sent data.
*/
*
* Return the size of sent data.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
size_t len, int flags)
{
ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
size_t len, int flags)
{
@@
-280,7
+285,7
@@
ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
/*
* Shutdown cleanly and close.
*/
/*
* Shutdown cleanly and close.
*/
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int lttcomm_close_inet_sock(struct lttcomm_sock *sock)
{
int ret;
int lttcomm_close_inet_sock(struct lttcomm_sock *sock)
{
int ret;
This page took
0.025229 seconds
and
4
git commands to generate.