X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Fltt-events.c;h=e4ffc69a32474b9fdd45331e893770ee399ba5b7;hb=5e96a46756a5dcd6e348afd84078b9e26438245d;hp=d28a430d4c649776af1abb4ae02f9d441dcb3216;hpb=403c40b4b90356fddbb18cd12c6e6891c8bd317b;p=lttng-ust.git

diff --git a/libust/ltt-events.c b/libust/ltt-events.c
index d28a430d..e4ffc69a 100644
--- a/libust/ltt-events.c
+++ b/libust/ltt-events.c
@@ -18,11 +18,14 @@
 #include <uuid/uuid.h>
 #include <ust/tracepoint.h>
 #include <errno.h>
+#include <sys/shm.h>
+#include <sys/ipc.h>
+#include <ust/lttng-events.h>
 #include "usterr_signal_safe.h"
 #include "ust/core.h"
-#include "ltt-events.h"
 #include "ltt-tracer.h"
 #include "ust/wait.h"
+#include "../libringbuffer/shm.h"
 
 static CDS_LIST_HEAD(sessions);
 static CDS_LIST_HEAD(ltt_transport_list);
@@ -194,8 +197,7 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 				       void *buf_addr,
 				       size_t subbuf_size, size_t num_subbuf,
 				       unsigned int switch_timer_interval,
-				       unsigned int read_timer_interval,
-				       int *shmid)
+				       unsigned int read_timer_interval)
 {
 	struct ltt_channel *chan;
 	struct ltt_transport *transport;
@@ -219,9 +221,10 @@ struct ltt_channel *ltt_channel_create(struct ltt_session *session,
 	 * headers. Therefore the "chan" information used as input
 	 * should be already accessible.
 	 */
-	chan->chan = transport->ops.channel_create("[lttng]", chan, buf_addr,
+	chan->handle = transport->ops.channel_create("[lttng]", chan, buf_addr,
 			subbuf_size, num_subbuf, switch_timer_interval,
-			read_timer_interval, shmid);
+			read_timer_interval);
+	chan->chan = shmp(chan->handle->header->chan);
 	if (!chan->chan)
 		goto create_error;
 	chan->enabled = 1;
@@ -245,7 +248,7 @@ active:
 static
 void _ltt_channel_destroy(struct ltt_channel *chan)
 {
-	chan->ops->channel_destroy(chan->chan);
+	chan->ops->channel_destroy(chan->handle);
 	cds_list_del(&chan->list);
 	lttng_destroy_context(chan->ctx);
 	free(chan);