Merge branch 'add-P'

[blktrace.git] / blkparse.c

diff --git a/blkparse.c b/blkparse.c
index 3c31db63508224c12fe0112cf0e7f962afdec335..d869da619771f6b5d725963d81fe2a918786374c 100644 (file)
--- a/blkparse.c
+++ b/blkparse.c
@@ -36,7 +36,7 @@
 #include "rbtree.h"
 #include "jhash.h"
 
-static char blkparse_version[] = "0.99.3";
+static char blkparse_version[] = "1.0.0";
 
 struct skip_info {
        unsigned long start, end;
@@ -292,6 +292,8 @@ static volatile int done;
 struct timespec                abs_start_time;
 static unsigned long long start_timestamp;
 
+static int have_drv_data = 0;
+
 #define JHASH_RANDOM   (0x3af5f2ee)
 
 #define CPUS_PER_LONG  (8 * sizeof(unsigned long))
@@ -1583,6 +1585,10 @@ static void dump_trace_fs(struct blk_io_trace *t, struct per_dev_info *pdi,
                case __BLK_TA_REMAP:
                        log_generic(pci, t, "A");
                        break;
+               case __BLK_TA_DRV_DATA:
+                       have_drv_data = 1;
+                       /* dump to binary file only */
+                       break;
                default:
                        fprintf(stderr, "Bad fs action %x\n", t->action);
                        break;
@@ -2841,6 +2847,10 @@ int main(int argc, char *argv[])
        if (!ret)
                show_stats();
 
+       if (have_drv_data && !dump_binary)
+               printf("\ndiscarded traces containing low-level device driver "
+                      "specific data (only available in binary output)\n");
+
        if (ofp_buffer) {
                fflush(ofp);
                free(ofp_buffer);