projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove ignored flags from poll events bitmasks
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
dispatch.cpp
diff --git
a/src/bin/lttng-sessiond/dispatch.cpp
b/src/bin/lttng-sessiond/dispatch.cpp
index 8e80c29855e934576b0a17f8814433d835f0114f..a8e8d6c8d44d48f3b712ceac08129fc86d0ac316 100644
(file)
--- a/
src/bin/lttng-sessiond/dispatch.cpp
+++ b/
src/bin/lttng-sessiond/dispatch.cpp
@@
-113,8
+113,7
@@
static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
cds_list_for_each_entry_safe(wait_node, tmp_wait_node,
&wait_queue->head, head) {
LTTNG_ASSERT(wait_node->app);
cds_list_for_each_entry_safe(wait_node, tmp_wait_node,
&wait_queue->head, head) {
LTTNG_ASSERT(wait_node->app);
- ret = lttng_poll_add(&events, wait_node->app->sock,
- LPOLLHUP | LPOLLERR);
+ ret = lttng_poll_add(&events, wait_node->app->sock, LPOLLIN);
if (ret < 0) {
goto error;
}
if (ret < 0) {
goto error;
}
@@
-284,7
+283,7
@@
static void *thread_dispatch_ust_registration(void *data)
break;
}
break;
}
- ust_cmd =
caa_container_of(node, struct ust_command,
node);
+ ust_cmd =
lttng::utils::container_of(node, &ust_command::
node);
DBG("Dispatching UST registration pid:%d ppid:%d uid:%d"
" gid:%d sock:%d name:%s (version %d.%d)",
DBG("Dispatching UST registration pid:%d ppid:%d uid:%d"
" gid:%d sock:%d name:%s (version %d.%d)",
@@
-476,7
+475,7
@@
error:
if (node == NULL) {
break;
}
if (node == NULL) {
break;
}
- ust_cmd =
caa_container_of(node, struct ust_command,
node);
+ ust_cmd =
lttng::utils::container_of(node, &ust_command::
node);
ret = close(ust_cmd->sock);
if (ret < 0) {
PERROR("close ust sock exit dispatch %d", ust_cmd->sock);
ret = close(ust_cmd->sock);
if (ret < 0) {
PERROR("close ust sock exit dispatch %d", ust_cmd->sock);
This page took
0.023905 seconds
and
4
git commands to generate.