static int per_process_stats;
static int track_ios;
-#define RB_BATCH_DEFAULT (1024)
+#define RB_BATCH_DEFAULT (512)
static int rb_batch = RB_BATCH_DEFAULT;
static int pipeline;
struct per_dev_info *pdi;
int i;
- for (i = 0; i < ndevices; i++)
+ for (i = 0; i < ndevices; i++) {
+ if (!devices[i].id)
+ devices[i].id = id;
if (devices[i].id == id)
return &devices[i];
+ }
if (resize_devices(NULL) != 0)
return NULL;
}
}
-static struct blk_io_trace *find_trace(void *p, unsigned long offset)
-{
- unsigned long max_offset = offset;
- unsigned long off;
- struct blk_io_trace *bit;
- __u32 magic;
-
- for (off = 0; off < max_offset; off++) {
- bit = p + off;
-
- magic = be32_to_cpu(bit->magic);
- if ((magic & 0xffffff00) == BLK_IO_TRACE_MAGIC)
- return bit;
- }
-
- return NULL;
-}
-
static inline int verify_and_add_trace(struct trace *t)
{
if (verify_trace(t->bit))
while ((t = trace_list) != NULL) {
trace_list = t->next;
- verify_and_add_trace(t);
+ if (verify_and_add_trace(t))
+ printf("oops\n");
nr++;
}
return nr;
}
-static void show_entries_rb(int piped)
+static void show_entries_rb(void)
{
struct per_dev_info *pdi = NULL;
struct per_cpu_info *pci = NULL;
__u32 device = 0;
int cpu = 0;
- n = rb_first(&rb_sort_root);
- while (n != NULL) {
+ while ((n = rb_first(&rb_sort_root)) != NULL) {
if (done)
break;
if (bit->cpu > pdi->ncpus) {
fprintf(stderr, "Unknown CPU ID? (%d, device %d,%d)\n",
- cpu, MAJOR(bit->device), MINOR(bit->device));
+ bit->cpu, MAJOR(bit->device),
+ MINOR(bit->device));
break;
}
*/
if (bit->sequence != (pdi->last_sequence + 1)
&& pdi->last_sequence != -1) {
- if (piped && t->skipped < 5) {
+ if (t->skipped < 5) {
t->skipped++;
break;
} else {
dump_trace(bit, pci, pdi);
}
- if (piped) {
- rb_erase(&t->rb_node, &rb_sort_root);
- free(bit);
- free(t);
- n = rb_first(&rb_sort_root);
- } else
- n = rb_next(n);
+ rb_erase(&t->rb_node, &rb_sort_root);
+ free(bit);
+ free(t);
}
}
return 0;
}
-/*
- * Find the traces in 'tb' and add them to the list for sorting and
- * displaying
- */
-static int find_sort_entries(void *tb, unsigned long size)
+static int read_sort_events(int fd)
{
- struct blk_io_trace *bit;
- struct trace *t;
- void *start = tb;
- int nr = 0;
+ int events = 0;
+
+ while (!is_done() && events < rb_batch) {
+ struct blk_io_trace *bit;
+ struct trace *t;
+ int pdu_len;
+ __u32 magic;
+
+ bit = malloc(sizeof(*bit));
- while (tb - start <= size - sizeof(*bit)) {
- bit = find_trace(tb, size - (tb - start));
- if (!bit)
+ if (read_data(fd, bit, sizeof(*bit), !events))
break;
+ magic = be32_to_cpu(bit->magic);
+ if ((magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) {
+ fprintf(stderr, "Bad magic %x\n", magic);
+ break;
+ }
+
+ pdu_len = be16_to_cpu(bit->pdu_len);
+ if (pdu_len) {
+ void *ptr = realloc(bit, sizeof(*bit) + pdu_len);
+
+ if (read_data(fd, ptr + sizeof(*bit), pdu_len, 1))
+ break;
+
+ bit = ptr;
+ }
+
t = malloc(sizeof(*t));
memset(t, 0, sizeof(*t));
t->bit = bit;
trace_to_cpu(bit);
+ t->next = trace_list;
+ trace_list = t;
- verify_and_add_trace(t);
-
- tb += sizeof(*bit) + bit->pdu_len;
- nr++;
+ events++;
}
- return nr;
+ return events;
}
static int do_file(void)
{
- int i, j, nfiles = 0;
+ struct per_cpu_info *pci;
+ int i, j, nfiles = 0, events, events_added;
+ /*
+ * first prepare all files for reading
+ */
for (i = 0; i < ndevices; i++) {
for (j = 0;; j++, nfiles++) {
struct per_dev_info *pdi;
- struct per_cpu_info *pci;
struct stat st;
- void *tb;
pdi = &devices[i];
pdi->last_sequence = -1;
pci = get_cpu_info(pdi, j);
pci->cpu = j;
+ pci->fd = -1;
snprintf(pci->fname, sizeof(pci->fname)-1,
- "%s.blktrace.%d", pdi->name, j);
+ "%s.blktrace.%d", pdi->name, pci->cpu);
if (stat(pci->fname, &st) < 0)
break;
if (!st.st_size)
continue;
- printf("Processing %s\n", pci->fname);
-
- tb = malloc(st.st_size);
- if (!tb) {
- fprintf(stderr, "Out of memory, skip file %s\n",
- pci->fname);
- continue;
- }
-
pci->fd = open(pci->fname, O_RDONLY);
if (pci->fd < 0) {
perror(pci->fname);
- free(tb);
continue;
}
- if (read_data(pci->fd, tb, st.st_size, 1)) {
- close(pci->fd);
- free(tb);
- continue;
- }
-
- pci->nelems = find_sort_entries(tb, st.st_size);
-
- printf("Completed %s (CPU%d %d, entries)\n",
- pci->fname, j, pci->nelems);
- close(pci->fd);
+ printf("Input file %s added\n", pci->fname);
}
}
- if (!nfiles) {
- fprintf(stderr, "No files found\n");
- return 1;
- }
-
- show_entries_rb(0);
- return 0;
-}
-
-static int read_sort_events(int fd)
-{
- int events = 0;
-
+ /*
+ * now loop over the files reading in the data
+ */
do {
- struct blk_io_trace *bit;
- struct trace *t;
- int pdu_len;
- __u32 magic;
+ events_added = 0;
- bit = malloc(sizeof(*bit));
+ for (i = 0; i < ndevices; i++) {
+ for (j = 0; j < nfiles; j++) {
- if (read_data(fd, bit, sizeof(*bit), !events))
- break;
+ pci = get_cpu_info(&devices[i], j);
- magic = be32_to_cpu(bit->magic);
- if ((magic & 0xffffff00) != BLK_IO_TRACE_MAGIC) {
- fprintf(stderr, "Bad magic %x\n", magic);
- break;
- }
+ if (pci->fd == -1)
+ continue;
- pdu_len = be16_to_cpu(bit->pdu_len);
- if (pdu_len) {
- void *ptr = realloc(bit, sizeof(*bit) + pdu_len);
+ events = read_sort_events(pci->fd);
+ if (!events) {
+ close(pci->fd);
+ pci->fd = -1;
+ continue;
+ }
- if (read_data(fd, ptr + sizeof(*bit), pdu_len, 1))
- break;
+ if (sort_entries() == -1)
+ continue;
- bit = ptr;
+ events_added += events;
+ }
}
- t = malloc(sizeof(*t));
- memset(t, 0, sizeof(*t));
- t->bit = bit;
-
- trace_to_cpu(bit);
- t->next = trace_list;
- trace_list = t;
+ show_entries_rb();
- events++;
- } while (!is_done() && events < rb_batch);
+ } while (events_added);
- return events;
+ return 0;
}
static int do_stdin(void)
if (sort_entries() == -1)
break;
- show_entries_rb(1);
+ show_entries_rb();
} while (1);
close(fd);
projects / blktrace.git / commitdiff