X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=bfdae4fff1967d35c1286fd955bff8f4b11bd489;hb=1f6f42e63ae50237f22963733d71a208f9e36599;hp=373995d08e61135bdd71b7991ba10749132d9116;hpb=710b8ee36eec50c00e72cb61e146357130e1d94c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 373995d0..bfdae4ff 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -21,6 +21,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <stdio.h>
 #include <urcu/list.h>
 #include <urcu/hlist.h>
@@ -32,6 +33,7 @@
 #include <stddef.h>
 #include <inttypes.h>
 #include <time.h>
+#include <stdbool.h>
 #include <lttng/ust-endian.h>
 #include "clock.h"
 
@@ -54,6 +56,7 @@
 #include "lttng-ust-uuid.h"
 
 #include "tracepoint-internal.h"
+#include "string-utils.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
@@ -184,7 +187,7 @@ void register_event(struct lttng_event *event)
 
 	assert(event->registered == 0);
 	desc = event->desc;
-	ret = __tracepoint_probe_register(desc->name,
+	ret = __tracepoint_probe_register_queue_release(desc->name,
 			desc->probe_callback,
 			event, desc->signature);
 	WARN_ON_ONCE(ret);
@@ -200,7 +203,7 @@ void unregister_event(struct lttng_event *event)
 
 	assert(event->registered == 1);
 	desc = event->desc;
-	ret = __tracepoint_probe_unregister(desc->name,
+	ret = __tracepoint_probe_unregister_queue_release(desc->name,
 			desc->probe_callback,
 			event);
 	WARN_ON_ONCE(ret);
@@ -230,6 +233,7 @@ void lttng_session_destroy(struct lttng_session *session)
 		_lttng_event_unregister(event);
 	}
 	synchronize_trace();	/* Wait for in-flight events to complete */
+	__tracepoint_probe_prune_release_queue();
 	cds_list_for_each_entry_safe(enabler, tmpenabler,
 			&session->enablers_head, node)
 		lttng_enabler_destroy(enabler);
@@ -624,16 +628,15 @@ exist:
 }
 
 static
-int lttng_desc_match_wildcard_enabler(const struct lttng_event_desc *desc,
+int lttng_desc_match_star_glob_enabler(const struct lttng_event_desc *desc,
 		struct lttng_enabler *enabler)
 {
 	int loglevel = 0;
 	unsigned int has_loglevel = 0;
 
-	assert(enabler->type == LTTNG_ENABLER_WILDCARD);
-	/* Compare excluding final '*' */
-	if (strncmp(desc->name, enabler->event_param.name,
-			strlen(enabler->event_param.name) - 1))
+	assert(enabler->type == LTTNG_ENABLER_STAR_GLOB);
+	if (!strutils_star_glob_match(enabler->event_param.name, SIZE_MAX,
+			desc->name, SIZE_MAX))
 		return 0;
 	if (desc->loglevel) {
 		loglevel = *(*desc->loglevel);
@@ -673,34 +676,35 @@ static
 int lttng_desc_match_enabler(const struct lttng_event_desc *desc,
 		struct lttng_enabler *enabler)
 {
-	struct lttng_ust_excluder_node *excluder;
-
-	/* If event matches with an excluder, return 'does not match' */
-	cds_list_for_each_entry(excluder, &enabler->excluder_head, node) {
-		int count;
-
-		for (count = 0; count < excluder->excluder.count; count++) {
-			int found, len;
-			char *excluder_name;
-
-			excluder_name = (char *) (excluder->excluder.names)
-					+ count * LTTNG_UST_SYM_NAME_LEN;
-			len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
-			if (len > 0 && excluder_name[len - 1] == '*') {
-				found = !strncmp(desc->name, excluder_name,
-						len - 1);
-			} else {
-				found = !strncmp(desc->name, excluder_name,
-						LTTNG_UST_SYM_NAME_LEN - 1);
-			}
-			if (found) {
-				return 0;
+	switch (enabler->type) {
+	case LTTNG_ENABLER_STAR_GLOB:
+	{
+		struct lttng_ust_excluder_node *excluder;
+
+		if (!lttng_desc_match_star_glob_enabler(desc, enabler)) {
+			return 0;
+		}
+
+		/*
+		 * If the matching event matches with an excluder,
+		 * return 'does not match'
+		 */
+		cds_list_for_each_entry(excluder, &enabler->excluder_head, node) {
+			int count;
+
+			for (count = 0; count < excluder->excluder.count; count++) {
+				int len;
+				char *excluder_name;
+
+				excluder_name = (char *) (excluder->excluder.names)
+						+ count * LTTNG_UST_SYM_NAME_LEN;
+				len = strnlen(excluder_name, LTTNG_UST_SYM_NAME_LEN);
+				if (len > 0 && strutils_star_glob_match(excluder_name, len, desc->name, SIZE_MAX))
+					return 0;
 			}
 		}
+		return 1;
 	}
-	switch (enabler->type) {
-	case LTTNG_ENABLER_WILDCARD:
-		return lttng_desc_match_wildcard_enabler(desc, enabler);
 	case LTTNG_ENABLER_EVENT:
 		return lttng_desc_match_event_enabler(desc, enabler);
 	default:
@@ -1125,6 +1129,7 @@ void lttng_session_sync_enablers(struct lttng_session *session)
 			lttng_filter_sync_state(runtime);
 		}
 	}
+	__tracepoint_probe_prune_release_queue();
 }
 
 /*