[tip:perf/core] perf record: Move machine variable down the function
From: tip-bot for Jiri Olsa
Date: Fri Mar 09 2018 - 03:53:19 EST
Commit-ID: 20a8a3cf90215cebd916048e51a5bfa6c3707778
Gitweb: https://git.kernel.org/tip/20a8a3cf90215cebd916048e51a5bfa6c3707778
Author: Jiri Olsa <jolsa@xxxxxxxxxx>
AuthorDate: Wed, 7 Mar 2018 16:50:04 +0100
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Thu, 8 Mar 2018 11:30:42 -0300
perf record: Move machine variable down the function
It's used far more down to be declared on the top of the __cmd_record.
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20180307155020.32613-4-jolsa@xxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-record.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 753ffcecf254..31d4d70e2f6a 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -854,7 +854,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
int status = 0;
unsigned long waking = 0;
const bool forks = argc > 0;
- struct machine *machine;
struct perf_tool *tool = &rec->tool;
struct record_opts *opts = &rec->opts;
struct perf_data *data = &rec->data;
@@ -959,8 +958,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
goto out_child;
}
- machine = &session->machines.host;
-
err = record__synthesize(rec, false);
if (err < 0)
goto out_child;
@@ -988,6 +985,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
* Let the child rip
*/
if (forks) {
+ struct machine *machine = &session->machines.host;
union perf_event *event;
pid_t tgid;