[PATCH] Added in Q2C and D2C latency output option.

[blktrace.git] / blktrace_api.h

diff --git a/blktrace_api.h b/blktrace_api.h
index 66cf35d37d9df1cb5885f072c81c27359d325257..7585eacef26cbb2e742e8a6600b32b1c862856df 100644 (file)
--- a/blktrace_api.h
+++ b/blktrace_api.h
@@ -10,13 +10,16 @@ enum {
        BLK_TC_READ     = 1 << 0,       /* reads */
        BLK_TC_WRITE    = 1 << 1,       /* writes */
        BLK_TC_BARRIER  = 1 << 2,       /* barrier */
-       BLK_TC_SYNC     = 1 << 3,       /* barrier */
+       BLK_TC_SYNC     = 1 << 3,       /* sync */
        BLK_TC_QUEUE    = 1 << 4,       /* queueing/merging */
        BLK_TC_REQUEUE  = 1 << 5,       /* requeueing */
        BLK_TC_ISSUE    = 1 << 6,       /* issue */
        BLK_TC_COMPLETE = 1 << 7,       /* completions */
        BLK_TC_FS       = 1 << 8,       /* fs requests */
        BLK_TC_PC       = 1 << 9,       /* pc requests */
+       BLK_TC_NOTIFY   = 1 << 10,      /* special message */
+       BLK_TC_AHEAD    = 1 << 11,      /* readahead */
+       BLK_TC_META     = 1 << 12,      /* metadata */
 
        BLK_TC_END      = 1 << 15,      /* only 16-bits, reminder */
 };
@@ -65,7 +68,7 @@ enum {
 #define BLK_TA_REMAP           (__BLK_TA_REMAP | BLK_TC_ACT(BLK_TC_QUEUE))
 
 #define BLK_IO_TRACE_MAGIC     0x65617400
-#define BLK_IO_TRACE_VERSION   0x05
+#define BLK_IO_TRACE_VERSION   0x07
 
 /*
  * The trace itself
@@ -78,11 +81,10 @@ struct blk_io_trace {
        __u32 bytes;            /* transfer length */
        __u32 action;           /* what happened */
        __u32 pid;              /* who did it */
+       __u32 device;           /* device identifier (dev_t) */
        __u32 cpu;              /* on what cpu did it happen */
        __u16 error;            /* completion error */
        __u16 pdu_len;          /* length of data after this trace */
-       __u32 device;           /* device identifier (dev_t) */
-       char  comm[16];         /* task command name (TASK_COMM_LEN) */
 };
 
 /*
@@ -90,6 +92,7 @@ struct blk_io_trace {
  */
 struct blk_io_trace_remap {
        __u32 device;
+       __u32 device_from;
        __u64 sector;
 };
 
@@ -106,7 +109,9 @@ struct blk_user_trace_setup {
        __u32 pid;
 };
 
-#define BLKSTARTTRACE _IOWR(0x12,115,struct blk_user_trace_setup)
-#define BLKSTOPTRACE _IO(0x12,116)
+#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
+#define BLKTRACESTART _IO(0x12,116)
+#define BLKTRACESTOP _IO(0x12,117)
+#define BLKTRACETEARDOWN _IO(0x12,118)
 
 #endif