X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Fltt-events.c;h=82a1119cb3d8aa1e8a1891b3e779a88bbd181c93;hb=0264ec6ce3555f2d14d609f32cfd9abc2117fa57;hp=2b06f3c0bcb50be40de644158372d25fed82e707;hpb=17ec046afa9b641b95951ca9594c3b7351d5e658;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index 2b06f3c0..82a1119c 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -181,20 +181,20 @@ int add_pending_probe(struct ltt_event *event, const char *name,
 {
 	struct cds_hlist_head *head;
 	struct ust_pending_probe *e;
-	size_t name_len = strlen(name);
+	size_t name_len = strlen(name) + 1;
 	uint32_t hash;
 
-	if (name_len > LTTNG_UST_SYM_NAME_LEN - 1) {
-		WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN - 1);
-		name_len = LTTNG_UST_SYM_NAME_LEN - 1;
+	if (name_len > LTTNG_UST_SYM_NAME_LEN) {
+		WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN);
+		name_len = LTTNG_UST_SYM_NAME_LEN;
 	}
-	hash = jhash(name, name_len, 0);
+	hash = jhash(name, name_len - 1, 0);
 	head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
 	e = zmalloc(sizeof(struct ust_pending_probe) + name_len);
 	if (!e)
 		return -ENOMEM;
-	memcpy(&e->name[0], name, name_len + 1);
-	e->name[name_len] = '\0';
+	memcpy(&e->name[0], name, name_len);
+	e->name[name_len - 1] = '\0';
 	e->loglevel_type = loglevel_type;
 	e->loglevel = loglevel;
 	cds_hlist_add_head(&e->node, head);
@@ -230,7 +230,7 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
 	const char *name = desc->name;
 	int ret = 0;
 	struct lttng_ust_event event_param;
-	size_t name_len = strlen(name);
+	size_t name_len = strlen(name) + 1;
 	uint32_t hash;
 
 	/* Wildcard */
@@ -265,11 +265,11 @@ int pending_probe_fix_events(const struct lttng_event_desc *desc)
 		}
 	}
 
-	if (name_len > LTTNG_UST_SYM_NAME_LEN - 1) {
-		WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN - 1);
-		name_len = LTTNG_UST_SYM_NAME_LEN - 1;
+	if (name_len > LTTNG_UST_SYM_NAME_LEN) {
+		WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN);
+		name_len = LTTNG_UST_SYM_NAME_LEN;
 	}
-	hash = jhash(name, name_len, 0);
+	hash = jhash(name, name_len - 1, 0);
 	head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
 	cds_hlist_for_each_entry_safe(e, node, p, head, node) {
 		struct ltt_event *event;
@@ -498,7 +498,7 @@ void _ltt_channel_destroy(struct ltt_channel *chan)
  */
 int ltt_event_create(struct ltt_channel *chan,
 		struct lttng_ust_event *event_param,
-		void *filter,
+		void (*filter)(struct ltt_event *event),
 		struct ltt_event **_event)
 {
 	const struct lttng_event_desc *desc = NULL;	/* silence gcc */
@@ -1356,6 +1356,8 @@ struct session_wildcard *add_wildcard(struct ltt_channel *chan,
 		if (!e)
 			return ERR_PTR(-ENOMEM);
 		memcpy(&e->name[0], event_param->name, name_len);
+		e->loglevel_type = event_param->loglevel_type;
+		e->loglevel = event_param->loglevel;
 		cds_list_add(&e->list, &wildcard_list);
 		CDS_INIT_LIST_HEAD(&e->session_list);
 	}