projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libust ABI: export streams
[lttng-ust.git]
/
libust
/
ltt-ring-buffer-metadata-client.h
diff --git
a/libust/ltt-ring-buffer-metadata-client.h
b/libust/ltt-ring-buffer-metadata-client.h
index 1ea41176b123ece92d855fb80cd022cef52f0256..dd168465655f5a646c8c62f4a3ded71210c03e26 100644
(file)
--- a/
libust/ltt-ring-buffer-metadata-client.h
+++ b/
libust/ltt-ring-buffer-metadata-client.h
@@
-9,8
+9,8
@@
*/
#include <stdint.h>
*/
#include <stdint.h>
+#include <ust/lttng-events.h>
#include "ust/bitfield.h"
#include "ust/bitfield.h"
-#include "ltt-events.h"
#include "ltt-tracer.h"
#include "../libringbuffer/frontend_types.h"
#include "ltt-tracer.h"
#include "../libringbuffer/frontend_types.h"
@@
-76,13
+76,15
@@
static size_t client_packet_header_size(void)
}
static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
}
static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
- unsigned int subbuf_idx)
+ unsigned int subbuf_idx,
+ struct shm_handle *handle)
{
{
- struct channel *chan = shmp(buf->backend.chan);
+ struct channel *chan = shmp(
handle,
buf->backend.chan);
struct metadata_packet_header *header =
(struct metadata_packet_header *)
lib_ring_buffer_offset_address(&buf->backend,
struct metadata_packet_header *header =
(struct metadata_packet_header *)
lib_ring_buffer_offset_address(&buf->backend,
- subbuf_idx * chan->backend.subbuf_size);
+ subbuf_idx * chan->backend.subbuf_size,
+ handle);
struct ltt_channel *ltt_chan = channel_get_private(chan);
struct ltt_session *session = ltt_chan->session;
struct ltt_channel *ltt_chan = channel_get_private(chan);
struct ltt_session *session = ltt_chan->session;
@@
-101,13
+103,15
@@
static void client_buffer_begin(struct lib_ring_buffer *buf, u64 tsc,
* subbuffer. data_size is between 1 and subbuf_size.
*/
static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
* subbuffer. data_size is between 1 and subbuf_size.
*/
static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
- unsigned int subbuf_idx, unsigned long data_size)
+ unsigned int subbuf_idx, unsigned long data_size,
+ struct shm_handle *handle)
{
{
- struct channel *chan = shmp(buf->backend.chan);
+ struct channel *chan = shmp(
handle,
buf->backend.chan);
struct metadata_packet_header *header =
(struct metadata_packet_header *)
lib_ring_buffer_offset_address(&buf->backend,
struct metadata_packet_header *header =
(struct metadata_packet_header *)
lib_ring_buffer_offset_address(&buf->backend,
- subbuf_idx * chan->backend.subbuf_size);
+ subbuf_idx * chan->backend.subbuf_size,
+ handle);
unsigned long records_lost = 0;
header->content_size = data_size * CHAR_BIT; /* in bits */
unsigned long records_lost = 0;
header->content_size = data_size * CHAR_BIT; /* in bits */
@@
-119,12
+123,15
@@
static void client_buffer_end(struct lib_ring_buffer *buf, u64 tsc,
}
static int client_buffer_create(struct lib_ring_buffer *buf, void *priv,
}
static int client_buffer_create(struct lib_ring_buffer *buf, void *priv,
- int cpu, const char *name)
+ int cpu, const char *name,
+ struct shm_handle *handle)
{
return 0;
}
{
return 0;
}
-static void client_buffer_finalize(struct lib_ring_buffer *buf, void *priv, int cpu)
+static void client_buffer_finalize(struct lib_ring_buffer *buf,
+ void *priv, int cpu,
+ struct shm_handle *handle)
{
}
{
}
@@
-142,46
+149,54
@@
static const struct lib_ring_buffer_config client_config = {
.sync = RING_BUFFER_SYNC_GLOBAL,
.mode = RING_BUFFER_MODE_TEMPLATE,
.backend = RING_BUFFER_PAGE,
.sync = RING_BUFFER_SYNC_GLOBAL,
.mode = RING_BUFFER_MODE_TEMPLATE,
.backend = RING_BUFFER_PAGE,
- .output = RING_BUFFER_
SPLICE
,
+ .output = RING_BUFFER_
MMAP
,
.oops = RING_BUFFER_OOPS_CONSISTENCY,
.oops = RING_BUFFER_OOPS_CONSISTENCY,
- .ipi = RING_BUFFER_IPI_BARRIER,
- .wakeup = RING_BUFFER_WAKEUP_BY_
TIM
ER,
+ .ipi = RING_BUFFER_
NO_
IPI_BARRIER,
+ .wakeup = RING_BUFFER_WAKEUP_BY_
WRIT
ER,
};
static
};
static
-struct channel *_channel_create(const char *name,
+struct
ltt_
channel *_channel_create(const char *name,
struct ltt_channel *ltt_chan, void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
struct ltt_channel *ltt_chan, void *buf_addr,
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
- unsigned int read_timer_interval,
- int *shmid)
+ unsigned int read_timer_interval)
{
{
-
return
channel_create(&client_config, name, ltt_chan, buf_addr,
+
ltt_chan->handle =
channel_create(&client_config, name, ltt_chan, buf_addr,
subbuf_size, num_subbuf, switch_timer_interval,
subbuf_size, num_subbuf, switch_timer_interval,
- read_timer_interval, shmid);
+ read_timer_interval);
+ if (!ltt_chan->handle)
+ return NULL;
+ ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan);
+ return ltt_chan;
}
static
}
static
-void ltt_channel_destroy(struct
channel *
chan)
+void ltt_channel_destroy(struct
ltt_channel *ltt_
chan)
{
{
- channel_destroy(
chan
);
+ channel_destroy(
ltt_chan->chan, ltt_chan->handle
);
}
static
}
static
-struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan)
+struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
+ struct shm_handle *handle,
+ int *shm_fd, int *wait_fd,
+ uint64_t *memory_map_size)
{
struct lib_ring_buffer *buf;
{
struct lib_ring_buffer *buf;
- buf = channel_get_ring_buffer(&client_config, chan, 0);
- if (!lib_ring_buffer_open_read(buf))
+ buf = channel_get_ring_buffer(&client_config, chan,
+ 0, handle, shm_fd, wait_fd, memory_map_size);
+ if (!lib_ring_buffer_open_read(buf, handle))
return buf;
return NULL;
}
static
return buf;
return NULL;
}
static
-void ltt_buffer_read_close(struct lib_ring_buffer *buf)
+void ltt_buffer_read_close(struct lib_ring_buffer *buf,
+ struct shm_handle *handle)
{
{
- lib_ring_buffer_release_read(buf);
+ lib_ring_buffer_release_read(buf
, handle
);
}
static
}
static
@@
-204,13
+219,13
@@
void ltt_event_write(struct lib_ring_buffer_ctx *ctx, const void *src,
}
static
}
static
-size_t ltt_packet_avail_size(struct channel *chan)
+size_t ltt_packet_avail_size(struct channel *chan
, struct shm_handle *handle
)
{
unsigned long o_begin;
struct lib_ring_buffer *buf;
{
unsigned long o_begin;
struct lib_ring_buffer *buf;
- buf = shmp(
chan->backend.buf
); /* Only for global buffer ! */
+ buf = shmp(
handle, chan->backend.buf[0].shmp
); /* Only for global buffer ! */
o_begin = v_read(&client_config, &buf->offset);
if (subbuf_offset(o_begin, chan) != 0) {
return chan->backend.subbuf_size - subbuf_offset(o_begin, chan);
o_begin = v_read(&client_config, &buf->offset);
if (subbuf_offset(o_begin, chan) != 0) {
return chan->backend.subbuf_size - subbuf_offset(o_begin, chan);
@@
-247,7
+262,7
@@
int ltt_is_disabled(struct channel *chan)
}
static struct ltt_transport ltt_relay_transport = {
}
static struct ltt_transport ltt_relay_transport = {
- .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING,
+ .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING
"-mmap"
,
.ops = {
.channel_create = _channel_create,
.channel_destroy = ltt_channel_destroy,
.ops = {
.channel_create = _channel_create,
.channel_destroy = ltt_channel_destroy,
@@
-264,16
+279,14
@@
static struct ltt_transport ltt_relay_transport = {
},
};
},
};
-static
-void __attribute__((constructor)) ltt_ring_buffer_client_init(void)
+void RING_BUFFER_MODE_TEMPLATE_INIT(void)
{
{
-
printf
("LTT : ltt ring buffer client init\n");
+
DBG
("LTT : ltt ring buffer client init\n");
ltt_transport_register(<t_relay_transport);
}
ltt_transport_register(<t_relay_transport);
}
-static
-void __attribute__((destructor)) ltt_ring_buffer_client_exit(void)
+void RING_BUFFER_MODE_TEMPLATE_EXIT(void)
{
{
-
printf
("LTT : ltt ring buffer client exit\n");
+
DBG
("LTT : ltt ring buffer client exit\n");
ltt_transport_unregister(<t_relay_transport);
}
ltt_transport_unregister(<t_relay_transport);
}
This page took
0.025699 seconds
and
4
git commands to generate.