perf script: Add callchain to generic and tracepoint events

This provides valuable information for tracing performance problems.

Since this change alters the interface for the python scripts, also
adjust the script generation and the provided scripts.

Signed-off-by: Joseph Schuchart <joseph.schuchart@tu-dresden.de>
Acked-by: Thomas Ilsche <thomas.ilsche@tu-dresden.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Ilsche <thomas.ilsche@tu-dresden.de>
Link: http://lkml.kernel.org/r/53BE7E1B.10503@tu-dresden.de
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/tools/perf/scripts/python/netdev-times.py b/tools/perf/scripts/python/netdev-times.py
index 9aa0a32972e8..4d21ef2d601d 100644
--- a/tools/perf/scripts/python/netdev-times.py
+++ b/tools/perf/scripts/python/netdev-times.py
@@ -224,75 +224,75 @@ def trace_end():
                         (len(rx_skb_list), of_count_rx_skb_list)
 
 # called from perf, when it finds a correspoinding event
-def irq__softirq_entry(name, context, cpu, sec, nsec, pid, comm, vec):
+def irq__softirq_entry(name, context, cpu, sec, nsec, pid, comm, callchain, vec):
         if symbol_str("irq__softirq_entry", "vec", vec) != "NET_RX":
                 return
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, vec)
         all_event_list.append(event_info)
 
-def irq__softirq_exit(name, context, cpu, sec, nsec, pid, comm, vec):
+def irq__softirq_exit(name, context, cpu, sec, nsec, pid, comm, callchain, vec):
         if symbol_str("irq__softirq_entry", "vec", vec) != "NET_RX":
                 return
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, vec)
         all_event_list.append(event_info)
 
-def irq__softirq_raise(name, context, cpu, sec, nsec, pid, comm, vec):
+def irq__softirq_raise(name, context, cpu, sec, nsec, pid, comm, callchain, vec):
         if symbol_str("irq__softirq_entry", "vec", vec) != "NET_RX":
                 return
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, vec)
         all_event_list.append(event_info)
 
 def irq__irq_handler_entry(name, context, cpu, sec, nsec, pid, comm,
-                        irq, irq_name):
+                        callchain, irq, irq_name):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         irq, irq_name)
         all_event_list.append(event_info)
 
-def irq__irq_handler_exit(name, context, cpu, sec, nsec, pid, comm, irq, ret):
+def irq__irq_handler_exit(name, context, cpu, sec, nsec, pid, comm, callchain, irq, ret):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm, irq, ret)
         all_event_list.append(event_info)
 
-def napi__napi_poll(name, context, cpu, sec, nsec, pid, comm, napi, dev_name):
+def napi__napi_poll(name, context, cpu, sec, nsec, pid, comm, callchain, napi, dev_name):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         napi, dev_name)
         all_event_list.append(event_info)
 
-def net__netif_receive_skb(name, context, cpu, sec, nsec, pid, comm, skbaddr,
+def net__netif_receive_skb(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr,
                         skblen, dev_name):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         skbaddr, skblen, dev_name)
         all_event_list.append(event_info)
 
-def net__netif_rx(name, context, cpu, sec, nsec, pid, comm, skbaddr,
+def net__netif_rx(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr,
                         skblen, dev_name):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         skbaddr, skblen, dev_name)
         all_event_list.append(event_info)
 
-def net__net_dev_queue(name, context, cpu, sec, nsec, pid, comm,
+def net__net_dev_queue(name, context, cpu, sec, nsec, pid, comm, callchain,
                         skbaddr, skblen, dev_name):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         skbaddr, skblen, dev_name)
         all_event_list.append(event_info)
 
-def net__net_dev_xmit(name, context, cpu, sec, nsec, pid, comm,
+def net__net_dev_xmit(name, context, cpu, sec, nsec, pid, comm, callchain,
                         skbaddr, skblen, rc, dev_name):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         skbaddr, skblen, rc ,dev_name)
         all_event_list.append(event_info)
 
-def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm,
+def skb__kfree_skb(name, context, cpu, sec, nsec, pid, comm, callchain,
                         skbaddr, protocol, location):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         skbaddr, protocol, location)
         all_event_list.append(event_info)
 
-def skb__consume_skb(name, context, cpu, sec, nsec, pid, comm, skbaddr):
+def skb__consume_skb(name, context, cpu, sec, nsec, pid, comm, callchain, skbaddr):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         skbaddr)
         all_event_list.append(event_info)
 
-def skb__skb_copy_datagram_iovec(name, context, cpu, sec, nsec, pid, comm,
+def skb__skb_copy_datagram_iovec(name, context, cpu, sec, nsec, pid, comm, callchain,
         skbaddr, skblen):
         event_info = (name, context, cpu, nsecs(sec, nsec), pid, comm,
                         skbaddr, skblen)