projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean-up: lttng-sessiond: fix -Wshadow error in check_session_rotation_pending
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
action-executor.c
diff --git
a/src/bin/lttng-sessiond/action-executor.c
b/src/bin/lttng-sessiond/action-executor.c
index 69bf1f1d3ff7c4a5ebf607f8f93e36d7cffd58d6..e5e72b09f2bd88b789d3993212e6b95c1cdeea44 100644
(file)
--- a/
src/bin/lttng-sessiond/action-executor.c
+++ b/
src/bin/lttng-sessiond/action-executor.c
@@
-23,7
+23,7
@@
#include <lttng/action/start-session.h>
#include <lttng/action/stop-session.h>
#include <lttng/condition/evaluation.h>
#include <lttng/action/start-session.h>
#include <lttng/action/stop-session.h>
#include <lttng/condition/evaluation.h>
-#include <lttng/condition/
event-rule
-internal.h>
+#include <lttng/condition/
on-event
-internal.h>
#include <lttng/lttng-error.h>
#include <lttng/trigger/trigger-internal.h>
#include <pthread.h>
#include <lttng/lttng-error.h>
#include <lttng/trigger/trigger-internal.h>
#include <pthread.h>
@@
-197,9
+197,8
@@
static int action_executor_notify_handler(struct action_executor *executor,
const struct lttng_action *action)
{
return notification_client_list_send_evaluation(work_item->client_list,
const struct lttng_action *action)
{
return notification_client_list_send_evaluation(work_item->client_list,
-
lttng_trigger_get_const_condition(work_item->trigger)
,
+
work_item->trigger
,
work_item->evaluation,
work_item->evaluation,
- lttng_trigger_get_credentials(work_item->trigger),
work_item->object_creds.is_set ?
&(work_item->object_creds.value) :
NULL,
work_item->object_creds.is_set ?
&(work_item->object_creds.value) :
NULL,
@@
-540,7
+539,8
@@
static void *action_executor_thread(void *_data)
assert(executor);
assert(executor);
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ACTION_EXECUTOR);
+ health_register(the_health_sessiond,
+ HEALTH_SESSIOND_TYPE_ACTION_EXECUTOR);
rcu_register_thread();
rcu_thread_online();
rcu_register_thread();
rcu_thread_online();
@@
-593,7
+593,7
@@
static void *action_executor_thread(void *_data)
rcu_thread_offline();
rcu_unregister_thread();
rcu_thread_offline();
rcu_unregister_thread();
- health_unregister(health_sessiond);
+ health_unregister(
the_
health_sessiond);
return NULL;
}
return NULL;
}
This page took
0.025396 seconds
and
4
git commands to generate.