projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix session list deadlock
[lttng-tools.git]
/
ltt-sessiond
/
main.c
diff --git
a/ltt-sessiond/main.c
b/ltt-sessiond/main.c
index c72087ef25ddb88d27634e5d97d1967d1bec0277..edeb86d29d5b168b795af6869ef5dce86811971a 100644
(file)
--- a/
ltt-sessiond/main.c
+++ b/
ltt-sessiond/main.c
@@
-701,6
+701,12
@@
static void *thread_manage_kernel(void *data)
while (1) {
if (update_poll_flag == 1) {
while (1) {
if (update_poll_flag == 1) {
+ /*
+ * Reset number of fd in the poll set. Always 2 since there is the thread
+ * quit pipe and the kernel pipe.
+ */
+ events.nb_fd = 2;
+
ret = update_kernel_poll(&events);
if (ret < 0) {
goto error;
ret = update_kernel_poll(&events);
if (ret < 0) {
goto error;
@@
-2306,7
+2312,7
@@
static int cmd_destroy_session(struct ltt_session *session, char *name)
perror("write kernel poll pipe");
}
perror("write kernel poll pipe");
}
- ret = session_destroy(
name
);
+ ret = session_destroy(
session
);
return ret;
}
return ret;
}
This page took
0.023583 seconds
and
4
git commands to generate.