X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-client.h;h=5260197a839e5b252f88d066adc8247893cb1f53;hb=48279e22a39cde0cf97b9ed0077e850309112637;hp=3d3bfb5ec5e25818b1bb94a461efa37aabb570cf;hpb=818173b9424ba2dd317e05e913ec5891b26e83d3;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index 3d3bfb5e..5260197a 100644
--- a/libust/ltt-ring-buffer-client.h
+++ b/libust/ltt-ring-buffer-client.h
@@ -381,7 +381,9 @@ struct ltt_channel *_channel_create(const char *name,
 	ltt_chan->handle = channel_create(&client_config, name, ltt_chan, buf_addr,
 			      subbuf_size, num_subbuf, switch_timer_interval,
 			      read_timer_interval);
-	ltt_chan->chan = shmp(handle, handle->chan);
+	if (!ltt_chan->handle)
+		return NULL;
+	ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan);
 	return ltt_chan;
 }
 
@@ -506,15 +508,13 @@ static struct ltt_transport ltt_relay_transport = {
 	},
 };
 
-static
-void __attribute__((constructor)) ltt_ring_buffer_client_init(void)
+void RING_BUFFER_MODE_TEMPLATE_INIT(void)
 {
 	DBG("LTT : ltt ring buffer client init\n");
 	ltt_transport_register(&ltt_relay_transport);
 }
 
-static
-void __attribute__((destructor)) ltt_ring_buffer_client_exit(void)
+void RING_BUFFER_MODE_TEMPLATE_EXIT(void)
 {
 	DBG("LTT : ltt ring buffer client exit\n");
 	ltt_transport_unregister(&ltt_relay_transport);