From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Thomas Gleixner <tglx@linutronix.de>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH v2 2/8] ring-buffer: Pass timestamp by value and not by reference
Date: Wed, 20 Oct 2010 21:39:08 -0400 [thread overview]
Message-ID: <20101021014143.024740462@goodmis.org> (raw)
In-Reply-To: 20101021013906.507064528@goodmis.org
[-- Attachment #1: 0002-ring-buffer-Pass-timestamp-by-value-and-not-by-refer.patch --]
[-- Type: text/plain, Size: 3490 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
The original code for the ring buffer had locations that modified
the timestamp and that change was used by the callers. Now,
the timestamp is not reused by the callers and there is no reason
to pass it by reference.
By changing the call to pass by value, lets gcc optimize the code
a bit more where it can store the timestamp in a register and not
worry about updating the reference.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
kernel/trace/ring_buffer.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 0b88df8..c8ce6bd 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1829,7 +1829,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
static noinline struct ring_buffer_event *
rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
unsigned long length, unsigned long tail,
- struct buffer_page *tail_page, u64 *ts)
+ struct buffer_page *tail_page, u64 ts)
{
struct buffer_page *commit_page = cpu_buffer->commit_page;
struct ring_buffer *buffer = cpu_buffer->buffer;
@@ -1912,8 +1912,8 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
* Nested commits always have zero deltas, so
* just reread the time stamp
*/
- *ts = rb_time_stamp(buffer);
- next_page->page->time_stamp = *ts;
+ ts = rb_time_stamp(buffer);
+ next_page->page->time_stamp = ts;
}
out_again:
@@ -1932,7 +1932,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
static struct ring_buffer_event *
__rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
- unsigned type, unsigned long length, u64 *ts)
+ unsigned type, unsigned long length, u64 ts)
{
struct buffer_page *tail_page;
struct ring_buffer_event *event;
@@ -1965,7 +1965,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
* its timestamp.
*/
if (!tail)
- tail_page->page->time_stamp = *ts;
+ tail_page->page->time_stamp = ts;
return event;
}
@@ -2008,7 +2008,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
static int
rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
- u64 *ts, u64 *delta)
+ u64 ts, u64 *delta)
{
struct ring_buffer_event *event;
int ret;
@@ -2016,7 +2016,7 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
WARN_ONCE(*delta > (1ULL << 59),
KERN_WARNING "Delta way too big! %llu ts=%llu write stamp = %llu\n",
(unsigned long long)*delta,
- (unsigned long long)*ts,
+ (unsigned long long)ts,
(unsigned long long)cpu_buffer->write_stamp);
/*
@@ -2051,7 +2051,7 @@ rb_add_time_stamp(struct ring_buffer_per_cpu *cpu_buffer,
event->array[0] = 0;
}
}
- cpu_buffer->write_stamp = *ts;
+ cpu_buffer->write_stamp = ts;
/* let the caller know this was the commit */
ret = 1;
} else {
@@ -2175,7 +2175,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
delta = diff;
if (unlikely(test_time_stamp(delta))) {
- commit = rb_add_time_stamp(cpu_buffer, &ts, &delta);
+ commit = rb_add_time_stamp(cpu_buffer, ts, &delta);
if (commit == -EBUSY)
goto out_fail;
@@ -2187,7 +2187,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
}
get_event:
- event = __rb_reserve_next(cpu_buffer, 0, length, &ts);
+ event = __rb_reserve_next(cpu_buffer, 0, length, ts);
if (unlikely(PTR_ERR(event) == -EAGAIN))
goto again;
--
1.7.1
next prev parent reply other threads:[~2010-10-21 1:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-21 1:39 [PATCH v2 0/8] [GIT PULL] ring-buffer: various updates Steven Rostedt
2010-10-21 1:39 ` [PATCH v2 1/8] ring-buffer: Make write slow path out of line Steven Rostedt
2010-10-21 1:39 ` Steven Rostedt [this message]
2010-10-21 1:39 ` [PATCH v2 3/8] ring-buffer: Pass delta by value and not by reference Steven Rostedt
2010-10-21 1:39 ` [PATCH v2 4/8] ring-buffer: Remove ring_buffer_event_time_delta() Steven Rostedt
2010-10-21 1:39 ` [PATCH v2 5/8] ring-buffer: Bind time extend and data events together Steven Rostedt
2010-10-21 1:39 ` [PATCH v2 6/8] ring-buffer: Remove condition to add timestamp in fast path Steven Rostedt
2010-10-21 1:39 ` [PATCH v2 7/8] ring-buffer: Micro-optimize with some strategic inlining Steven Rostedt
2010-10-21 1:39 ` [PATCH v2 8/8] ring-buffer: Remove unused macro RB_TIMESTAMPS_PER_PAGE Steven Rostedt
2010-10-21 13:35 ` [PATCH v2 0/8] [GIT PULL] ring-buffer: various updates Steven Rostedt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101021014143.024740462@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox