projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: create_output_path() relayd util is not const-correct
[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 b870deef48b325614d73412a169ef086b02f5245..ed7f5dc165e1b3961a2f53ef3107a0f54db85472 100644
(file)
--- a/
src/common/sessiond-comm/inet.c
+++ b/
src/common/sessiond-comm/inet.c
@@
-26,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 */
/*
@@
-159,7
+158,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;
@@
-177,6
+176,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.
@@
-203,17
+204,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;
This page took
0.024042 seconds
and
4
git commands to generate.