projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: lttng-live: send HUP reply when per-PID streams are gone
[lttng-tools.git]
/
src
/
common
/
sessiond-comm
/
inet6.c
diff --git
a/src/common/sessiond-comm/inet6.c
b/src/common/sessiond-comm/inet6.c
index a29adad4214c941d3287c6dc7f6851559c2d8af5..0b0383cdd524f77c7749d93aad2c5643937009ae 100644
(file)
--- a/
src/common/sessiond-comm/inet6.c
+++ b/
src/common/sessiond-comm/inet6.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 "inet6.h"
#include "inet6.h"
-#define MSEC_PER_SEC 1000
-#define NSEC_PER_MSEC 1000000
#define RECONNECT_DELAY 200 /* ms */
/*
#define RECONNECT_DELAY 200 /* ms */
/*
@@
-157,7
+156,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;
@@
-211,7
+210,7
@@
int connect_with_timeout(struct lttcomm_sock *sock)
}
}
/* ret == 0: timeout */
}
}
/* 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;
@@
-386,7
+385,7
@@
ssize_t lttcomm_recvmsg_inet6_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_inet6_sock(struct lttcomm_sock *sock, void *buf,
+ssize_t lttcomm_sendmsg_inet6_sock(struct lttcomm_sock *sock,
const
void *buf,
size_t len, int flags)
{
struct msghdr msg;
size_t len, int flags)
{
struct msghdr msg;
@@
-395,7
+394,7
@@
ssize_t lttcomm_sendmsg_inet6_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.033489 seconds
and
4
git commands to generate.