projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ifdefs to net probe to support Linux 2.6.39
[lttng-modules.git]
/
instrumentation
/
events
/
lttng-module
/
block.h
diff --git
a/instrumentation/events/lttng-module/block.h
b/instrumentation/events/lttng-module/block.h
index 3c75e4f49863b8fb106ea91c32f1711dc67fcdde..42184f3d1e715555aa4eed32c30b27359949372c 100644
(file)
--- a/
instrumentation/events/lttng-module/block.h
+++ b/
instrumentation/events/lttng-module/block.h
@@
-58,7
+58,9
@@
DECLARE_EVENT_CLASS(block_rq_with_error,
__field( unsigned int, nr_sector )
__field( int, errors )
__field( unsigned int, rwbs )
__field( unsigned int, nr_sector )
__field( int, errors )
__field( unsigned int, rwbs )
- __dynamic_array( char, cmd, blk_cmd_buf_len(rq) )
+ __dynamic_array_hex( unsigned char, cmd,
+ (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
+ rq->cmd_len : 0)
),
TP_fast_assign(
),
TP_fast_assign(
@@
-69,7
+71,8
@@
DECLARE_EVENT_CLASS(block_rq_with_error,
0 : blk_rq_sectors(rq))
tp_assign(errors, rq->errors)
blk_fill_rwbs(rwbs, rq->cmd_flags, blk_rq_bytes(rq))
0 : blk_rq_sectors(rq))
tp_assign(errors, rq->errors)
blk_fill_rwbs(rwbs, rq->cmd_flags, blk_rq_bytes(rq))
- tp_memcpy_dyn(cmd, rq->cmd, blk_cmd_buf_len(rq))
+ tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
+ rq->cmd : NULL);
),
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
),
TP_printk("%d,%d %s (%s) %llu + %u [%d]",
@@
-144,8
+147,10
@@
DECLARE_EVENT_CLASS(block_rq,
__field( unsigned int, nr_sector )
__field( unsigned int, bytes )
__field( unsigned int, rwbs )
__field( unsigned int, nr_sector )
__field( unsigned int, bytes )
__field( unsigned int, rwbs )
- __array( char, comm, TASK_COMM_LEN )
- __dynamic_array( char, cmd, blk_cmd_buf_len(rq) )
+ __array_text( char, comm, TASK_COMM_LEN )
+ __dynamic_array_hex( unsigned char, cmd,
+ (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
+ rq->cmd_len : 0)
),
TP_fast_assign(
),
TP_fast_assign(
@@
-157,7
+162,8
@@
DECLARE_EVENT_CLASS(block_rq,
tp_assign(bytes, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
blk_rq_bytes(rq) : 0)
blk_fill_rwbs(rwbs, rq->cmd_flags, blk_rq_bytes(rq))
tp_assign(bytes, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
blk_rq_bytes(rq) : 0)
blk_fill_rwbs(rwbs, rq->cmd_flags, blk_rq_bytes(rq))
- tp_memcpy_dyn(cmd, rq->cmd, blk_cmd_buf_len(rq))
+ tp_memcpy_dyn(cmd, (rq->cmd_type == REQ_TYPE_BLOCK_PC) ?
+ rq->cmd : NULL);
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
),
tp_memcpy(comm, current->comm, TASK_COMM_LEN)
),
@@
-225,7
+231,7
@@
TRACE_EVENT(block_bio_bounce,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
- __array
( char,
comm, TASK_COMM_LEN )
+ __array
_text( char,
comm, TASK_COMM_LEN )
),
TP_fast_assign(
),
TP_fast_assign(
@@
-293,7
+299,7
@@
DECLARE_EVENT_CLASS(block_bio,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
- __array
( char,
comm, TASK_COMM_LEN )
+ __array
_text( char,
comm, TASK_COMM_LEN )
),
TP_fast_assign(
),
TP_fast_assign(
@@
-366,7
+372,7
@@
DECLARE_EVENT_CLASS(block_get_rq,
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( unsigned int, nr_sector )
__field( unsigned int, rwbs )
- __array
( char,
comm, TASK_COMM_LEN )
+ __array
_text( char,
comm, TASK_COMM_LEN )
),
TP_fast_assign(
),
TP_fast_assign(
@@
-434,7
+440,7
@@
TRACE_EVENT(block_plug,
TP_ARGS(q),
TP_STRUCT__entry(
TP_ARGS(q),
TP_STRUCT__entry(
- __array
( char,
comm, TASK_COMM_LEN )
+ __array
_text( char,
comm, TASK_COMM_LEN )
),
TP_fast_assign(
),
TP_fast_assign(
@@
-452,7
+458,7
@@
DECLARE_EVENT_CLASS(block_unplug,
TP_STRUCT__entry(
__field( int, nr_rq )
TP_STRUCT__entry(
__field( int, nr_rq )
- __array
( char,
comm, TASK_COMM_LEN )
+ __array
_text( char,
comm, TASK_COMM_LEN )
),
TP_fast_assign(
),
TP_fast_assign(
@@
-502,7
+508,7
@@
TRACE_EVENT(block_split,
__field( sector_t, sector )
__field( sector_t, new_sector )
__field( unsigned int, rwbs )
__field( sector_t, sector )
__field( sector_t, new_sector )
__field( unsigned int, rwbs )
- __array
( char,
comm, TASK_COMM_LEN )
+ __array
_text( char,
comm, TASK_COMM_LEN )
),
TP_fast_assign(
),
TP_fast_assign(
@@
-616,5
+622,5
@@
TRACE_EVENT(block_rq_remap,
#endif /* _TRACE_BLOCK_H */
/* This part must be outside protection */
#endif /* _TRACE_BLOCK_H */
/* This part must be outside protection */
-#include "define_trace.h"
+#include "
../../../probes/
define_trace.h"
This page took
0.037369 seconds
and
4
git commands to generate.