X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=blktrace.h;h=944fc084cc090d5736911a8ca304bc8a2e9eacf6;hb=a61c06774d03fb768fa9fb021e94599822848c8a;hp=13d6e03ac8b7fc93105c424d3a369fa47911817b;hpb=017d166066b6c8afe22b75f6dc5e91bfa8f9c67a;p=blktrace.git

diff --git a/blktrace.h b/blktrace.h
index 13d6e03..944fc08 100644
--- a/blktrace.h
+++ b/blktrace.h
@@ -2,8 +2,10 @@
 #define BLKTRACE_H
 
 #include <stdio.h>
+#include <limits.h>
 #include <byteswap.h>
 #include <endian.h>
+#include <sys/types.h>
 
 #include "blktrace_api.h"
 #include "rbtree.h"
@@ -18,9 +20,11 @@
 #define DOUBLE_TO_NANO_ULL(d)	((unsigned long long)((d) * 1000000000))
 
 #define min(a, b)	((a) < (b) ? (a) : (b))
+#define max(a, b)	((a) > (b) ? (a) : (b))
 
 #define t_sec(t)	((t)->bytes >> 9)
 #define t_kb(t)		((t)->bytes >> 10)
+#define t_b(t)		((t)->bytes & 1023)
 
 typedef __u32 u32;
 typedef __u8 u8;
@@ -29,7 +33,14 @@ struct io_stats {
 	unsigned long qreads, qwrites, creads, cwrites, mreads, mwrites;
 	unsigned long ireads, iwrites, rrqueue, wrqueue;
 	unsigned long long qread_kb, qwrite_kb, cread_kb, cwrite_kb;
+	unsigned long long qread_b, qwrite_b, cread_b, cwrite_b;
 	unsigned long long iread_kb, iwrite_kb;
+	unsigned long long mread_kb, mwrite_kb;
+	unsigned long long mread_b, mwrite_b, iread_b, iwrite_b;
+	unsigned long qreads_pc, qwrites_pc, ireads_pc, iwrites_pc;
+	unsigned long rrqueue_pc, wrqueue_pc, creads_pc, cwrites_pc;
+	unsigned long long qread_kb_pc, qwrite_kb_pc, iread_kb_pc, iwrite_kb_pc;
+	unsigned long long qread_b_pc, qwrite_b_pc, iread_b_pc, iwrite_b_pc;
 	unsigned long io_unplugs, timer_unplugs;
 };
 
@@ -39,7 +50,7 @@ struct per_cpu_info {
 
 	int fd;
 	int fdblock;
-	char fname[128];
+	char fname[PATH_MAX];
 
 	struct io_stats io_stats;
 
@@ -54,9 +65,10 @@ struct per_cpu_info {
 
 extern FILE *ofp;
 extern int data_is_native;
+extern struct timespec abs_start_time;
 
 #define CHECK_MAGIC(t)		(((t)->magic & 0xffffff00) == BLK_IO_TRACE_MAGIC)
-#define SUPPORTED_VERSION	(0x06)
+#define SUPPORTED_VERSION	(0x07)
 
 #if __BYTE_ORDER == __LITTLE_ENDIAN
 #define be16_to_cpu(x)		__bswap_16(x)
@@ -103,29 +115,24 @@ static inline void trace_to_cpu(struct blk_io_trace *t)
 	t->bytes	= be32_to_cpu(t->bytes);
 	t->action	= be32_to_cpu(t->action);
 	t->pid		= be32_to_cpu(t->pid);
+	t->device	= be32_to_cpu(t->device);
 	t->cpu		= be32_to_cpu(t->cpu);
 	t->error	= be16_to_cpu(t->error);
 	t->pdu_len	= be16_to_cpu(t->pdu_len);
-	t->device	= be32_to_cpu(t->device);
-	/* t->comm is a string (endian neutral) */
 }
 
 /*
  * check whether data is native or not
  */
-static inline int check_data_endianness(struct blk_io_trace *bit)
+static inline int check_data_endianness(u32 magic)
 {
-	u32 magic;
-
-	if ((bit->magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
-		fprintf(stderr, "data is native\n");
+	if ((magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
 		data_is_native = 1;
 		return 0;
 	}
 
-	magic = __bswap_32(bit->magic);
+	magic = __bswap_32(magic);
 	if ((magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
-		fprintf(stderr, "data is not native\n");
 		data_is_native = 0;
 		return 0;
 	}
@@ -139,5 +146,6 @@ extern void process_fmt(char *, struct per_cpu_info *, struct blk_io_trace *,
 			unsigned long long, int, unsigned char *);
 extern int valid_act_opt(int);
 extern int find_mask_map(char *);
+extern char *find_process_name(pid_t);
 
 #endif