Skip to content

Commit

Permalink
ring-buffer: fix timestamp in partial ring_buffer_page_read
Browse files Browse the repository at this point in the history
If a partial ring_buffer_page_read happens, then some of the
incremental timestamps may be lost. This patch writes the
recent timestamp into the page that is passed back to the caller.

A partial ring_buffer_page_read is where the full page would not
be written back to the user, and instead, just part of the page
is copied to the user. A full page would be a page swap with the
ring buffer and the timestamps would be correct.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
  • Loading branch information
Steven Rostedt committed Mar 5, 2009
1 parent e543ad7 commit 4f3640f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion kernel/trace/ring_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -2461,6 +2461,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
unsigned long flags;
unsigned int commit;
unsigned int read;
u64 save_timestamp;
int ret = -1;

/*
Expand Down Expand Up @@ -2515,6 +2516,9 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
if (len < size)
goto out;

/* save the current timestamp, since the user will need it */
save_timestamp = cpu_buffer->read_stamp;

/* Need to copy one event at a time */
do {
memcpy(bpage->data + pos, rpage->data + rpos, size);
Expand All @@ -2531,7 +2535,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer,

/* update bpage */
local_set(&bpage->commit, pos);
bpage->time_stamp = rpage->time_stamp;
bpage->time_stamp = save_timestamp;

/* we copied everything to the beginning */
read = 0;
Expand Down

0 comments on commit 4f3640f

Please sign in to comment.