projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: ust-tracepoint-event.h: extract `__num_fields` in a variable
[lttng-ust.git]
/
libringbuffer
/
frontend_api.h
diff --git
a/libringbuffer/frontend_api.h
b/libringbuffer/frontend_api.h
index 77a269184fcf1f3dbc26380f7e2e201cd25bd497..8a32006139afed25204c1594408ecaae54b3f46d 100644
(file)
--- a/
libringbuffer/frontend_api.h
+++ b/
libringbuffer/frontend_api.h
@@
-30,10
+30,13
@@
* See frontend.h for channel allocation and read-side API.
*/
* See frontend.h for channel allocation and read-side API.
*/
-#include "frontend.h"
+#include <stddef.h>
+
#include <urcu-bp.h>
#include <urcu/compiler.h>
#include <urcu-bp.h>
#include <urcu/compiler.h>
+#include "frontend.h"
+
/**
* lib_ring_buffer_get_cpu - Precedes ring buffer reserve/commit.
*
/**
* lib_ring_buffer_get_cpu - Precedes ring buffer reserve/commit.
*
@@
-60,7
+63,6
@@
int lib_ring_buffer_get_cpu(const struct lttng_ust_lib_ring_buffer_config *confi
if (caa_unlikely(nesting > 4)) {
WARN_ON_ONCE(1);
URCU_TLS(lib_ring_buffer_nesting)--;
if (caa_unlikely(nesting > 4)) {
WARN_ON_ONCE(1);
URCU_TLS(lib_ring_buffer_nesting)--;
- rcu_read_unlock();
return -EPERM;
} else
return cpu;
return -EPERM;
} else
return cpu;
@@
-85,6
+87,7
@@
void lib_ring_buffer_put_cpu(const struct lttng_ust_lib_ring_buffer_config *conf
static inline
int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
static inline
int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *config,
struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ void *client_ctx,
unsigned long *o_begin, unsigned long *o_end,
unsigned long *o_old, size_t *before_hdr_pad)
{
unsigned long *o_begin, unsigned long *o_end,
unsigned long *o_old, size_t *before_hdr_pad)
{
@@
-111,7
+114,7
@@
int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *c
return 1;
ctx->slot_size = record_header_size(config, chan, *o_begin,
return 1;
ctx->slot_size = record_header_size(config, chan, *o_begin,
- before_hdr_pad, ctx);
+ before_hdr_pad, ctx
, client_ctx
);
ctx->slot_size +=
lib_ring_buffer_align(*o_begin + ctx->slot_size,
ctx->largest_align) + ctx->data_size;
ctx->slot_size +=
lib_ring_buffer_align(*o_begin + ctx->slot_size,
ctx->largest_align) + ctx->data_size;
@@
-153,7
+156,8
@@
int lib_ring_buffer_try_reserve(const struct lttng_ust_lib_ring_buffer_config *c
static inline
int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *config,
static inline
int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *config,
- struct lttng_ust_lib_ring_buffer_ctx *ctx)
+ struct lttng_ust_lib_ring_buffer_ctx *ctx,
+ void *client_ctx)
{
struct channel *chan = ctx->chan;
struct lttng_ust_shm_handle *handle = ctx->handle;
{
struct channel *chan = ctx->chan;
struct lttng_ust_shm_handle *handle = ctx->handle;
@@
-161,21
+165,23
@@
int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *confi
unsigned long o_begin, o_end, o_old;
size_t before_hdr_pad = 0;
unsigned long o_begin, o_end, o_old;
size_t before_hdr_pad = 0;
- if (
uatomic_read(&chan->record_disabled
))
+ if (
caa_unlikely(uatomic_read(&chan->record_disabled)
))
return -EAGAIN;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
buf = shmp(handle, chan->backend.buf[ctx->cpu].shmp);
else
buf = shmp(handle, chan->backend.buf[0].shmp);
return -EAGAIN;
if (config->alloc == RING_BUFFER_ALLOC_PER_CPU)
buf = shmp(handle, chan->backend.buf[ctx->cpu].shmp);
else
buf = shmp(handle, chan->backend.buf[0].shmp);
- if (uatomic_read(&buf->record_disabled))
+ if (caa_unlikely(!buf))
+ return -EIO;
+ if (caa_unlikely(uatomic_read(&buf->record_disabled)))
return -EAGAIN;
ctx->buf = buf;
/*
* Perform retryable operations.
*/
return -EAGAIN;
ctx->buf = buf;
/*
* Perform retryable operations.
*/
- if (caa_unlikely(lib_ring_buffer_try_reserve(config, ctx, &o_begin,
+ if (caa_unlikely(lib_ring_buffer_try_reserve(config, ctx,
client_ctx,
&o_begin,
&o_end, &o_old, &before_hdr_pad)))
goto slow_path;
&o_end, &o_old, &before_hdr_pad)))
goto slow_path;
@@
-206,7
+212,7
@@
int lib_ring_buffer_reserve(const struct lttng_ust_lib_ring_buffer_config *confi
ctx->buf_offset = o_begin + before_hdr_pad;
return 0;
slow_path:
ctx->buf_offset = o_begin + before_hdr_pad;
return 0;
slow_path:
- return lib_ring_buffer_reserve_slow(ctx);
+ return lib_ring_buffer_reserve_slow(ctx
, client_ctx
);
}
/**
}
/**
@@
-251,11
+257,16
@@
void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
unsigned long offset_end = ctx->buf_offset;
unsigned long endidx = subbuf_index(offset_end - 1, chan);
unsigned long commit_count;
unsigned long offset_end = ctx->buf_offset;
unsigned long endidx = subbuf_index(offset_end - 1, chan);
unsigned long commit_count;
+ struct commit_counters_hot *cc_hot = shmp_index(handle,
+ buf->commit_hot, endidx);
+
+ if (caa_unlikely(!cc_hot))
+ return;
/*
* Must count record before incrementing the commit count.
*/
/*
* Must count record before incrementing the commit count.
*/
- subbuffer_count_record(config, &buf->backend, endidx, handle);
+ subbuffer_count_record(config,
ctx,
&buf->backend, endidx, handle);
/*
* Order all writes to buffer before the commit count update that will
/*
* Order all writes to buffer before the commit count update that will
@@
-263,7
+274,7
@@
void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
*/
cmm_smp_wmb();
*/
cmm_smp_wmb();
- v_add(config, ctx->slot_size, &
shmp_index(handle, buf->commit_hot, endidx)
->cc);
+ v_add(config, ctx->slot_size, &
cc_hot
->cc);
/*
* commit count read can race with concurrent OOO commit count updates.
/*
* commit count read can race with concurrent OOO commit count updates.
@@
-283,7
+294,7
@@
void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
* count reaches back the reserve offset for a specific sub-buffer,
* which is completely independent of the order.
*/
* count reaches back the reserve offset for a specific sub-buffer,
* which is completely independent of the order.
*/
- commit_count = v_read(config, &
shmp_index(handle, buf->commit_hot, endidx)
->cc);
+ commit_count = v_read(config, &
cc_hot
->cc);
lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
commit_count, endidx, handle, ctx->tsc);
lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
commit_count, endidx, handle, ctx->tsc);
@@
-291,8
+302,8
@@
void lib_ring_buffer_commit(const struct lttng_ust_lib_ring_buffer_config *confi
* Update used size at each commit. It's needed only for extracting
* ring_buffer buffers from vmcore, after crash.
*/
* Update used size at each commit. It's needed only for extracting
* ring_buffer buffers from vmcore, after crash.
*/
- lib_ring_buffer_write_commit_counter(config, buf, chan,
endidx,
- offset_end, commit_count, handle);
+ lib_ring_buffer_write_commit_counter(config, buf, chan,
+ offset_end, commit_count, handle
, cc_hot
);
}
/**
}
/**
This page took
0.030521 seconds
and
4
git commands to generate.