2010-08-05 20:28:08

by Julia Lawall

Subject: [PATCH 36/42] tools/perf: Adjust confusing if indentation

From: Julia Lawall <[email protected]>

Outdent the code following the if.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
cocci.print_main("branch",p1)
cocci.print_secs("after",p2)
// </smpl>

Signed-off-by: Julia Lawall <[email protected]>

---
This patch does not change the semantics. But it might not be the correct
fix either.

tools/perf/builtin-timechart.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 5161619..9bcc38f 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -455,8 +455,8 @@ static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te)
if (p->current->state != TYPE_NONE)
pid_put_sample(sw->next_pid, p->current->state, cpu, p->current->state_since, timestamp);

- p->current->state_since = timestamp;
- p->current->state = TYPE_RUNNING;
+ p->current->state_since = timestamp;
+ p->current->state = TYPE_RUNNING;
}

if (prev_p->current) {

2010-08-05 21:44:31

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH 36/42] tools/perf: Adjust confusing if indentation

Em Thu, Aug 05, 2010 at 10:27:51PM +0200, Julia Lawall escreveu:
> From: Julia Lawall <[email protected]>
>
> Outdent the code following the if.

Thanks, applying.

2010-08-06 17:07:35

by Julia Lawall

Subject: [tip:perf/core] perf timechart: Adjust confusing if indentation

Commit-ID: 33e26a1b492d21283d1372ddd547562d371dab98
Gitweb: http://git.kernel.org/tip/33e26a1b492d21283d1372ddd547562d371dab98
Author: Julia Lawall <[email protected]>
AuthorDate: Thu, 5 Aug 2010 22:27:51 +0200
Committer: Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 5 Aug 2010 19:38:02 -0300

perf timechart: Adjust confusing if indentation

Outdent the code following the if.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
cocci.print_main("branch",p1)
cocci.print_secs("after",p2)
// </smpl>

Cc: Peter Zijlstra <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Ingo Molnar <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Julia Lawall <[email protected]>
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
tools/perf/builtin-timechart.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index 5161619..9bcc38f 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -455,8 +455,8 @@ static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te)
if (p->current->state != TYPE_NONE)
pid_put_sample(sw->next_pid, p->current->state, cpu, p->current->state_since, timestamp);

- p->current->state_since = timestamp;
- p->current->state = TYPE_RUNNING;
+ p->current->state_since = timestamp;
+ p->current->state = TYPE_RUNNING;
}

if (prev_p->current) {