projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename struct lib_ring_buffer* to struct lttng_ust_lib_ring_buffer*
[lttng-ust.git]
/
libringbuffer
/
ring_buffer_frontend.c
diff --git
a/libringbuffer/ring_buffer_frontend.c
b/libringbuffer/ring_buffer_frontend.c
index 5e6d4df267d2c48d9d4c0bfa44b33202574dcea0..a344d415f1d1f459e933ebc7733cf5ebfc2d488a 100644
(file)
--- a/
libringbuffer/ring_buffer_frontend.c
+++ b/
libringbuffer/ring_buffer_frontend.c
@@
-85,14
+85,14
@@
__thread unsigned int lib_ring_buffer_nesting;
static
void lib_ring_buffer_print_errors(struct channel *chan,
static
void lib_ring_buffer_print_errors(struct channel *chan,
- struct lib_ring_buffer *buf, int cpu,
- struct shm_handle *handle);
+ struct l
ttng_ust_l
ib_ring_buffer *buf, int cpu,
+ struct
lttng_ust_
shm_handle *handle);
/*
* Must be called under cpu hotplug protection.
*/
/*
* Must be called under cpu hotplug protection.
*/
-void lib_ring_buffer_free(struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+void lib_ring_buffer_free(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
@@
-112,11
+112,11
@@
void lib_ring_buffer_free(struct lib_ring_buffer *buf,
* should not be using the iterator concurrently with reset. The previous
* current iterator record is reset.
*/
* should not be using the iterator concurrently with reset. The previous
* current iterator record is reset.
*/
-void lib_ring_buffer_reset(struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+void lib_ring_buffer_reset(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned int i;
/*
unsigned int i;
/*
@@
-167,12
+167,12
@@
void channel_reset(struct channel *chan)
/*
* Must be called under cpu hotplug protection.
*/
/*
* Must be called under cpu hotplug protection.
*/
-int lib_ring_buffer_create(struct lib_ring_buffer *buf,
+int lib_ring_buffer_create(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel_backend *chanb, int cpu,
struct channel_backend *chanb, int cpu,
- struct shm_handle *handle,
+ struct
lttng_ust_
shm_handle *handle,
struct shm_object *shmobj)
{
struct shm_object *shmobj)
{
- const struct lib_ring_buffer_config *config = &chanb->config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chanb->config;
struct channel *chan = caa_container_of(chanb, struct channel, backend);
void *priv = chanb->priv;
unsigned int num_subbuf;
struct channel *chan = caa_container_of(chanb, struct channel, backend);
void *priv = chanb->priv;
unsigned int num_subbuf;
@@
-242,9
+242,9
@@
free_chanbuf:
#if 0
static void switch_buffer_timer(unsigned long data)
{
#if 0
static void switch_buffer_timer(unsigned long data)
{
- struct l
ib_ring_buffer *buf = (struct
lib_ring_buffer *)data;
+ struct l
ttng_ust_lib_ring_buffer *buf = (struct lttng_ust_
lib_ring_buffer *)data;
struct channel *chan = shmp(handle, buf->backend.chan);
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
/*
* Only flush buffers periodically if readers are active.
/*
* Only flush buffers periodically if readers are active.
@@
-262,11
+262,11
@@
static void switch_buffer_timer(unsigned long data)
}
#endif //0
}
#endif //0
-static void lib_ring_buffer_start_switch_timer(struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+static void lib_ring_buffer_start_switch_timer(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
-
const struct
lib_ring_buffer_config *config = &chan->backend.config;
+
//const struct lttng_ust_
lib_ring_buffer_config *config = &chan->backend.config;
if (!chan->switch_timer_interval || buf->switch_timer_enabled)
return;
if (!chan->switch_timer_interval || buf->switch_timer_enabled)
return;
@@
-282,8
+282,8
@@
static void lib_ring_buffer_start_switch_timer(struct lib_ring_buffer *buf,
buf->switch_timer_enabled = 1;
}
buf->switch_timer_enabled = 1;
}
-static void lib_ring_buffer_stop_switch_timer(struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+static void lib_ring_buffer_stop_switch_timer(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
@@
-301,9
+301,9
@@
static void lib_ring_buffer_stop_switch_timer(struct lib_ring_buffer *buf,
*/
static void read_buffer_timer(unsigned long data)
{
*/
static void read_buffer_timer(unsigned long data)
{
- struct l
ib_ring_buffer *buf = (struct
lib_ring_buffer *)data;
+ struct l
ttng_ust_lib_ring_buffer *buf = (struct lttng_ust_
lib_ring_buffer *)data;
struct channel *chan = shmp(handle, buf->backend.chan);
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
CHAN_WARN_ON(chan, !buf->backend.allocated);
CHAN_WARN_ON(chan, !buf->backend.allocated);
@@
-324,11
+324,11
@@
static void read_buffer_timer(unsigned long data)
}
#endif //0
}
#endif //0
-static void lib_ring_buffer_start_read_timer(struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+static void lib_ring_buffer_start_read_timer(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
if (config->wakeup != RING_BUFFER_WAKEUP_BY_TIMER
|| !chan->read_timer_interval
if (config->wakeup != RING_BUFFER_WAKEUP_BY_TIMER
|| !chan->read_timer_interval
@@
-348,11
+348,11
@@
static void lib_ring_buffer_start_read_timer(struct lib_ring_buffer *buf,
buf->read_timer_enabled = 1;
}
buf->read_timer_enabled = 1;
}
-static void lib_ring_buffer_stop_read_timer(struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+static void lib_ring_buffer_stop_read_timer(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
if (config->wakeup != RING_BUFFER_WAKEUP_BY_TIMER
|| !chan->read_timer_interval
if (config->wakeup != RING_BUFFER_WAKEUP_BY_TIMER
|| !chan->read_timer_interval
@@
-374,20
+374,20
@@
static void lib_ring_buffer_stop_read_timer(struct lib_ring_buffer *buf,
}
static void channel_unregister_notifiers(struct channel *chan,
}
static void channel_unregister_notifiers(struct channel *chan,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
int cpu;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
for_each_possible_cpu(cpu) {
int cpu;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
for_each_possible_cpu(cpu) {
- struct lib_ring_buffer *buf = shmp(handle, chan->backend.buf[cpu].shmp);
+ struct l
ttng_ust_l
ib_ring_buffer *buf = shmp(handle, chan->backend.buf[cpu].shmp);
lib_ring_buffer_stop_switch_timer(buf, handle);
lib_ring_buffer_stop_read_timer(buf, handle);
}
} else {
lib_ring_buffer_stop_switch_timer(buf, handle);
lib_ring_buffer_stop_read_timer(buf, handle);
}
} else {
- struct lib_ring_buffer *buf = shmp(handle, chan->backend.buf[0].shmp);
+ struct l
ttng_ust_l
ib_ring_buffer *buf = shmp(handle, chan->backend.buf[0].shmp);
lib_ring_buffer_stop_switch_timer(buf, handle);
lib_ring_buffer_stop_read_timer(buf, handle);
lib_ring_buffer_stop_switch_timer(buf, handle);
lib_ring_buffer_stop_read_timer(buf, handle);
@@
-395,11
+395,9
@@
static void channel_unregister_notifiers(struct channel *chan,
//channel_backend_unregister_notifiers(&chan->backend);
}
//channel_backend_unregister_notifiers(&chan->backend);
}
-static void channel_free(struct channel *chan, struct shm_handle *handle,
+static void channel_free(struct channel *chan, struct
lttng_ust_
shm_handle *handle,
int shadow)
{
int shadow)
{
- int ret;
-
if (!shadow)
channel_backend_free(&chan->backend, handle);
/* chan is freed by shm teardown */
if (!shadow)
channel_backend_free(&chan->backend, handle);
/* chan is freed by shm teardown */
@@
-425,7
+423,7
@@
static void channel_free(struct channel *chan, struct shm_handle *handle,
* Holds cpu hotplug.
* Returns NULL on failure.
*/
* Holds cpu hotplug.
* Returns NULL on failure.
*/
-struct
shm_handle *channel_create(const struct
lib_ring_buffer_config *config,
+struct
lttng_ust_shm_handle *channel_create(const struct lttng_ust_
lib_ring_buffer_config *config,
const char *name, void *priv, void *buf_addr,
size_t subbuf_size,
size_t num_subbuf, unsigned int switch_timer_interval,
const char *name, void *priv, void *buf_addr,
size_t subbuf_size,
size_t num_subbuf, unsigned int switch_timer_interval,
@@
-435,7
+433,7
@@
struct shm_handle *channel_create(const struct lib_ring_buffer_config *config,
int ret, cpu;
size_t shmsize;
struct channel *chan;
int ret, cpu;
size_t shmsize;
struct channel *chan;
- struct shm_handle *handle;
+ struct
lttng_ust_
shm_handle *handle;
struct shm_object *shmobj;
struct shm_ref *ref;
struct shm_object *shmobj;
struct shm_ref *ref;
@@
-443,7
+441,7
@@
struct shm_handle *channel_create(const struct lib_ring_buffer_config *config,
read_timer_interval))
return NULL;
read_timer_interval))
return NULL;
- handle = zmalloc(sizeof(struct shm_handle));
+ handle = zmalloc(sizeof(struct
lttng_ust_
shm_handle));
if (!handle)
return NULL;
if (!handle)
return NULL;
@@
-455,14
+453,17
@@
struct shm_handle *channel_create(const struct lib_ring_buffer_config *config,
/* Calculate the shm allocation layout */
shmsize = sizeof(struct channel);
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
/* Calculate the shm allocation layout */
shmsize = sizeof(struct channel);
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
- shmsize += sizeof(struct lib_ring_buffer_shmp) * num_possible_cpus();
+ shmsize += sizeof(struct l
ttng_ust_l
ib_ring_buffer_shmp) * num_possible_cpus();
else
else
- shmsize += sizeof(struct lib_ring_buffer_shmp);
+ shmsize += sizeof(struct l
ttng_ust_l
ib_ring_buffer_shmp);
shmobj = shm_object_table_append(handle->table, shmsize);
if (!shmobj)
goto error_append;
shmobj = shm_object_table_append(handle->table, shmsize);
if (!shmobj)
goto error_append;
+ /* struct channel is at object 0, offset 0 (hardcoded) */
set_shmp(handle->chan, zalloc_shm(shmobj, sizeof(struct channel)));
set_shmp(handle->chan, zalloc_shm(shmobj, sizeof(struct channel)));
+ assert(handle->chan._ref.index == 0);
+ assert(handle->chan._ref.offset == 0);
chan = shmp(handle, handle->chan);
if (!chan)
goto error_append;
chan = shmp(handle, handle->chan);
if (!chan)
goto error_append;
@@
-487,12
+488,12
@@
struct shm_handle *channel_create(const struct lib_ring_buffer_config *config,
* In that off case, we need to allocate for all possible cpus.
*/
for_each_possible_cpu(cpu) {
* In that off case, we need to allocate for all possible cpus.
*/
for_each_possible_cpu(cpu) {
- struct lib_ring_buffer *buf = shmp(handle, chan->backend.buf[cpu].shmp);
+ struct l
ttng_ust_l
ib_ring_buffer *buf = shmp(handle, chan->backend.buf[cpu].shmp);
lib_ring_buffer_start_switch_timer(buf, handle);
lib_ring_buffer_start_read_timer(buf, handle);
}
} else {
lib_ring_buffer_start_switch_timer(buf, handle);
lib_ring_buffer_start_read_timer(buf, handle);
}
} else {
- struct lib_ring_buffer *buf = shmp(handle, chan->backend.buf[0].shmp);
+ struct l
ttng_ust_l
ib_ring_buffer *buf = shmp(handle, chan->backend.buf[0].shmp);
lib_ring_buffer_start_switch_timer(buf, handle);
lib_ring_buffer_start_read_timer(buf, handle);
lib_ring_buffer_start_switch_timer(buf, handle);
lib_ring_buffer_start_read_timer(buf, handle);
@@
-509,13
+510,13
@@
error_table_alloc:
return NULL;
}
return NULL;
}
-struct shm_handle *channel_handle_create(int shm_fd, int wait_fd,
+struct
lttng_ust_
shm_handle *channel_handle_create(int shm_fd, int wait_fd,
uint64_t memory_map_size)
{
uint64_t memory_map_size)
{
- struct shm_handle *handle;
+ struct
lttng_ust_
shm_handle *handle;
struct shm_object *object;
struct shm_object *object;
- handle = zmalloc(sizeof(struct shm_handle));
+ handle = zmalloc(sizeof(struct
lttng_ust_
shm_handle));
if (!handle)
return NULL;
if (!handle)
return NULL;
@@
-528,7
+529,9
@@
struct shm_handle *channel_handle_create(int shm_fd, int wait_fd,
shm_fd, wait_fd, memory_map_size);
if (!object)
goto error_table_object;
shm_fd, wait_fd, memory_map_size);
if (!object)
goto error_table_object;
-
+ /* struct channel is at object 0, offset 0 (hardcoded) */
+ handle->chan._ref.index = 0;
+ handle->chan._ref.offset = 0;
return handle;
error_table_object:
return handle;
error_table_object:
@@
-538,7
+541,7
@@
error_table_alloc:
return NULL;
}
return NULL;
}
-int channel_handle_add_stream(struct shm_handle *handle,
+int channel_handle_add_stream(struct
lttng_ust_
shm_handle *handle,
int shm_fd, int wait_fd, uint64_t memory_map_size)
{
struct shm_object *object;
int shm_fd, int wait_fd, uint64_t memory_map_size)
{
struct shm_object *object;
@@
-552,7
+555,7
@@
int channel_handle_add_stream(struct shm_handle *handle,
}
static
}
static
-void channel_release(struct channel *chan, struct shm_handle *handle,
+void channel_release(struct channel *chan, struct
lttng_ust_
shm_handle *handle,
int shadow)
{
channel_free(chan, handle, shadow);
int shadow)
{
channel_free(chan, handle, shadow);
@@
-569,10
+572,10
@@
void channel_release(struct channel *chan, struct shm_handle *handle,
* They should release their handle at that point. Returns the private
* data pointer.
*/
* They should release their handle at that point. Returns the private
* data pointer.
*/
-void *channel_destroy(struct channel *chan, struct shm_handle *handle,
+void *channel_destroy(struct channel *chan, struct
lttng_ust_
shm_handle *handle,
int shadow)
{
int shadow)
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
void *priv;
int cpu;
void *priv;
int cpu;
@@
-585,7
+588,7
@@
void *channel_destroy(struct channel *chan, struct shm_handle *handle,
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
for_each_channel_cpu(cpu, chan) {
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU) {
for_each_channel_cpu(cpu, chan) {
- struct lib_ring_buffer *buf = shmp(handle, chan->backend.buf[cpu].shmp);
+ struct l
ttng_ust_l
ib_ring_buffer *buf = shmp(handle, chan->backend.buf[cpu].shmp);
if (config->cb.buffer_finalize)
config->cb.buffer_finalize(buf,
if (config->cb.buffer_finalize)
config->cb.buffer_finalize(buf,
@@
-602,7
+605,7
@@
void *channel_destroy(struct channel *chan, struct shm_handle *handle,
//wake_up_interruptible(&buf->read_wait);
}
} else {
//wake_up_interruptible(&buf->read_wait);
}
} else {
- struct lib_ring_buffer *buf = shmp(handle, chan->backend.buf[0].shmp);
+ struct l
ttng_ust_l
ib_ring_buffer *buf = shmp(handle, chan->backend.buf[0].shmp);
if (config->cb.buffer_finalize)
config->cb.buffer_finalize(buf, chan->backend.priv, -1, handle);
if (config->cb.buffer_finalize)
config->cb.buffer_finalize(buf, chan->backend.priv, -1, handle);
@@
-628,10
+631,10
@@
void *channel_destroy(struct channel *chan, struct shm_handle *handle,
return priv;
}
return priv;
}
-struct lib_ring_buffer *channel_get_ring_buffer(
- const struct lib_ring_buffer_config *config,
+struct l
ttng_ust_l
ib_ring_buffer *channel_get_ring_buffer(
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config,
struct channel *chan, int cpu,
struct channel *chan, int cpu,
- struct shm_handle *handle,
+ struct
lttng_ust_
shm_handle *handle,
int *shm_fd, int *wait_fd,
uint64_t *memory_map_size)
{
int *shm_fd, int *wait_fd,
uint64_t *memory_map_size)
{
@@
-643,6
+646,8
@@
struct lib_ring_buffer *channel_get_ring_buffer(
memory_map_size);
return shmp(handle, chan->backend.buf[0].shmp);
} else {
memory_map_size);
return shmp(handle, chan->backend.buf[0].shmp);
} else {
+ if (cpu >= num_possible_cpus())
+ return NULL;
ref = &chan->backend.buf[cpu].shmp._ref;
shm_get_object_data(handle, ref, shm_fd, wait_fd,
memory_map_size);
ref = &chan->backend.buf[cpu].shmp._ref;
shm_get_object_data(handle, ref, shm_fd, wait_fd,
memory_map_size);
@@
-650,12
+655,10
@@
struct lib_ring_buffer *channel_get_ring_buffer(
}
}
}
}
-int lib_ring_buffer_open_read(struct lib_ring_buffer *buf,
- struct shm_handle *handle,
+int lib_ring_buffer_open_read(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle,
int shadow)
{
int shadow)
{
- struct channel *chan = shmp(handle, buf->backend.chan);
-
if (shadow) {
if (uatomic_cmpxchg(&buf->active_shadow_readers, 0, 1) != 0)
return -EBUSY;
if (shadow) {
if (uatomic_cmpxchg(&buf->active_shadow_readers, 0, 1) != 0)
return -EBUSY;
@@
-668,8
+671,8
@@
int lib_ring_buffer_open_read(struct lib_ring_buffer *buf,
return 0;
}
return 0;
}
-void lib_ring_buffer_release_read(struct lib_ring_buffer *buf,
- struct shm_handle *handle,
+void lib_ring_buffer_release_read(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle,
int shadow)
{
struct channel *chan = shmp(handle, buf->backend.chan);
int shadow)
{
struct channel *chan = shmp(handle, buf->backend.chan);
@@
-695,12
+698,12
@@
void lib_ring_buffer_release_read(struct lib_ring_buffer *buf,
* data to read at consumed position, or 0 if the get operation succeeds.
*/
* data to read at consumed position, or 0 if the get operation succeeds.
*/
-int lib_ring_buffer_snapshot(struct lib_ring_buffer *buf,
+int lib_ring_buffer_snapshot(struct l
ttng_ust_l
ib_ring_buffer *buf,
unsigned long *consumed, unsigned long *produced,
unsigned long *consumed, unsigned long *produced,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long consumed_cur, write_offset;
int finalized;
unsigned long consumed_cur, write_offset;
int finalized;
@@
-749,11
+752,11
@@
nodata:
* @buf: ring buffer
* @consumed_new: new consumed count value
*/
* @buf: ring buffer
* @consumed_new: new consumed count value
*/
-void lib_ring_buffer_move_consumer(struct lib_ring_buffer *buf,
+void lib_ring_buffer_move_consumer(struct l
ttng_ust_l
ib_ring_buffer *buf,
unsigned long consumed_new,
unsigned long consumed_new,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- struct lib_ring_buffer_backend *bufb = &buf->backend;
+ struct l
ttng_ust_l
ib_ring_buffer_backend *bufb = &buf->backend;
struct channel *chan = shmp(handle, bufb->chan);
unsigned long consumed;
struct channel *chan = shmp(handle, bufb->chan);
unsigned long consumed;
@@
-779,12
+782,12
@@
void lib_ring_buffer_move_consumer(struct lib_ring_buffer *buf,
* Returns -ENODATA if buffer is finalized, -EAGAIN if there is currently no
* data to read at consumed position, or 0 if the get operation succeeds.
*/
* Returns -ENODATA if buffer is finalized, -EAGAIN if there is currently no
* data to read at consumed position, or 0 if the get operation succeeds.
*/
-int lib_ring_buffer_get_subbuf(struct lib_ring_buffer *buf,
+int lib_ring_buffer_get_subbuf(struct l
ttng_ust_l
ib_ring_buffer *buf,
unsigned long consumed,
unsigned long consumed,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long consumed_cur, consumed_idx, commit_count, write_offset;
int ret;
int finalized;
unsigned long consumed_cur, consumed_idx, commit_count, write_offset;
int ret;
int finalized;
@@
-873,12
+876,12
@@
nodata:
* lib_ring_buffer_put_subbuf - release exclusive subbuffer access
* @buf: ring buffer
*/
* lib_ring_buffer_put_subbuf - release exclusive subbuffer access
* @buf: ring buffer
*/
-void lib_ring_buffer_put_subbuf(struct lib_ring_buffer *buf,
- struct shm_handle *handle)
+void lib_ring_buffer_put_subbuf(struct l
ttng_ust_l
ib_ring_buffer *buf,
+ struct
lttng_ust_
shm_handle *handle)
{
{
- struct lib_ring_buffer_backend *bufb = &buf->backend;
+ struct l
ttng_ust_l
ib_ring_buffer_backend *bufb = &buf->backend;
struct channel *chan = shmp(handle, bufb->chan);
struct channel *chan = shmp(handle, bufb->chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long read_sb_bindex, consumed_idx, consumed;
CHAN_WARN_ON(chan, uatomic_read(&buf->active_readers) != 1
unsigned long read_sb_bindex, consumed_idx, consumed;
CHAN_WARN_ON(chan, uatomic_read(&buf->active_readers) != 1
@@
-933,13
+936,13
@@
void lib_ring_buffer_put_subbuf(struct lib_ring_buffer *buf,
* position and the writer position. (inclusive)
*/
static
* position and the writer position. (inclusive)
*/
static
-void lib_ring_buffer_print_subbuffer_errors(struct lib_ring_buffer *buf,
+void lib_ring_buffer_print_subbuffer_errors(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
unsigned long cons_offset,
int cpu,
struct channel *chan,
unsigned long cons_offset,
int cpu,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long cons_idx, commit_count, commit_count_sb;
cons_idx = subbuf_index(cons_offset, chan);
unsigned long cons_idx, commit_count, commit_count_sb;
cons_idx = subbuf_index(cons_offset, chan);
@@
-960,12
+963,12
@@
void lib_ring_buffer_print_subbuffer_errors(struct lib_ring_buffer *buf,
}
static
}
static
-void lib_ring_buffer_print_buffer_errors(struct lib_ring_buffer *buf,
+void lib_ring_buffer_print_buffer_errors(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
void *priv, int cpu,
struct channel *chan,
void *priv, int cpu,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long write_offset, cons_offset;
/*
unsigned long write_offset, cons_offset;
/*
@@
-998,10
+1001,10
@@
void lib_ring_buffer_print_buffer_errors(struct lib_ring_buffer *buf,
static
void lib_ring_buffer_print_errors(struct channel *chan,
static
void lib_ring_buffer_print_errors(struct channel *chan,
- struct lib_ring_buffer *buf, int cpu,
- struct shm_handle *handle)
+ struct l
ttng_ust_l
ib_ring_buffer *buf, int cpu,
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
void *priv = chan->backend.priv;
ERRMSG("ring buffer %s, cpu %d: %lu records written, "
void *priv = chan->backend.priv;
ERRMSG("ring buffer %s, cpu %d: %lu records written, "
@@
-1030,13
+1033,13
@@
void lib_ring_buffer_print_errors(struct channel *chan,
* Only executed when the buffer is finalized, in SWITCH_FLUSH.
*/
static
* Only executed when the buffer is finalized, in SWITCH_FLUSH.
*/
static
-void lib_ring_buffer_switch_old_start(struct lib_ring_buffer *buf,
+void lib_ring_buffer_switch_old_start(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long oldidx = subbuf_index(offsets->old, chan);
unsigned long commit_count;
unsigned long oldidx = subbuf_index(offsets->old, chan);
unsigned long commit_count;
@@
-1068,13
+1071,13
@@
void lib_ring_buffer_switch_old_start(struct lib_ring_buffer *buf,
* subbuffer.
*/
static
* subbuffer.
*/
static
-void lib_ring_buffer_switch_old_end(struct lib_ring_buffer *buf,
+void lib_ring_buffer_switch_old_end(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long oldidx = subbuf_index(offsets->old - 1, chan);
unsigned long commit_count, padding_size, data_size;
unsigned long oldidx = subbuf_index(offsets->old - 1, chan);
unsigned long commit_count, padding_size, data_size;
@@
-1105,13
+1108,13
@@
void lib_ring_buffer_switch_old_end(struct lib_ring_buffer *buf,
* that this code is executed before the deliver of this sub-buffer.
*/
static
* that this code is executed before the deliver of this sub-buffer.
*/
static
-void lib_ring_buffer_switch_new_start(struct lib_ring_buffer *buf,
+void lib_ring_buffer_switch_new_start(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long beginidx = subbuf_index(offsets->begin, chan);
unsigned long commit_count;
unsigned long beginidx = subbuf_index(offsets->begin, chan);
unsigned long commit_count;
@@
-1141,13
+1144,13
@@
void lib_ring_buffer_switch_new_start(struct lib_ring_buffer *buf,
* have to do the deliver themselves.
*/
static
* have to do the deliver themselves.
*/
static
-void lib_ring_buffer_switch_new_end(struct lib_ring_buffer *buf,
+void lib_ring_buffer_switch_new_end(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
struct channel *chan,
struct switch_offsets *offsets,
u64 tsc,
- struct shm_handle *handle)
+ struct
lttng_ust_
shm_handle *handle)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long endidx = subbuf_index(offsets->end - 1, chan);
unsigned long commit_count, padding_size, data_size;
unsigned long endidx = subbuf_index(offsets->end - 1, chan);
unsigned long commit_count, padding_size, data_size;
@@
-1177,12
+1180,12
@@
void lib_ring_buffer_switch_new_end(struct lib_ring_buffer *buf,
*/
static
int lib_ring_buffer_try_switch_slow(enum switch_mode mode,
*/
static
int lib_ring_buffer_try_switch_slow(enum switch_mode mode,
- struct lib_ring_buffer *buf,
+ struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
struct switch_offsets *offsets,
u64 *tsc)
{
struct channel *chan,
struct switch_offsets *offsets,
u64 *tsc)
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
unsigned long off;
offsets->begin = v_read(config, &buf->offset);
unsigned long off;
offsets->begin = v_read(config, &buf->offset);
@@
-1238,11
+1241,11
@@
int lib_ring_buffer_try_switch_slow(enum switch_mode mode,
* operations, this function must be called from the CPU which owns the buffer
* for a ACTIVE flush.
*/
* operations, this function must be called from the CPU which owns the buffer
* for a ACTIVE flush.
*/
-void lib_ring_buffer_switch_slow(struct lib_ring_buffer *buf, enum switch_mode mode,
- struct shm_handle *handle)
+void lib_ring_buffer_switch_slow(struct l
ttng_ust_l
ib_ring_buffer *buf, enum switch_mode mode,
+ struct
lttng_ust_
shm_handle *handle)
{
struct channel *chan = shmp(handle, buf->backend.chan);
{
struct channel *chan = shmp(handle, buf->backend.chan);
- const struct lib_ring_buffer_config *config = &chan->backend.config;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
struct switch_offsets offsets;
unsigned long oldidx;
u64 tsc;
struct switch_offsets offsets;
unsigned long oldidx;
u64 tsc;
@@
-1297,13
+1300,13
@@
void lib_ring_buffer_switch_slow(struct lib_ring_buffer *buf, enum switch_mode m
* -EIO if data cannot be written into the buffer for any other reason.
*/
static
* -EIO if data cannot be written into the buffer for any other reason.
*/
static
-int lib_ring_buffer_try_reserve_slow(struct lib_ring_buffer *buf,
+int lib_ring_buffer_try_reserve_slow(struct l
ttng_ust_l
ib_ring_buffer *buf,
struct channel *chan,
struct switch_offsets *offsets,
struct channel *chan,
struct switch_offsets *offsets,
- struct lib_ring_buffer_ctx *ctx)
+ struct l
ttng_ust_l
ib_ring_buffer_ctx *ctx)
{
{
- const struct lib_ring_buffer_config *config = &chan->backend.config;
- struct shm_handle *handle = ctx->handle;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
+ struct
lttng_ust_
shm_handle *handle = ctx->handle;
unsigned long reserve_commit_diff;
offsets->begin = v_read(config, &buf->offset);
unsigned long reserve_commit_diff;
offsets->begin = v_read(config, &buf->offset);
@@
-1435,12
+1438,12
@@
int lib_ring_buffer_try_reserve_slow(struct lib_ring_buffer *buf,
* -EIO for other errors, else returns 0.
* It will take care of sub-buffer switching.
*/
* -EIO for other errors, else returns 0.
* It will take care of sub-buffer switching.
*/
-int lib_ring_buffer_reserve_slow(struct lib_ring_buffer_ctx *ctx)
+int lib_ring_buffer_reserve_slow(struct l
ttng_ust_l
ib_ring_buffer_ctx *ctx)
{
struct channel *chan = ctx->chan;
{
struct channel *chan = ctx->chan;
- struct shm_handle *handle = ctx->handle;
- const struct lib_ring_buffer_config *config = &chan->backend.config;
- struct lib_ring_buffer *buf;
+ struct
lttng_ust_
shm_handle *handle = ctx->handle;
+ const struct l
ttng_ust_l
ib_ring_buffer_config *config = &chan->backend.config;
+ struct l
ttng_ust_l
ib_ring_buffer *buf;
struct switch_offsets offsets;
int ret;
struct switch_offsets offsets;
int ret;
This page took
0.035485 seconds
and
4
git commands to generate.