X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lib%2Fringbuffer%2Ffrontend_api.h;h=ff6abce93d684a86e48066ed7fc537a2516fe9b4;hb=7915e163192dc9674bcd7ce80338d9d8ebf23d4c;hp=13975602380bf02e82979c071969be0eaa56612a;hpb=5fb66f07aae4884426f1706d0281bd242a38c2a7;p=lttng-modules.git diff --git a/lib/ringbuffer/frontend_api.h b/lib/ringbuffer/frontend_api.h index 13975602..ff6abce9 100644 --- a/lib/ringbuffer/frontend_api.h +++ b/lib/ringbuffer/frontend_api.h @@ -125,6 +125,14 @@ int lib_ring_buffer_try_reserve(const struct lib_ring_buffer_config *config, * boundary. It's safe to write. */ *o_end = *o_begin + ctx->slot_size; + + if (unlikely((subbuf_offset(*o_end, chan)) == 0)) + /* + * The offset_end will fall at the very beginning of the next + * subbuffer. + */ + return 1; + return 0; } @@ -284,14 +292,13 @@ void lib_ring_buffer_commit(const struct lib_ring_buffer_config *config, commit_count = v_read(config, &buf->commit_hot[endidx].cc); lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1, - commit_count, endidx); + commit_count, endidx, ctx->tsc); /* * 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, - ctx->buf_offset, commit_count, - ctx->slot_size); + offset_end, commit_count); } /**