Message ID | 4C7242D7.4050009@jp.fujitsu.com |
---|---|
State | Awaiting Upstream, archived |
Delegated to: | David Miller |
Headers | show |
From: Koki Sanagi <sanagi.koki@jp.fujitsu.com> Date: Mon, 23 Aug 2010 18:43:51 +0900 > From: Neil Horman <nhorman@tuxdriver.com> > > This patch converts trace_napi_poll from DECLARE_EVENT to TRACE_EVENT to improve > the usability of napi_poll tracepoint. > > <idle>-0 [001] 241302.750777: napi_poll: napi poll on napi struct f6acc480 for device eth3 > <idle>-0 [000] 241302.852389: napi_poll: napi poll on napi struct f5d0d70c for device eth1 > > An original patch is below. > http://marc.info/?l=linux-kernel&m=126021713809450&w=2 > Signed-off-by: Neil Horman <nhorman@tuxdriver.com> > > And add a fix by Steven Rostedt. > http://marc.info/?l=linux-kernel&m=126150506519173&w=2 > > Signed-off-by: Koki Sanagi <sanagi.koki@jp.fujitsu.com> Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/trace/events/napi.h b/include/trace/events/napi.h index 188deca..8fe1e93 100644 --- a/include/trace/events/napi.h +++ b/include/trace/events/napi.h @@ -6,10 +6,31 @@ #include <linux/netdevice.h> #include <linux/tracepoint.h> +#include <linux/ftrace.h> + +#define NO_DEV "(no_device)" + +TRACE_EVENT(napi_poll, -DECLARE_TRACE(napi_poll, TP_PROTO(struct napi_struct *napi), - TP_ARGS(napi)); + + TP_ARGS(napi), + + TP_STRUCT__entry( + __field( struct napi_struct *, napi) + __string( dev_name, napi->dev ? napi->dev->name : NO_DEV) + ), + + TP_fast_assign( + __entry->napi = napi; + __assign_str(dev_name, napi->dev ? napi->dev->name : NO_DEV); + ), + + TP_printk("napi poll on napi struct %p for device %s", + __entry->napi, __get_str(dev_name)) +); + +#undef NO_DEV #endif /* _TRACE_NAPI_H_ */