X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=e687caf8622729a85a316ac367cf5172fce386d0;hb=f376ad9c6fb65bef0106c2631299c989b3df9f57;hp=0b612d2c68b92fa0472426f469b0c040e1f4b567;hpb=0359fdbc0ea4d96968e2ff493f713156d4646acb;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 0b612d2c6..e687caf86 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -69,7 +69,7 @@ static void add_unique_ust_event(struct lttng_ht *ht,
  * If event_name is NULL all events of the specified type are disabled.
  */
 int event_kernel_disable_event(struct ltt_kernel_channel *kchan,
-		char *event_name, enum lttng_event_type type)
+		const char *event_name, enum lttng_event_type type)
 {
 	int ret, error = 0, found = 0;
 	struct ltt_kernel_event *kevent;
@@ -172,7 +172,8 @@ int event_ust_enable_tracepoint(struct ltt_ust_session *usess,
 	rcu_read_lock();
 
 	uevent = trace_ust_find_event(uchan->events, event->name, filter,
-			event->loglevel_type, event->loglevel, exclusion);
+			(enum lttng_ust_loglevel_type) event->loglevel_type,
+			event->loglevel, exclusion);
 	if (!uevent) {
 		ret = trace_ust_create_event(event, filter_expression,
 				filter, exclusion, internal_event, &uevent);
@@ -258,7 +259,7 @@ error:
  * Disable UST tracepoint of a channel from a UST session.
  */
 int event_ust_disable_tracepoint(struct ltt_ust_session *usess,
-		struct ltt_ust_channel *uchan, char *event_name)
+		struct ltt_ust_channel *uchan, const char *event_name)
 {
 	int ret;
 	struct ltt_ust_event *uevent;
@@ -510,10 +511,12 @@ int event_agent_enable(struct ltt_ust_session *usess,
 		filter = NULL;
 		filter_expression = NULL;
 		created = 1;
+		assert(!aevent->enabled);
 	}
 
-	if (created && filter) {
-		ret = add_filter_app_ctx(filter, filter_expression, agt);
+	if (created && aevent->filter) {
+		ret = add_filter_app_ctx(
+				aevent->filter, aevent->filter_expression, agt);
 		if (ret != LTTNG_OK) {
 			goto error;
 		}
@@ -671,7 +674,7 @@ error:
  * Return LTTNG_OK on success or else a LTTNG_ERR* code.
  */
 int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
-		char *event_name)
+		const char *event_name)
 {
 	int ret = LTTNG_OK;
 	struct agent_event *aevent;