projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tracepoint API change: rename TRACEPOINT_SYSTEM to TRACEPOINT_PROVIDER
[lttng-ust.git]
/
libringbuffer
/
backend_types.h
diff --git
a/libringbuffer/backend_types.h
b/libringbuffer/backend_types.h
index 3bc36ba81ee896fbd295e5973b6f9cbe052cdbfe..1c3d3bc540410fc816983f5f33c037aee5a97a67 100644
(file)
--- a/
libringbuffer/backend_types.h
+++ b/
libringbuffer/backend_types.h
@@
-11,9
+11,9
@@
* Dual LGPL v2.1/GPL v2 license.
*/
* Dual LGPL v2.1/GPL v2 license.
*/
-#include "shm.h"
+#include "shm
_internal
.h"
-struct lib_ring_buffer_backend_pages {
+struct l
ttng_ust_l
ib_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 */
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 */
@@
-21,7
+21,7
@@
struct lib_ring_buffer_backend_pages {
DECLARE_SHMP(char, p); /* Backing memory map */
};
DECLARE_SHMP(char, p); /* Backing memory map */
};
-struct lib_ring_buffer_backend_subbuffer {
+struct l
ttng_ust_l
ib_ring_buffer_backend_subbuffer {
/* Identifier for subbuf backend pages. Exchanged atomically. */
unsigned long id; /* backend subbuffer identifier */
};
/* Identifier for subbuf backend pages. Exchanged atomically. */
unsigned long id; /* backend subbuffer identifier */
};
@@
-30,18
+30,22
@@
struct lib_ring_buffer_backend_subbuffer {
* Forward declaration of frontend-specific channel and ring_buffer.
*/
struct channel;
* Forward declaration of frontend-specific channel and ring_buffer.
*/
struct channel;
-struct lib_ring_buffer;
+struct l
ttng_ust_l
ib_ring_buffer;
-struct lib_ring_buffer_backend {
+struct lttng_ust_lib_ring_buffer_backend_pages_shmp {
+ DECLARE_SHMP(struct lttng_ust_lib_ring_buffer_backend_pages, shmp);
+};
+
+struct lttng_ust_lib_ring_buffer_backend {
/* Array of ring_buffer_backend_subbuffer for writer */
/* Array of ring_buffer_backend_subbuffer for writer */
- DECLARE_SHMP(struct lib_ring_buffer_backend_subbuffer, buf_wsb);
+ DECLARE_SHMP(struct l
ttng_ust_l
ib_ring_buffer_backend_subbuffer, buf_wsb);
/* ring_buffer_backend_subbuffer for reader */
/* ring_buffer_backend_subbuffer for reader */
- struct lib_ring_buffer_backend_subbuffer buf_rsb;
+ struct l
ttng_ust_l
ib_ring_buffer_backend_subbuffer buf_rsb;
/*
* Pointer array of backend pages, for whole buffer.
* Indexed by ring_buffer_backend_subbuffer identifier (id) index.
*/
/*
* Pointer array of backend pages, for whole buffer.
* Indexed by ring_buffer_backend_subbuffer identifier (id) index.
*/
- DECLARE_SHMP(struct l
ib_ring_buffer_backend_pages *
, array);
+ DECLARE_SHMP(struct l
ttng_ust_lib_ring_buffer_backend_pages_shmp
, array);
DECLARE_SHMP(char, memory_map); /* memory mapping */
DECLARE_SHMP(struct channel, chan); /* Associated channel */
DECLARE_SHMP(char, memory_map); /* memory mapping */
DECLARE_SHMP(struct channel, chan); /* Associated channel */
@@
-50,6
+54,10
@@
struct lib_ring_buffer_backend {
unsigned int allocated:1; /* Bool: is buffer allocated ? */
};
unsigned int allocated:1; /* Bool: is buffer allocated ? */
};
+struct lttng_ust_lib_ring_buffer_shmp {
+ DECLARE_SHMP(struct lttng_ust_lib_ring_buffer, shmp); /* Channel per-cpu buffers */
+};
+
struct channel_backend {
unsigned long buf_size; /* Size of the buffer */
unsigned long subbuf_size; /* Sub-buffer size */
struct channel_backend {
unsigned long buf_size; /* Size of the buffer */
unsigned long subbuf_size; /* Sub-buffer size */
@@
-60,12
+68,12
@@
struct channel_backend {
*/
unsigned int buf_size_order; /* Order of buffer size */
int extra_reader_sb:1; /* Bool: has extra reader subbuffer */
*/
unsigned int buf_size_order; /* Order of buffer size */
int extra_reader_sb:1; /* Bool: has extra reader subbuffer */
- DECLARE_SHMP(struct lib_ring_buffer, buf); /* Channel per-cpu buffers */
unsigned long num_subbuf; /* Number of sub-buffers for writer */
u64 start_tsc; /* Channel creation TSC value */
unsigned long num_subbuf; /* Number of sub-buffers for writer */
u64 start_tsc; /* Channel creation TSC value */
-
void *priv;
/* Client-specific information */
-
const struct lib_ring_buffer_config *
config; /* Ring buffer configuration */
+
DECLARE_SHMP(void *, priv_data);
/* Client-specific information */
+
struct lttng_ust_lib_ring_buffer_config
config; /* Ring buffer configuration */
char name[NAME_MAX]; /* Channel name */
char name[NAME_MAX]; /* Channel name */
+ struct lttng_ust_lib_ring_buffer_shmp buf[];
};
#endif /* _LINUX_RING_BUFFER_BACKEND_TYPES_H */
};
#endif /* _LINUX_RING_BUFFER_BACKEND_TYPES_H */
This page took
0.026093 seconds
and
4
git commands to generate.