Skip to contentSkip to conversation

tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN

PATCH In review Xiao Guangrong 2 participants 3 messages Aug 27, 2009

Subsystems (3)
Networking Network drivers Tracing
lore
Share & tools
lore

Xiao Guangrong

author
#0 lore raw

PATCH 3/3 tracing/events: convert NAPI's tracepoint and fix DEFINE_TRACE_FN

References: <[email protected]>
In-Reply-To: <[email protected]>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

- Convert NAPI's tracepoint via TRACE_EVENT macro, the output information like below:

   sshd-2503  [000]    71.920846: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
   sshd-2503  [000]    72.020291: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
   sshd-2503  [000]    72.020418: napi_poll: ifname=eth0 state=NAPI_STATE_SCHED weigth=16 poll=pcnet32_poll

- Remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h, because TRACE_EVENT not use it

- Undef DEFINE_TRACE_FN after TRACE_EVENT/TRACE_EVENT_FN expanded, then we can include more TRACE_EVENT .h file in one .c file (the .c file has defined CREATE_TRACE_POINTS)

Signed-off-by Xiao Guangrong <[email protected]>
---
 include/trace/define_trace.h |    5 +---
 include/trace/events/napi.h  |   43 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 39 insertions(+), 9 deletions(-)
include/trace/define_trace.h +1 -4
index a89ed59..6158741 100644
@@ -31,10 +31,6 @@
 		assign, print, reg, unreg)			\
 	DEFINE_TRACE_FN(name, reg, unreg)
 
-#undef DECLARE_TRACE
-#define DECLARE_TRACE(name, proto, args)	\
-	DEFINE_TRACE(name)
-
 #undef TRACE_INCLUDE
 #undef __TRACE_INCLUDE
 

@@ -62,6 +58,7 @@
 #endif
 
 #undef TRACE_EVENT
+#undef TRACE_EVENT_FN
 #undef TRACE_HEADER_MULTI_READ
 
 /* Only undef what we defined in this file */
include/trace/events/napi.h +38 -5

49 lines not on this page · raw message

Signature · 1 line
1.6.1.2
author
#1 lore raw
Quoted 5 lines · Xiao Guangrong

References: <[email protected]>
In-Reply-To: <[email protected]>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

It's look like my mail client has some problems, I'll check it and resend this mail. Sorry!

Thanks,
Xiao

Quoted 15 lines

- Convert NAPI's tracepoint via TRACE_EVENT macro, the output information like below:

   sshd-2503  [000]    71.920846: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
   sshd-2503  [000]    72.020291: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
   sshd-2503  [000]    72.020418: napi_poll: ifname=eth0 state=NAPI_STATE_SCHED weigth=16 poll=pcnet32_poll

- Remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h, because TRACE_EVENT not use it

- Undef DEFINE_TRACE_FN after TRACE_EVENT/TRACE_EVENT_FN expanded, then we can include more TRACE_EVENT .h file in one .c file (the .c file has defined CREATE_TRACE_POINTS)

Signed-off-by Xiao Guangrong <[email protected]>
#2 lore raw
Quoted 9 lines · Xiao Guangrong
Quoted 5 lines · Xiao Guangrong

References: <[email protected]>
In-Reply-To: <[email protected]>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Quoted 6 lines

It's look like my mail client has some problems, I'll check it and resend this mail. Sorry!

Thanks,
Xiao

Please do, thank you!
Neil

Quoted 17 lines
Quoted 15 lines

- Convert NAPI's tracepoint via TRACE_EVENT macro, the output information like below:

   sshd-2503  [000]    71.920846: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
   sshd-2503  [000]    72.020291: napi_poll: ifname=eth0 state=0 weigth=16 poll=pcnet32_poll
   sshd-2503  [000]    72.020418: napi_poll: ifname=eth0 state=NAPI_STATE_SCHED weigth=16 poll=pcnet32_poll

- Remove the "DECLARE_TRACE" definiens in include/trace/define_trace.h, because TRACE_EVENT not use it

- Undef DEFINE_TRACE_FN after TRACE_EVENT/TRACE_EVENT_FN expanded, then we can include more TRACE_EVENT .h file in one .c file (the .c file has defined CREATE_TRACE_POINTS)

Signed-off-by Xiao Guangrong <[email protected]>