X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Fltt-events.c;h=2bc5a1597b3ed15812a543f78c60ddcaad7263ec;hb=34cc6d00668c51d0cb8f1959a2e38a56b147a6c9;hp=eb6749d944628043332e5e1426c5c8fe25a77926;hpb=1ddfd6412d2a160eb5b8e97ebbfd0a9dbc88faa0;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index eb6749d9..2bc5a159 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -251,14 +251,15 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
 					sizeof(event_param.name));
 				/* create event */
 				ret = ltt_event_create(sw->chan,
-					&event_param, NULL, NULL,
-					&ev);
+					&event_param, &ev);
 				if (ret) {
 					DBG("Error creating event");
 					continue;
 				}
 				cds_list_add(&ev->wildcard_list,
 					&sw->events);
+				lttng_filter_event_link_bytecode(ev,
+					sw->filter_bytecode);
 			}
 		}
 	}
@@ -295,6 +296,8 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
 		event->id = chan->free_event_id++;
 		ret |= _ltt_event_metadata_statedump(chan->session, chan,
 				event);
+		lttng_filter_event_link_bytecode(event,
+			event->filter_bytecode);
 	}
 	return ret;
 }
@@ -500,9 +503,6 @@ void _ltt_channel_destroy(struct ltt_channel *chan)
  */
 int ltt_event_create(struct ltt_channel *chan,
 		struct lttng_ust_event *event_param,
-		int (*filter)(void *filter_data,
-			const char *filter_stack_data),
-		void *filter_data,
 		struct ltt_event **_event)
 {
 	const struct lttng_event_desc *desc = NULL;	/* silence gcc */
@@ -550,8 +550,6 @@ int ltt_event_create(struct ltt_channel *chan,
 		goto cache_error;
 	}
 	event->chan = chan;
-	event->filter = filter;
-	event->filter_data = filter_data;
 	/*
 	 * used_event_id counts the maximum number of event IDs that can
 	 * register if all probes register.
@@ -656,6 +654,8 @@ void _ltt_event_destroy(struct ltt_event *event)
 	}
 	cds_list_del(&event->list);
 	lttng_destroy_context(event->ctx);
+	free(event->filter_bytecode);
+	free(event->filter_data);
 	free(event);
 }
 
@@ -726,6 +726,9 @@ int _ltt_field_statedump(struct ltt_session *session,
 {
 	int ret = 0;
 
+	if (!field->written)
+		return 0;
+
 	switch (field->type.atype) {
 	case atype_integer:
 		ret = lttng_metadata_printf(session,
@@ -1420,6 +1423,7 @@ void _remove_wildcard(struct session_wildcard *wildcard)
 		cds_list_del(&wildcard->entry->list);
 		free(wildcard->entry);
 	}
+	free(wildcard->filter_bytecode);
 	free(wildcard);
 }