X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=blktrace.h;h=944fc084cc090d5736911a8ca304bc8a2e9eacf6;hb=a61c06774d03fb768fa9fb021e94599822848c8a;hp=9855101b5f784d8f017af08b3c4670632dc0498d;hpb=e7c9f3ffe9833eae21b2601d1cecb2e5d5c7f35f;p=blktrace.git

diff --git a/blktrace.h b/blktrace.h
index 9855101..944fc08 100644
--- a/blktrace.h
+++ b/blktrace.h
@@ -1,22 +1,83 @@
 #ifndef BLKTRACE_H
 #define BLKTRACE_H
 
+#include <stdio.h>
+#include <limits.h>
 #include <byteswap.h>
-#include <asm/types.h>
-#include <asm/byteorder.h>
+#include <endian.h>
+#include <sys/types.h>
+
 #include "blktrace_api.h"
+#include "rbtree.h"
+
+#define MINORBITS	20
+#define MINORMASK	((1U << MINORBITS) - 1)
+#define MAJOR(dev)	((unsigned int) ((dev) >> MINORBITS))
+#define MINOR(dev)	((unsigned int) ((dev) & MINORMASK))
+
+#define SECONDS(x) 		((unsigned long long)(x) / 1000000000)
+#define NANO_SECONDS(x)		((unsigned long long)(x) % 1000000000)
+#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;
+
+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;
+};
+
+struct per_cpu_info {
+	unsigned int cpu;
+	unsigned int nelems;
+
+	int fd;
+	int fdblock;
+	char fname[PATH_MAX];
+
+	struct io_stats io_stats;
+
+	struct rb_root rb_last;
+	unsigned long rb_last_entries;
+	unsigned long last_sequence;
+	unsigned long smallest_seq_read;
+
+	struct skip_info *skips_head;
+	struct skip_info *skips_tail;
+};
+
+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	(0x05)
+#define SUPPORTED_VERSION	(0x07)
 
-#if defined(__LITTLE_ENDIAN_BITFIELD)
+#if __BYTE_ORDER == __LITTLE_ENDIAN
 #define be16_to_cpu(x)		__bswap_16(x)
 #define be32_to_cpu(x)		__bswap_32(x)
 #define be64_to_cpu(x)		__bswap_64(x)
 #define cpu_to_be16(x)		__bswap_16(x)
 #define cpu_to_be32(x)		__bswap_32(x)
 #define cpu_to_be64(x)		__bswap_64(x)
-#elif defined(__BIG_ENDIAN_BITFIELD)
+#elif __BYTE_ORDER == __BIG_ENDIAN
 #define be16_to_cpu(x)		(x)
 #define be32_to_cpu(x)		(x)
 #define be64_to_cpu(x)		(x)
@@ -42,24 +103,11 @@ static inline int verify_trace(struct blk_io_trace *t)
 	return 0;
 }
 
-static inline void trace_to_be(struct blk_io_trace *t)
-{
-	t->magic	= cpu_to_be32(t->magic);
-	t->sequence	= cpu_to_be32(t->sequence);
-	t->time		= cpu_to_be64(t->time);
-	t->sector	= cpu_to_be64(t->sector);
-	t->bytes	= cpu_to_be32(t->bytes);
-	t->action	= cpu_to_be32(t->action);
-	t->pid		= cpu_to_be32(t->pid);
-	t->cpu		= cpu_to_be32(t->cpu);
-	t->error	= cpu_to_be16(t->error);
-	t->pdu_len	= cpu_to_be16(t->pdu_len);
-	t->device	= cpu_to_be32(t->device);
-	/* t->comm is a string (endian neutral) */
-}
-
 static inline void trace_to_cpu(struct blk_io_trace *t)
 {
+	if (data_is_native)
+		return;
+
 	t->magic	= be32_to_cpu(t->magic);
 	t->sequence	= be32_to_cpu(t->sequence);
 	t->time		= be64_to_cpu(t->time);
@@ -67,11 +115,37 @@ 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(u32 magic)
+{
+	if ((magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
+		data_is_native = 1;
+		return 0;
+	}
+
+	magic = __bswap_32(magic);
+	if ((magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) {
+		data_is_native = 0;
+		return 0;
+	}
+
+	return 1;
+}
+
+extern void set_all_format_specs(char *);
+extern int add_format_spec(char *);
+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