Skip to content

Commit

Permalink
napi: Convert trace_napi_poll to TRACE_EVENT
Browse files Browse the repository at this point in the history
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

The original patch is below:
http://marc.info/?l=linux-kernel&m=126021713809450&w=2

[ [email protected]: And add a fix by Steven Rostedt:
http://marc.info/?l=linux-kernel&m=126150506519173&w=2 ]

Signed-off-by: Neil Horman <[email protected]>
Acked-by: David S. Miller <[email protected]>
Acked-by: Neil Horman <[email protected]>
Cc: Mathieu Desnoyers <[email protected]>
Cc: Kaneshige Kenji <[email protected]>
Cc: Izumo Taku <[email protected]>
Cc: Kosaki Motohiro <[email protected]>
Cc: Lai Jiangshan <[email protected]>
Cc: Scott Mcmillan <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Eric Dumazet <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Koki Sanagi <[email protected]>
Signed-off-by: Frederic Weisbecker <[email protected]>
  • Loading branch information
nhorman authored and fweisbec committed Sep 7, 2010
1 parent 2bf2160 commit 3e4b10d
Showing 1 changed file with 23 additions and 2 deletions.
25 changes: 23 additions & 2 deletions include/trace/events/napi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */

Expand Down

0 comments on commit 3e4b10d

Please sign in to comment.