projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove superfluous empty line
[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 2703a666e71e557c10b956bb2c0402d89ca1aec9..e0b3e7a96ffb1d13324ae0bbb9f7b58238df93be 100644
(file)
--- a/
src/common/sessiond-comm/inet.c
+++ b/
src/common/sessiond-comm/inet.c
@@
-15,7
+15,6
@@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <assert.h>
#include <limits.h>
#define _LGPL_SOURCE
#include <assert.h>
#include <limits.h>
@@
-27,15
+26,14
@@
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
-#include <time.h>
+#include <
common/compat/
time.h>
#include <poll.h>
#include <common/common.h>
#include <poll.h>
#include <common/common.h>
+#include <common/time.h>
#include "inet.h"
#include "inet.h"
-#define MSEC_PER_SEC 1000
-#define NSEC_PER_MSEC 1000000
#define RECONNECT_DELAY 200 /* ms */
/*
#define RECONNECT_DELAY 200 /* ms */
/*
@@
-102,15
+100,9
@@
error:
LTTNG_HIDDEN
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
LTTNG_HIDDEN
int lttcomm_bind_inet_sock(struct lttcomm_sock *sock)
{
- int ret;
-
- ret = bind(sock->fd, &sock->sockaddr.addr.sin,
+ return bind(sock->fd,
+ (const struct sockaddr *) &sock->sockaddr.addr.sin,
sizeof(sock->sockaddr.addr.sin));
sizeof(sock->sockaddr.addr.sin));
- if (ret < 0) {
- PERROR("bind inet");
- }
-
- return ret;
}
static
}
static
@@
-160,7
+152,7
@@
int connect_with_timeout(struct lttcomm_sock *sock)
return -1;
}
return -1;
}
- ret = clock_gettime(CLOCK_MONOTONIC, &orig_time);
+ ret =
lttng_
clock_gettime(CLOCK_MONOTONIC, &orig_time);
if (ret == -1) {
PERROR("clock_gettime");
return -1;
if (ret == -1) {
PERROR("clock_gettime");
return -1;
@@
-178,6
+170,8
@@
int connect_with_timeout(struct lttcomm_sock *sock)
goto success;
}
goto success;
}
+ DBG("Asynchronous connect for sock %d, performing polling with"
+ " timeout: %lums", sock->fd, timeout);
/*
* Perform poll loop following EINPROGRESS recommendation from
* connect(2) man page.
/*
* Perform poll loop following EINPROGRESS recommendation from
* connect(2) man page.
@@
-204,17
+198,20
@@
int connect_with_timeout(struct lttcomm_sock *sock)
ret = getsockopt(sock->fd, SOL_SOCKET,
SO_ERROR, &optval, &optval_len);
if (ret) {
ret = getsockopt(sock->fd, SOL_SOCKET,
SO_ERROR, &optval, &optval_len);
if (ret) {
+ PERROR("getsockopt");
goto error;
}
if (!optval) {
connect_ret = 0;
goto success;
} else {
goto error;
}
if (!optval) {
connect_ret = 0;
goto success;
} else {
+ /* Get actual connect() errno from opt_val */
+ errno = optval;
goto error;
}
}
/* ret == 0: timeout */
goto error;
}
}
/* ret == 0: timeout */
- ret = clock_gettime(CLOCK_MONOTONIC, &cur_time);
+ ret =
lttng_
clock_gettime(CLOCK_MONOTONIC, &cur_time);
if (ret == -1) {
PERROR("clock_gettime");
connect_ret = ret;
if (ret == -1) {
PERROR("clock_gettime");
connect_ret = ret;
@@
-387,18
+384,22
@@
ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
len_last = iov[0].iov_len;
ret = recvmsg(sock->fd, &msg, flags);
if (ret > 0) {
len_last = iov[0].iov_len;
ret = recvmsg(sock->fd, &msg, flags);
if (ret > 0) {
+ if (flags & MSG_DONTWAIT) {
+ goto end;
+ }
iov[0].iov_base += ret;
iov[0].iov_len -= ret;
assert(ret <= len_last);
}
} while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
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");
} else if (ret > 0) {
ret = len;
}
/* Else ret = 0 meaning an orderly shutdown. */
if (ret < 0) {
PERROR("recvmsg inet");
} else if (ret > 0) {
ret = len;
}
/* Else ret = 0 meaning an orderly shutdown. */
-
+end:
return ret;
}
return ret;
}
@@
-408,7
+409,7
@@
ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
* Return the size of sent data.
*/
LTTNG_HIDDEN
* Return the size of sent data.
*/
LTTNG_HIDDEN
-ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
+ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock,
const
void *buf,
size_t len, int flags)
{
struct msghdr msg;
size_t len, int flags)
{
struct msghdr msg;
@@
-417,7
+418,7
@@
ssize_t lttcomm_sendmsg_inet_sock(struct lttcomm_sock *sock, void *buf,
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;
This page took
0.026189 seconds
and
4
git commands to generate.