Skip to contentSkip to conversation

9p: trace: use %*ph to dump buffer

PATCH In review Andy Shevchenko 3 participants 4 messages Apr 22, 2013 – May 28, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 9p: trace: use %*ph to dump buffer

Additionally change cast from long to unsigned long to follow specificator.

---
 include/trace/events/9p.h | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)
include/trace/events/9p.h +3 -25
index beeaed8..a066636 100644
@@ -143,31 +143,9 @@ TRACE_EVENT(9p_protocol_dump,
 		    __entry->tag    =  pdu->tag;
 		    memcpy(__entry->line, pdu->sdata, P9_PROTO_DUMP_SZ);
 		    ),
-	    TP_printk("clnt %lu %s(tag = %d)\n%.3x: "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x\n"
-		      "%.3x: "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x\n",
-		      (long)__entry->clnt, show_9p_op(__entry->type),
-		      __entry->tag, 0,
-		      __entry->line[0],  __entry->line[1],
-		      __entry->line[2],  __entry->line[3],
-		      __entry->line[4],  __entry->line[5],
-		      __entry->line[6],  __entry->line[7],
-		      __entry->line[8],  __entry->line[9],
-		      __entry->line[10], __entry->line[11],
-		      __entry->line[12], __entry->line[13],
-		      __entry->line[14], __entry->line[15],
-		      16,
-		      __entry->line[16], __entry->line[17],
-		      __entry->line[18], __entry->line[19],
-		      __entry->line[20], __entry->line[21],
-		      __entry->line[22], __entry->line[23],
-		      __entry->line[24], __entry->line[25],
-		      __entry->line[26], __entry->line[27],
-		      __entry->line[28], __entry->line[29],
-		      __entry->line[30], __entry->line[31])
+	    TP_printk("clnt %lu %s(tag = %d)\n%.3x: %16ph\n%.3x: %16ph\n",
+		      (unsigned long)__entry->clnt, show_9p_op(__entry->type),
+		      __entry->tag, 0, __entry->line, 16, __entry->line + 16)
  );
 
 #endif /* _TRACE_9P_H */
Signature · 1 line
1.8.2.rc0.22.gb3600c3
#1 lore raw
Quoted 36 lines · Andy Shevchenko

Additionally change cast from long to unsigned long to follow specificator.

---
 include/trace/events/9p.h | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)
include/trace/events/9p.h +0 -21
index beeaed8..a066636 100644
@@ -143,31 +143,9 @@ TRACE_EVENT(9p_protocol_dump,
 		    __entry->tag    =  pdu->tag;
 		    memcpy(__entry->line, pdu->sdata, P9_PROTO_DUMP_SZ);
 		    ),
-	    TP_printk("clnt %lu %s(tag = %d)\n%.3x: "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x\n"
-		      "%.3x: "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x\n",
-		      (long)__entry->clnt, show_9p_op(__entry->type),
-		      __entry->tag, 0,
-		      __entry->line[0],  __entry->line[1],
-		      __entry->line[2],  __entry->line[3],
-		      __entry->line[4],  __entry->line[5],
-		      __entry->line[6],  __entry->line[7],
-		      __entry->line[8],  __entry->line[9],
-		      __entry->line[10], __entry->line[11],
-		      __entry->line[12], __entry->line[13],
-		      __entry->line[14], __entry->line[15],
-		      16,
-		      __entry->line[16], __entry->line[17],
-		      __entry->line[18], __entry->line[19],
-		      __entry->line[20], __entry->line[21],
-		      __entry->line[22], __entry->line[23],

include/trace/events/9p.h TRACE_EVENT(9p_protocol_dump, · line 151

Quoted 10 lines
include/trace/events/9p.h +3 -4
-		      __entry->line[24], __entry->line[25],
-		      __entry->line[26], __entry->line[27],
-		      __entry->line[28], __entry->line[29],
-		      __entry->line[30], __entry->line[31])
+	    TP_printk("clnt %lu %s(tag = %d)\n%.3x: %16ph\n%.3x: %16ph\n",
+		      (unsigned long)__entry->clnt, show_9p_op(__entry->type),
+		      __entry->tag, 0, __entry->line, 16, __entry->line + 16)
  );
 
 #endif /* _TRACE_9P_H */

