X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fringbuffer%2Fbackend_types.h;h=c9cc4025aaf926becb1566ffbfb8f0964bf1103a;hb=HEAD;hp=19d6513d4d75689c6b033abf7673240d88b1d390;hpb=e4db8f987126e1c1e586e5ae1e1ba73d0ab43438;p=lttng-ust.git

diff --git a/src/common/ringbuffer/backend_types.h b/src/common/ringbuffer/backend_types.h
index 19d6513d..c9cc4025 100644
--- a/src/common/ringbuffer/backend_types.h
+++ b/src/common/ringbuffer/backend_types.h
@@ -15,7 +15,7 @@
 #include "vatomic.h"
 
 #define RB_BACKEND_PAGES_PADDING	16
-struct lttng_ust_lib_ring_buffer_backend_pages {
+struct lttng_ust_ring_buffer_backend_pages {
 	unsigned long mmap_offset;	/* offset of the subbuffer in mmap */
 	union v_atomic records_commit;	/* current records committed count */
 	union v_atomic records_unread;	/* records to read */
@@ -24,12 +24,12 @@ struct lttng_ust_lib_ring_buffer_backend_pages {
 	char padding[RB_BACKEND_PAGES_PADDING];
 };
 
-struct lttng_ust_lib_ring_buffer_backend_subbuffer {
+struct lttng_ust_ring_buffer_backend_subbuffer {
 	/* Identifier for subbuf backend pages. Exchanged atomically. */
 	unsigned long id;		/* backend subbuffer identifier */
 };
 
-struct lttng_ust_lib_ring_buffer_backend_counts {
+struct lttng_ust_ring_buffer_backend_counts {
 	/*
 	 * Counter specific to the sub-buffer location within the ring buffer.
 	 * The actual sequence number of the packet within the entire ring
@@ -42,37 +42,37 @@ struct lttng_ust_lib_ring_buffer_backend_counts {
 /*
  * Forward declaration of frontend-specific channel and ring_buffer.
  */
-struct lttng_ust_lib_ring_buffer_channel;
-struct lttng_ust_lib_ring_buffer;
+struct lttng_ust_ring_buffer_channel;
+struct lttng_ust_ring_buffer;
 
-struct lttng_ust_lib_ring_buffer_backend_pages_shmp {
-	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_pages, shmp);
+struct lttng_ust_ring_buffer_backend_pages_shmp {
+	DECLARE_SHMP(struct lttng_ust_ring_buffer_backend_pages, shmp);
 };
 
 #define RB_BACKEND_RING_BUFFER_PADDING		64
-struct lttng_ust_lib_ring_buffer_backend {
+struct lttng_ust_ring_buffer_backend {
 	/* Array of ring_buffer_backend_subbuffer for writer */
-	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_subbuffer, buf_wsb);
+	DECLARE_SHMP(struct lttng_ust_ring_buffer_backend_subbuffer, buf_wsb);
 	/* ring_buffer_backend_subbuffer for reader */
-	struct lttng_ust_lib_ring_buffer_backend_subbuffer buf_rsb;
+	struct lttng_ust_ring_buffer_backend_subbuffer buf_rsb;
 	/* Array of lib_ring_buffer_backend_counts for the packet counter */
-	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_counts, buf_cnt);
+	DECLARE_SHMP(struct lttng_ust_ring_buffer_backend_counts, buf_cnt);
 	/*
 	 * Pointer array of backend pages, for whole buffer.
 	 * Indexed by ring_buffer_backend_subbuffer identifier (id) index.
 	 */
-	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_pages_shmp, array);
+	DECLARE_SHMP(struct lttng_ust_ring_buffer_backend_pages_shmp, array);
 	DECLARE_SHMP(char, memory_map);	/* memory mapping */
 
-	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_channel, chan);	/* Associated channel */
+	DECLARE_SHMP(struct lttng_ust_ring_buffer_channel, chan);	/* Associated channel */
 	int cpu;			/* This buffer's cpu. -1 if global. */
 	union v_atomic records_read;	/* Number of records read */
 	unsigned int allocated:1;	/* is buffer allocated ? */
 	char padding[RB_BACKEND_RING_BUFFER_PADDING];
 };
 
-struct lttng_ust_lib_ring_buffer_shmp {
-	DECLARE_SHMP(struct lttng_ust_lib_ring_buffer, shmp); /* Channel per-cpu buffers */
+struct lttng_ust_ring_buffer_shmp {
+	DECLARE_SHMP(struct lttng_ust_ring_buffer, shmp); /* Channel per-cpu buffers */
 };
 
 #define RB_BACKEND_CHANNEL_PADDING	64
@@ -87,12 +87,12 @@ struct channel_backend {
 	unsigned int buf_size_order;	/* Order of buffer size */
 	unsigned int extra_reader_sb:1;	/* has extra reader subbuffer ? */
 	unsigned long num_subbuf;	/* Number of sub-buffers for writer */
-	uint64_t start_tsc;		/* Channel creation TSC value */
+	uint64_t start_timestamp;	/* Channel creation timestamp value */
 	DECLARE_SHMP(void *, priv_data);/* Client-specific information */
-	struct lttng_ust_lib_ring_buffer_config config; /* Ring buffer configuration */
+	struct lttng_ust_ring_buffer_config config; /* Ring buffer configuration */
 	char name[NAME_MAX];		/* Channel name */
 	char padding[RB_BACKEND_CHANNEL_PADDING];
-	struct lttng_ust_lib_ring_buffer_shmp buf[];
+	struct lttng_ust_ring_buffer_shmp buf[];
 };
 
 #endif /* _LTTNG_RING_BUFFER_BACKEND_TYPES_H */