projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: use the poll wait ret value when iterating on fd(s)
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index c1af765c9ab9821a855666da2613e96d6af16aab..e804f4b5ac74284c1c3b0b9ea23a9317b505649f 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-57,17
+57,23
@@
static int send_channel(struct consumer_socket *sock,
uchan->name,
uchan->streams.count);
uchan->name,
uchan->streams.count);
+ health_code_update(&health_thread_cmd);
+
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_cmd);
+
fd = uchan->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
if (ret < 0) {
goto error;
}
fd = uchan->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_cmd);
+
error:
return ret;
}
error:
return ret;
}
@@
-108,6
+114,8
@@
static int send_channel_stream(struct consumer_socket *sock,
pathname,
usess->id);
pathname,
usess->id);
+ health_code_update(&health_thread_cmd);
+
/* Send stream and file descriptor */
fds[0] = stream->obj->shm_fd;
fds[1] = stream->obj->wait_fd;
/* Send stream and file descriptor */
fds[0] = stream->obj->shm_fd;
fds[1] = stream->obj->wait_fd;
@@
-116,6
+124,8
@@
static int send_channel_stream(struct consumer_socket *sock,
goto error;
}
goto error;
}
+ health_code_update(&health_thread_cmd);
+
error:
return ret;
}
error:
return ret;
}
@@
-220,11
+230,15
@@
static int send_metadata(struct consumer_socket *sock,
"metadata",
1);
"metadata",
1);
+ health_code_update(&health_thread_cmd);
+
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
+ health_code_update(&health_thread_cmd);
+
/* Sending metadata shared memory fd */
fd = usess->metadata->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
/* Sending metadata shared memory fd */
fd = usess->metadata->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
@@
-232,6
+246,8
@@
static int send_metadata(struct consumer_socket *sock,
goto error;
}
goto error;
}
+ health_code_update(&health_thread_cmd);
+
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Set application path to the destination path */
@@
-277,6
+293,8
@@
static int send_metadata(struct consumer_socket *sock,
pathname,
usess->id);
pathname,
usess->id);
+ health_code_update(&health_thread_cmd);
+
/* Send stream and file descriptor */
fds[0] = usess->metadata->stream_obj->shm_fd;
fds[1] = usess->metadata->stream_obj->wait_fd;
/* Send stream and file descriptor */
fds[0] = usess->metadata->stream_obj->shm_fd;
fds[1] = usess->metadata->stream_obj->wait_fd;
@@
-285,6
+303,8
@@
static int send_metadata(struct consumer_socket *sock,
goto error;
}
goto error;
}
+ health_code_update(&health_thread_cmd);
+
error:
return ret;
}
error:
return ret;
}
This page took
0.029461 seconds
and
4
git commands to generate.