X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fltt-ring-buffer-client.h;h=b896169e0f64d4257cd46844252e46764b063e4a;hb=bf5ff35ed0a3a7f60e92d654a5b97e73b94da852;hp=7e853992f6c7d8accbf02450a856ba17f6de2df8;hpb=5ad63a1632792c8bc40fa5bc9f7f45f037a68032;p=lttng-ust.git

diff --git a/liblttng-ust/ltt-ring-buffer-client.h b/liblttng-ust/ltt-ring-buffer-client.h
index 7e853992..b896169e 100644
--- a/liblttng-ust/ltt-ring-buffer-client.h
+++ b/liblttng-ust/ltt-ring-buffer-client.h
@@ -1,18 +1,30 @@
 /*
  * ltt-ring-buffer-client.h
  *
- * Copyright (C) 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng lib ring buffer client template.
  *
- * 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
 #include <stdint.h>
 #include <lttng/ust-events.h>
 #include "lttng/bitfield.h"
 #include "clock.h"
+#include "lttng-ust-uuid.h"
 #include "ltt-tracer.h"
 #include "../libringbuffer/frontend_types.h"
 
@@ -32,7 +44,7 @@ struct packet_header {
 					 * Trace magic number.
 					 * contains endianness information.
 					 */
-	uint8_t uuid[16];
+	uint8_t uuid[LTTNG_UST_UUID_LEN];
 	uint32_t stream_id;
 
 	struct {
@@ -355,11 +367,8 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts
 	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 */
-	/*
-	 * 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_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;
@@ -404,7 +413,8 @@ struct ltt_channel *_channel_create(const char *name,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval,
-				int **shm_fd, int **wait_fd,
+				int **shm_fd, char **shm_path,
+				int **wait_fd, char **wait_pipe_path,
 				uint64_t **memory_map_size,
 				struct ltt_channel *chan_priv_init)
 {
@@ -417,7 +427,8 @@ struct ltt_channel *_channel_create(const char *name,
 			chan_priv_init,
 			buf_addr, subbuf_size, num_subbuf,
 			switch_timer_interval, read_timer_interval,
-			shm_fd, wait_fd, memory_map_size);
+			shm_fd, shm_path, wait_fd, wait_pipe_path,
+			memory_map_size);
 	if (!handle)
 		return NULL;
 	ltt_chan = priv;
@@ -434,17 +445,19 @@ void ltt_channel_destroy(struct ltt_channel *ltt_chan)
 
 static
 struct lttng_ust_lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
-					     struct lttng_ust_shm_handle *handle,
-					     int **shm_fd, int **wait_fd,
-					     uint64_t **memory_map_size)
+						       struct lttng_ust_shm_handle *handle,
+						       int **shm_fd, char **shm_path,
+						       int **wait_fd, char **wait_pipe_path,
+						       uint64_t **memory_map_size)
 {
 	struct lttng_ust_lib_ring_buffer *buf;
 	int cpu;
 
 	for_each_channel_cpu(cpu, chan) {
 		buf = channel_get_ring_buffer(&client_config, chan,
-				cpu, handle, shm_fd, wait_fd,
-				memory_map_size);
+					      cpu, handle, shm_fd, shm_path,
+					      wait_fd, wait_pipe_path,
+					      memory_map_size);
 		if (!lib_ring_buffer_open_read(buf, handle, 0))
 			return buf;
 	}
@@ -541,11 +554,13 @@ int ltt_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle)
 
 	for_each_channel_cpu(cpu, chan) {
 		int *shm_fd, *wait_fd;
+		char *shm_path, *wait_pipe_path;
 		uint64_t *memory_map_size;
 
 		buf = channel_get_ring_buffer(&client_config, chan,
-				cpu, handle, &shm_fd, &wait_fd,
-				&memory_map_size);
+					      cpu, handle, &shm_fd, &shm_path,
+					      &wait_fd, &wait_pipe_path,
+					      &memory_map_size);
 		lib_ring_buffer_switch(&client_config, buf,
 				SWITCH_ACTIVE, handle);
 	}