projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: add support for anonymous triggers
[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 780028ecce6f37dcd6868e998c7ec77f014268f2..9a89865a930c142e395f134d6fb23303b3d3508d 100644
(file)
--- a/
src/bin/lttng-sessiond/action-executor.c
+++ b/
src/bin/lttng-sessiond/action-executor.c
@@
-16,8
+16,8
@@
#include <common/macros.h>
#include <common/optional.h>
#include <lttng/action/action-internal.h>
#include <common/macros.h>
#include <common/optional.h>
#include <lttng/action/action-internal.h>
-#include <lttng/action/
group
-internal.h>
-#include <lttng/action/
group
.h>
+#include <lttng/action/
list
-internal.h>
+#include <lttng/action/
list
.h>
#include <lttng/action/notify-internal.h>
#include <lttng/action/notify.h>
#include <lttng/action/rotate-session.h>
#include <lttng/action/notify-internal.h>
#include <lttng/action/notify.h>
#include <lttng/action/rotate-session.h>
@@
-25,7
+25,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/
on-event
-internal.h>
+#include <lttng/condition/
event-rule-matches
-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>
@@
-206,7
+206,16
@@
static const char *get_trigger_name(const struct lttng_trigger *trigger)
enum lttng_trigger_status trigger_status;
trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
enum lttng_trigger_status trigger_status;
trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
- assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+ switch (trigger_status) {
+ case LTTNG_TRIGGER_STATUS_OK:
+ break;
+ case LTTNG_TRIGGER_STATUS_UNSET:
+ trigger_name = "(anonymous)";
+ break;
+ default:
+ trigger_name = "(failed to get name)";
+ break;
+ }
return trigger_name;
}
return trigger_name;
}
@@
-772,17
+781,7
@@
static void *action_executor_thread(void *_data)
uid_t trigger_owner_uid;
enum lttng_trigger_status trigger_status;
uid_t trigger_owner_uid;
enum lttng_trigger_status trigger_status;
- trigger_status = lttng_trigger_get_name(
- work_item->trigger, &trigger_name);
- switch (trigger_status) {
- case LTTNG_TRIGGER_STATUS_OK:
- break;
- case LTTNG_TRIGGER_STATUS_UNSET:
- trigger_name = "(unset)";
- break;
- default:
- abort();
- }
+ trigger_name = get_trigger_name(work_item->trigger);
trigger_status = lttng_trigger_get_owner_uid(
work_item->trigger, &trigger_owner_uid);
trigger_status = lttng_trigger_get_owner_uid(
work_item->trigger, &trigger_owner_uid);
@@
-1014,13
+1013,13
@@
static int add_action_to_subitem_array(struct lttng_action *action,
if (type == LTTNG_ACTION_TYPE_GROUP) {
unsigned int count, i;
if (type == LTTNG_ACTION_TYPE_GROUP) {
unsigned int count, i;
- status = lttng_action_
group
_get_count(action, &count);
+ status = lttng_action_
list
_get_count(action, &count);
assert(status == LTTNG_ACTION_STATUS_OK);
for (i = 0; i < count; i++) {
struct lttng_action *inner_action = NULL;
assert(status == LTTNG_ACTION_STATUS_OK);
for (i = 0; i < count; i++) {
struct lttng_action *inner_action = NULL;
- inner_action = lttng_action_
group
_borrow_mutable_at_index(
+ inner_action = lttng_action_
list
_borrow_mutable_at_index(
action, i);
assert(inner_action);
ret = add_action_to_subitem_array(
action, i);
assert(inner_action);
ret = add_action_to_subitem_array(
This page took
0.025611 seconds
and
4
git commands to generate.