X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Fltt-ring-buffer-client.h;h=605a28284e7e32c74664ff25190db46b7c7ddad5;hb=381c0f1ef474e0ae8a96b3753470ca4bda45c764;hp=697324c799b7ea03a67a05efcb087f48518d7c86;hpb=dc613eb9d0c449f3e988af66b173abefa4b22233;p=lttng-ust.git

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index 697324c7..605a2828 100644
--- a/libust/ltt-ring-buffer-client.h
+++ b/libust/ltt-ring-buffer-client.h
@@ -335,7 +335,11 @@ static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
 	header->ctx.timestamp_end = tsc;
 	header->ctx.content_size = data_size * CHAR_BIT; 	/* in bits */
 	header->ctx.packet_size = PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */
-	records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf);
+	/*
+	 * We do not care about the records lost count, because the metadata
+	 * channel waits and retry.
+	 */
+	(void) lib_ring_buffer_get_records_lost_full(&client_config, buf);
 	records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf);
 	records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf);
 	header->ctx.events_discarded = records_lost;
@@ -381,6 +385,8 @@ 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);
+	if (!ltt_chan->handle)
+		return NULL;
 	ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan);
 	return ltt_chan;
 }
@@ -393,13 +399,17 @@ void ltt_channel_destroy(struct ltt_channel *ltt_chan)
 
 static
 struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
-					     struct shm_handle *handle)
+					     struct shm_handle *handle,
+					     int *shm_fd, int *wait_fd,
+					     uint64_t *memory_map_size)
 {
 	struct lib_ring_buffer *buf;
 	int cpu;
 
 	for_each_channel_cpu(cpu, chan) {
-		buf = channel_get_ring_buffer(&client_config, chan, cpu, handle);
+		buf = channel_get_ring_buffer(&client_config, chan,
+				cpu, handle, shm_fd, wait_fd,
+				memory_map_size);
 		if (!lib_ring_buffer_open_read(buf, handle))
 			return buf;
 	}
@@ -506,15 +516,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);