From: tip-bot for Namhyung Kim <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: acme@redhat.com, linux-kernel@vger.kernel.org, paulus@samba.org,
hpa@zytor.com, mingo@kernel.org, a.p.zijlstra@chello.nl,
namhyung.kim@lge.com, namhyung@kernel.org, fweisbec@gmail.com,
rostedt@goodmis.org, tglx@linutronix.de
Subject: [tip:perf/core] perf tools: Cleanup calc_data_size logic
Date: Tue, 2 Apr 2013 02:32:23 -0700 [thread overview]
Message-ID: <tip-ebf3c675d7e4ba97568dd6daaa43b1af10046b29@git.kernel.org> (raw)
In-Reply-To: <1363850332-25297-10-git-send-email-namhyung@kernel.org>
Commit-ID: ebf3c675d7e4ba97568dd6daaa43b1af10046b29
Gitweb: http://git.kernel.org/tip/ebf3c675d7e4ba97568dd6daaa43b1af10046b29
Author: Namhyung Kim <namhyung.kim@lge.com>
AuthorDate: Thu, 21 Mar 2013 16:18:52 +0900
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Thu, 21 Mar 2013 13:37:37 -0300
perf tools: Cleanup calc_data_size logic
It's for calculating whole trace data size during reading. However
relation functions are called only in this file, no need to
conditionalize it with tricky +1 offset and rename the variable to
more meaningful name like trace_data_size.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1363850332-25297-10-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/trace-event-read.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 644ad3b..af215c0 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -43,7 +43,7 @@ int file_bigendian;
int host_bigendian;
static int long_size;
-static ssize_t calc_data_size;
+static ssize_t trace_data_size;
static bool repipe;
static int __do_read(int fd, void *buf, int size)
@@ -83,8 +83,7 @@ static int do_read(void *data, int size)
return -1;
}
- if (calc_data_size)
- calc_data_size += r;
+ trace_data_size += r;
return r;
}
@@ -155,8 +154,7 @@ static char *read_string(void)
break;
}
- if (calc_data_size)
- calc_data_size += size;
+ trace_data_size += size;
str = malloc(size);
if (str)
@@ -356,9 +354,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)
*ppevent = NULL;
- calc_data_size = 1;
repipe = __repipe;
-
input_fd = fd;
if (do_read(buf, 3) < 0)
@@ -417,8 +413,7 @@ ssize_t trace_report(int fd, struct pevent **ppevent, bool __repipe)
if (err)
goto out;
- size = calc_data_size - 1;
- calc_data_size = 0;
+ size = trace_data_size;
repipe = false;
if (show_funcs) {
prev parent reply other threads:[~2013-04-02 9:32 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-21 7:18 [PATCHSET 0/9] perf util: Cleanup die() and its friends (v2) Namhyung Kim
2013-03-21 7:18 ` [PATCH 1/9] perf util: Let get_tracing_file() can return NULL Namhyung Kim
2013-04-02 9:22 ` [tip:perf/core] perf tools: Let get_tracing_file() return NULL to indicate failure tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 2/9] perf util: Get rid of malloc_or_die() in trace-event-info.c Namhyung Kim
2013-04-02 9:23 ` [tip:perf/core] perf tools: " tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 3/9] perf util: Get rid of write_or_die() from trace-event-info.c Namhyung Kim
2013-04-02 9:25 ` [tip:perf/core] perf tools: " tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 4/9] perf util: Get rid of die() calls " Namhyung Kim
2013-04-02 9:26 ` [tip:perf/core] perf tools: " tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 5/9] perf util: Handle failure case in trace_report() Namhyung Kim
2013-04-02 9:27 ` [tip:perf/core] perf tools: " tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 6/9] perf util: Get rid of malloc_or_die() in trace-event-read.c Namhyung Kim
2013-04-02 9:28 ` [tip:perf/core] perf tools: " tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 7/9] perf util: Get rid of read_or_die() " Namhyung Kim
2013-04-02 9:29 ` [tip:perf/core] perf tools: " tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 8/9] perf util: Get rid of die() calls in trace-data-read.c Namhyung Kim
2013-04-02 9:31 ` [tip:perf/core] perf tools: " tip-bot for Namhyung Kim
2013-03-21 7:18 ` [PATCH 9/9] perf util: Cleanup calc_data_size logic Namhyung Kim
2013-04-02 9:32 ` tip-bot for Namhyung Kim [this message]
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=tip-ebf3c675d7e4ba97568dd6daaa43b1af10046b29@git.kernel.org \
--to=tipbot@zytor.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=rostedt@goodmis.org \
--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