Any comment on this one, anyone?

Signature · 2 lines
Andy Shevchenko <[email protected]>
Intel Finland Oy
#2 lore raw
Quoted 46 lines · Andy Shevchenko
Quoted 1 line · Andy Shevchenko

Additionally change cast from long to unsigned long to follow

specificator.

Quoted 30 lines
---
 include/trace/events/9p.h | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)
include/trace/events/9p.h +0 -16
index beeaed8..a066636 100644
@@ -143,31 +143,9 @@ TRACE_EVENT(9p_protocol_dump,
 		    __entry->tag    =  pdu->tag;
 		    memcpy(__entry->line, pdu->sdata, P9_PROTO_DUMP_SZ);
 		    ),
-	    TP_printk("clnt %lu %s(tag = %d)\n%.3x: "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x\n"
-		      "%.3x: "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x "
-		      "%02x %02x %02x %02x %02x %02x %02x %02x\n",
-		      (long)__entry->clnt, show_9p_op(__entry->type),
-		      __entry->tag, 0,
-		      __entry->line[0],  __entry->line[1],
-		      __entry->line[2],  __entry->line[3],
-		      __entry->line[4],  __entry->line[5],
-		      __entry->line[6],  __entry->line[7],
-		      __entry->line[8],  __entry->line[9],
-		      __entry->line[10], __entry->line[11],
-		      __entry->line[12], __entry->line[13],
-		      __entry->line[14], __entry->line[15],

include/trace/events/9p.h TRACE_EVENT(9p_protocol_dump, · line 146

Quoted 10 lines
include/trace/events/9p.h +1 -9
-		      16,
-		      __entry->line[16], __entry->line[17],
-		      __entry->line[18], __entry->line[19],
-		      __entry->line[20], __entry->line[21],
-		      __entry->line[22], __entry->line[23],
-		      __entry->line[24], __entry->line[25],
-		      __entry->line[26], __entry->line[27],
-		      __entry->line[28], __entry->line[29],
-		      __entry->line[30], __entry->line[31])
+	    TP_printk("clnt %lu %s(tag = %d)\n%.3x: %16ph\n%.3x:  

%16ph\n",

include/trace/events/9p.h TRACE_EVENT(9p_protocol_dump, · line 147

Quoted 1 line
include/trace/events/9p.h +1 -0
+		      (unsigned long)__entry->clnt,  

show_9p_op(__entry->type),

Quoted 7 lines

include/trace/events/9p.h TRACE_EVENT(9p_protocol_dump, · line 148

Quoted 1 line
include/trace/events/9p.h +1 -0
+		      __entry->tag, 0, __entry->line, 16, __entry->line  

+ 16)

include/trace/events/9p.h TRACE_EVENT(9p_protocol_dump, · line 151

Quoted 3 lines
include/trace/events/9p.h +0 -0
  );
 
 #endif /* _TRACE_9P_H */

Any comment on this one, anyone?

While we're at it, here's a patch adding the rest of the 9p files to the maintainers entry, in hopes that Erich and the list get pinged on this stuff in future.

Rob

Add rest of the 9p files to the maintainers entry.

 MAINTAINERS |    5 +++++
 1 file changed, 5 insertions(+)
MAINTAINERS +5 -0
index fd3a495..386fafa 100644
@@ -180,6 +180,11 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
 S:	Maintained
 F:	Documentation/filesystems/9p.txt
 F:	fs/9p/
+F:	net/9p/
+F:	include/net/9p/
+F:	include/uapi/linux/virtio_9p.h
+F:	include/trace/events/9p.h
+
 
 A8293 MEDIA DRIVER
 M:	Antti Palosaari <[email protected]>
maintainer
#3 lore raw
In reply to Andy Shevchenko
Quoted 2 lines · Andy Shevchenko

Any comment on this one, anyone?

Tracepoints are the responsibility of the maintainers that the code they reside in. But I like to be Cc'd just to make sure things are not done incorrectly.

This change looks fine to me, but thanks for Cc'ing me, as the libtraceevent needs to be updated to handle this change, such that perf can parse it too.

-- Steve