Re: codiff misses changes if inline -> not inlined?

[Arnaldo Carvalho de Melo <acme-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]

CCing dwarves-u79uwXL29TY76Z2rM5mHXA@public.gmane.org so that people know about this fix.

Em Thu, Jan 03, 2008 at 03:40:16PM +0200, Ilpo Järvinen escreveu:
> Hi,
> 
> I've had a problem with codiff when playing around with inlines. It seems 
> to miss completely the resizement of inlined function from zero to 
> something. Here's one example (relevant patch attached):
> 
> $ codiff tcp_input.o.old tcp_input.o
> net/ipv4/tcp_input.c:
>   tcp_dsack_extend |  -73
>   tcp_data_queue   |  -17
>  2 functions changed, 90 bytes removed
> 
> $ pfunct -s tcp_input.o.old | grep "tcp_sack_extend"
> $ pfunct -s tcp_input.o | grep "tcp_sack_extend"
> tcp_sack_extend: 66
> 
> Isn't that tcp_sack_extend | +66 missing from codiff's output???
> 
> 
> There's nothing special in the tcp_sack_extend(), any inline (at least in 
> .c files) will do.

Fixed:

[acme@doppio pahole]$ codiff /tmp/tcp_input.o.before /tmp/tcp_input.o.after
/home/acme/git/net-2.6.25/net/ipv4/tcp_input.c:
  tcp_dsack_extend |  -29
  tcp_data_queue   |  -49
 2 functions changed, 78 bytes removed

/home/acme/git/net-2.6.25/net/ipv4/tcp_input.c:
  tcp_sack_extend |  +34
 1 function changed, 34 bytes added

/tmp/tcp_input.o.after:
 3 functions changed, 34 bytes added, 78 bytes removed, diff: -44
[acme@doppio pahole]$

And if you use --verbose it'll tell you that in fact it was
"(uninlined)":

[acme@doppio pahole]$ codiff -V /tmp/tcp_input.o.before /tmp/tcp_input.o.after
/home/acme/git/net-2.6.25/net/ipv4/tcp_input.c:
  tcp_dsack_extend |  -29 # 55 -> 26, # inlines: 1 -> 0, size inlines: 34 -> 0
  tcp_data_queue   |  -49 # 2892 -> 2843, size inlines: 1247 -> 1240
 2 functions changed, 78 bytes removed

/home/acme/git/net-2.6.25/net/ipv4/tcp_input.c:
  tcp_sack_extend |  +34 (uninlined)
 1 function changed, 34 bytes added

/tmp/tcp_input.o.after:
 3 functions changed, 34 bytes added, 78 bytes removed, diff: -44
[acme@doppio pahole]$

> From d9cd8eb51562d2d3e36fb61765b24401f97e76be Mon Sep 17 00:00:00 2001
> From: =?ISO-8859-1?q?Ilpo_J=E4rvinen?= <ilpo.jarvinen@helsinki.fi>
> Date: Sat, 29 Dec 2007 13:51:54 +0200
> Subject: [PATCH] [TCP]: Remove inline from tcp_sack_extend()
> Content-Type: text/plain; charset=ISO-8859-1
> Content-Transfer-Encoding: 8bit
> 
> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen-pxSi+dnQzZMxHbG02/KK1g@public.gmane.org>
> ---
> net/ipv4/tcp_input.c |    3 +--
> 1 files changed, 1 insertions(+), 2 deletions(-)
>
>diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
>index d5b6adf..48f52cb 100644
>--- a/net/ipv4/tcp_input.c
>+++ b/net/ipv4/tcp_input.c
>@@ -3581,8 +3581,7 @@ static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th)
> 	}
> }
> 
>-static inline int tcp_sack_extend(struct tcp_sack_block *sp, u32 seq,
>-				  u32 end_seq)
>+static int tcp_sack_extend(struct tcp_sack_block *sp, u32 seq, u32 end_seq)
> {
> 	if (!after(seq, sp->end_seq) && !after(sp->start_seq, end_seq)) {
> 		if (before(seq, sp->start_seq))
>-- 

- Arnaldo
-
To unsubscribe from this list: send the line "unsubscribe dwarves" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html