All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 36/42] tools/perf: Adjust confusing if indentation
@ 2010-08-05 20:27 ` Julia Lawall
  0 siblings, 0 replies; 5+ messages in thread
From: Julia Lawall @ 2010-08-05 20:27 UTC (permalink / raw)
  To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
	Arnaldo Carvalho de Melo, linux-kernel, kernel-janitors

From: Julia Lawall <julia@diku.dk>

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 <julia@diku.dk>

---
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) {

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [PATCH 36/42] tools/perf: Adjust confusing if indentation
@ 2010-08-05 20:27 ` Julia Lawall
  0 siblings, 0 replies; 5+ messages in thread
From: Julia Lawall @ 2010-08-05 20:27 UTC (permalink / raw)
  To: Peter Zijlstra, Paul Mackerras, Ingo Molnar,
	Arnaldo Carvalho de Melo, linux-kernel, kernel-janitors

From: Julia Lawall <julia@diku.dk>

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 <julia@diku.dk>

---
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) {

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH 36/42] tools/perf: Adjust confusing if indentation
  2010-08-05 20:27 ` Julia Lawall
@ 2010-08-05 21:44   ` Arnaldo Carvalho de Melo
  -1 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-08-05 21:44 UTC (permalink / raw)
  To: Julia Lawall
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, linux-kernel,
	kernel-janitors

Em Thu, Aug 05, 2010 at 10:27:51PM +0200, Julia Lawall escreveu:
> From: Julia Lawall <julia@diku.dk>
> 
> Outdent the code following the if.

Thanks, applying.

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 36/42] tools/perf: Adjust confusing if indentation
@ 2010-08-05 21:44   ` Arnaldo Carvalho de Melo
  0 siblings, 0 replies; 5+ messages in thread
From: Arnaldo Carvalho de Melo @ 2010-08-05 21:44 UTC (permalink / raw)
  To: Julia Lawall
  Cc: Peter Zijlstra, Paul Mackerras, Ingo Molnar, linux-kernel,
	kernel-janitors

Em Thu, Aug 05, 2010 at 10:27:51PM +0200, Julia Lawall escreveu:
> From: Julia Lawall <julia@diku.dk>
> 
> Outdent the code following the if.

Thanks, applying.

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [tip:perf/core] perf timechart: Adjust confusing if indentation
  2010-08-05 20:27 ` Julia Lawall
  (?)
  (?)
@ 2010-08-06 17:06 ` tip-bot for Julia Lawall
  -1 siblings, 0 replies; 5+ messages in thread
From: tip-bot for Julia Lawall @ 2010-08-06 17:06 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, linux-kernel, paulus, julia, hpa, mingo, a.p.zijlstra, tglx,
	mingo

Commit-ID:  33e26a1b492d21283d1372ddd547562d371dab98
Gitweb:     http://git.kernel.org/tip/33e26a1b492d21283d1372ddd547562d371dab98
Author:     Julia Lawall <julia@diku.dk>
AuthorDate: Thu, 5 Aug 2010 22:27:51 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
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 <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <Pine.LNX.4.64.1008052227330.31692@ask.diku.dk>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 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) {

^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-08-06 17:07 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-05 20:27 [PATCH 36/42] tools/perf: Adjust confusing if indentation Julia Lawall
2010-08-05 20:27 ` Julia Lawall
2010-08-05 21:44 ` Arnaldo Carvalho de Melo
2010-08-05 21:44   ` Arnaldo Carvalho de Melo
2010-08-06 17:06 ` [tip:perf/core] perf timechart: " tip-bot for Julia Lawall

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.