X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-events.c;h=2fedbea59202df8da309a6b24fb348b37db1092c;hb=57be518d19d7c433f79c57cd7815160110ac19c2;hp=a062044698b95e218f2fcb05b41cec8170e33cd6;hpb=c6c9e10f104b1ff039c3f76c5accdc12513c760d;p=lttng-modules.git

diff --git a/lttng-events.c b/lttng-events.c
index a0620446..2fedbea5 100644
--- a/lttng-events.c
+++ b/lttng-events.c
@@ -1,11 +1,23 @@
 /*
  * lttng-events.c
  *
- * Copyright 2010-2011 (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
  */
 
 #include <linux/module.h>
@@ -232,9 +244,9 @@ struct lttng_channel *lttng_channel_create(struct lttng_session *session,
 	 * headers. Therefore the "chan" information used as input
 	 * should be already accessible.
 	 */
-	chan->chan = transport->ops.channel_create("[lttng]", chan, buf_addr,
-			subbuf_size, num_subbuf, switch_timer_interval,
-			read_timer_interval);
+	chan->chan = transport->ops.channel_create(transport_name,
+			chan, buf_addr, subbuf_size, num_subbuf,
+			switch_timer_interval, read_timer_interval);
 	if (!chan->chan)
 		goto create_error;
 	chan->enabled = 1;
@@ -875,7 +887,7 @@ uint64_t measure_clock_offset(void)
 	local_irq_restore(flags);
 
 	offset = (monotonic[0] + monotonic[1]) >> 1;
-	realtime = rts.tv_sec * NSEC_PER_SEC;
+	realtime = (uint64_t) rts.tv_sec * NSEC_PER_SEC;
 	realtime += rts.tv_nsec;
 	offset = realtime - offset;
 	return offset;