projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond write() to handle EINTR
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index 6e548f3c10bf8185c13ac8156f1b5c54fe0ff4ce..184ac6be62de3c5667d06c126eb373aa3ce1d1d6 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-772,7
+772,13
@@
static void *thread_manage_kernel(void *data)
/* Check for data on kernel pipe */
if (pollfd == kernel_poll_pipe[0] && (revents & LPOLLIN)) {
/* Check for data on kernel pipe */
if (pollfd == kernel_poll_pipe[0] && (revents & LPOLLIN)) {
- ret = read(kernel_poll_pipe[0], &tmp, 1);
+ do {
+ ret = read(kernel_poll_pipe[0], &tmp, 1);
+ } while (ret < 0 && errno == EINTR);
+ /*
+ * Ret value is useless here, if this pipe gets any actions an
+ * update is required anyway.
+ */
update_poll_flag = 1;
continue;
} else {
update_poll_flag = 1;
continue;
} else {
@@
-1166,7
+1172,9
@@
static void *thread_manage_apps(void *data)
goto error;
} else if (revents & LPOLLIN) {
/* Empty pipe */
goto error;
} else if (revents & LPOLLIN) {
/* Empty pipe */
- ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+ do {
+ ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+ } while (ret < 0 && errno == EINTR);
if (ret < 0 || ret < sizeof(ust_cmd)) {
PERROR("read apps cmd pipe");
goto error;
if (ret < 0 || ret < sizeof(ust_cmd)) {
PERROR("read apps cmd pipe");
goto error;
@@
-1318,8
+1326,10
@@
static void *thread_dispatch_ust_registration(void *data)
* at some point in time or wait to the end of the world :)
*/
if (apps_cmd_pipe[1] >= 0) {
* at some point in time or wait to the end of the world :)
*/
if (apps_cmd_pipe[1] >= 0) {
- ret = write(apps_cmd_pipe[1], ust_cmd,
- sizeof(struct ust_command));
+ do {
+ ret = write(apps_cmd_pipe[1], ust_cmd,
+ sizeof(struct ust_command));
+ } while (ret < 0 && errno == EINTR);
if (ret < 0) {
PERROR("write apps cmd pipe");
if (errno == EBADF) {
if (ret < 0) {
PERROR("write apps cmd pipe");
if (errno == EBADF) {
This page took
0.026441 seconds
and
5
git commands to generate.