projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Calculate context length outside of retry loop
[lttng-modules.git]
/
lib
/
ringbuffer
/
frontend_api.h
diff --git
a/lib/ringbuffer/frontend_api.h
b/lib/ringbuffer/frontend_api.h
index 517af6350b7c620a881dddf13401b4979969a793..23118c46d98d8cbfa424131e4ca9454ab2e89254 100644
(file)
--- a/
lib/ringbuffer/frontend_api.h
+++ b/
lib/ringbuffer/frontend_api.h
@@
-87,6
+87,7
@@
void lib_ring_buffer_put_cpu(const struct lib_ring_buffer_config *config)
static inline
int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
struct lib_ring_buffer_ctx *ctx,
static inline
int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
struct 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)
{
@@
-113,7
+114,7
@@
int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
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;
@@
-155,7
+156,8
@@
int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config,
static inline
int lib_ring_buffer_reserve(const struct lib_ring_buffer_config *config,
static inline
int lib_ring_buffer_reserve(const struct lib_ring_buffer_config *config,
- struct lib_ring_buffer_ctx *ctx)
+ struct lib_ring_buffer_ctx *ctx,
+ void *client_ctx)
{
struct channel *chan = ctx->chan;
struct lib_ring_buffer *buf;
{
struct channel *chan = ctx->chan;
struct lib_ring_buffer *buf;
@@
-176,7
+178,7
@@
int lib_ring_buffer_reserve(const struct lib_ring_buffer_config *config,
/*
* Perform retryable operations.
*/
/*
* Perform retryable operations.
*/
- if (unlikely(lib_ring_buffer_try_reserve(config, ctx, &o_begin,
+ if (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;
@@
-207,7
+209,7
@@
int lib_ring_buffer_reserve(const struct lib_ring_buffer_config *config,
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
);
}
/**
}
/**
@@
-250,6
+252,7
@@
void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
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 = &buf->commit_hot[endidx];
/*
* Must count record before incrementing the commit count.
/*
* Must count record before incrementing the commit count.
@@
-270,7
+273,7
@@
void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
} else
smp_wmb();
} else
smp_wmb();
- v_add(config, ctx->slot_size, &
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.
@@
-290,7
+293,7
@@
void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
* 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, &
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, ctx->tsc);
lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1,
commit_count, endidx, ctx->tsc);
@@
-298,8
+301,8
@@
void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config,
* 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);
+ lib_ring_buffer_write_commit_counter(config, buf, chan,
+ offset_end, commit_count
, cc_hot
);
}
/**
}
/**
This page took
0.025973 seconds
and
4
git commands to generate.