X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fltt-events.c;h=1e058b206c066825f81358ad04724c408aa710c1;hb=aa1419550b1157d1455b53d29aa7b0cfcccf8b07;hp=ce4c2bb01719baab3b8bbf0f52fded018881bfef;hpb=67e5f39161d80ea3d972a37ecf76f45a260c480d;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index ce4c2bb0..1e058b20 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -1,11 +1,23 @@
 /*
  * ltt-events.c
  *
- * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * Holds LTTng per-session event registry.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #define _GNU_SOURCE
@@ -169,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);
@@ -218,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 */
@@ -253,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;
@@ -453,7 +465,7 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 	 * headers. Therefore the "chan" information used as input
 	 * should be already accessible.
 	 */
-	chan = transport->ops.channel_create("[lttng]", buf_addr,
+	chan = transport->ops.channel_create(transport_name, buf_addr,
 			subbuf_size, num_subbuf, switch_timer_interval,
 			read_timer_interval, shm_fd, wait_fd,
 			memory_map_size, chan_priv_init);
@@ -1076,7 +1088,7 @@ uint64_t measure_clock_offset(void)
 		return 0;
 	monotonic[1] = trace_clock_read64();
 	offset = (monotonic[0] + monotonic[1]) >> 1;
-	realtime = rts.tv_sec * 1000000000ULL;
+	realtime = (uint64_t) rts.tv_sec * 1000000000ULL;
 	realtime += rts.tv_nsec;
 	offset = realtime - offset;
 	return offset;
@@ -1344,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);
 	}