#include <stdlib.h>
#include <unistd.h>
#include <ctype.h>
+#include <time.h>
#include "blktrace.h"
-#define VALID_SPECS "ABCDFGMPQRSTUWX"
+#define VALID_SPECS "ABCDFGIMPQRSTUWX"
#define HEADER "%D %2c %8s %5T.%9t %5p %2a %3d "
return 1;
}
option += 2;
- if (*option == '\0') {
- fprintf(stderr,"Bad format specifier - need fmt %s\n", option);
- return 1;
- }
- /*
- * Set both merges (front and back)
- */
- if (spec == 'M') {
- override_format['B'] = strdup(option);
- override_format['M'] = strdup(option);
- } else
- override_format[spec] = strdup(option);
+ override_format[spec] = strdup(option);
return 0;
}
static inline void fill_rwbs(char *rwbs, struct blk_io_trace *t)
{
int w = t->action & BLK_TC_ACT(BLK_TC_WRITE);
+ int a = t->action & BLK_TC_ACT(BLK_TC_AHEAD);
int b = t->action & BLK_TC_ACT(BLK_TC_BARRIER);
int s = t->action & BLK_TC_ACT(BLK_TC_SYNC);
+ int m = t->action & BLK_TC_ACT(BLK_TC_META);
+ int d = t->action & BLK_TC_ACT(BLK_TC_DISCARD);
int i = 0;
- if (w)
+ if (d)
+ rwbs[i++] = 'D';
+ else if (w)
rwbs[i++] = 'W';
- else
+ else if (t->bytes)
rwbs[i++] = 'R';
+ else
+ rwbs[i++] = 'N';
+ if (a)
+ rwbs[i++] = 'A';
if (b)
rwbs[i++] = 'B';
if (s)
rwbs[i++] = 'S';
+ if (m)
+ rwbs[i++] = 'M';
rwbs[i] = '\0';
}
+static const char *
+print_time(unsigned long long timestamp)
+{
+ static char timebuf[128];
+ struct tm *tm;
+ time_t sec;
+ unsigned long nsec;
+
+ sec = abs_start_time.tv_sec + SECONDS(timestamp);
+ nsec = abs_start_time.tv_nsec + NANO_SECONDS(timestamp);
+ if (nsec >= 1000000000) {
+ nsec -= 1000000000;
+ sec += 1;
+ }
+
+ tm = localtime(&sec);
+ snprintf(timebuf, sizeof(timebuf),
+ "%02u:%02u:%02u.%06lu",
+ tm->tm_hour,
+ tm->tm_min,
+ tm->tm_sec,
+ nsec / 1000);
+ return timebuf;
+}
+
static inline int pdu_rest_is_zero(unsigned char *pdu, int len)
{
static char zero[4096];
__u64 sector = __r->sector;
r->device = be32_to_cpu(__r->device);
+ r->device_from = be32_to_cpu(__r->device_from);
r->sector = be64_to_cpu(sector);
}
break;
}
case 'd': {
- char rwbs[4];
+ char rwbs[6];
fill_rwbs(rwbs, t);
fprintf(ofp, strcat(format, "s"), rwbs);
}
fprintf(ofp, strcat(format, "llu"), elapsed / 1000);
break;
- case 'U': {
+ case 'U':
fprintf(ofp, strcat(format, "u"), get_pdu_int(t));
break;
- }
+ case 'z':
+ fprintf(ofp, strcat(format, "s"), print_time(t->time));
+ break;
default:
fprintf(ofp,strcat(format, "c"), field);
break;
struct blk_io_trace *t, unsigned long long elapsed,
int pdu_len, unsigned char *pdu_buf)
{
- char rwbs[4];
+ struct blk_io_trace_remap r = { .device = 0, };
+ char rwbs[6];
char *name;
fill_rwbs(rwbs, t);
/*
* The header is always the same
*/
+ if (act[0] == 'A') { /* Remap */
+ get_pdu_remap(t, &r);
+ t->device = r.device_from;
+ }
+
fprintf(ofp, "%3d,%-3d %2d %8d %5d.%09lu %5u %2s %3s ",
MAJOR(t->device), MINOR(t->device), pci->cpu, t->sequence,
(int) SECONDS(t->time), (unsigned long) NANO_SECONDS(t->time),
fprintf(ofp, "[%d]\n", t->error);
} else {
if (elapsed != -1ULL) {
- fprintf(ofp, "%llu + %u (%8llu) [%d]\n",
- (unsigned long long) t->sector,
- t_sec(t), elapsed, t->error);
+ if (t_sec(t))
+ fprintf(ofp, "%llu + %u (%8llu) [%d]\n",
+ (unsigned long long) t->sector,
+ t_sec(t), elapsed, t->error);
+ else
+ fprintf(ofp, "%llu (%8llu) [%d]\n",
+ (unsigned long long) t->sector,
+ elapsed, t->error);
} else {
- fprintf(ofp, "%llu + %u [%d]\n",
- (unsigned long long) t->sector,
- t_sec(t), t->error);
+ if (t_sec(t))
+ fprintf(ofp, "%llu + %u [%d]\n",
+ (unsigned long long) t->sector,
+ t_sec(t), t->error);
+ else
+ fprintf(ofp, "%llu [%d]\n",
+ (unsigned long long) t->sector,
+ t->error);
}
}
break;
case 'D': /* Issue */
case 'I': /* Insert */
case 'Q': /* Queue */
- case 'W': /* Bounce */
+ case 'B': /* Bounce */
if (t->action & BLK_TC_ACT(BLK_TC_PC)) {
char *p;
fprintf(ofp, "%u ", t->bytes);
fprintf(ofp, "[%s]\n", name);
} else {
if (elapsed != -1ULL) {
- fprintf(ofp, "%llu + %u (%8llu) [%s]\n",
- (unsigned long long) t->sector,
- t_sec(t), elapsed, name);
+ if (t_sec(t))
+ fprintf(ofp, "%llu + %u (%8llu) [%s]\n",
+ (unsigned long long) t->sector,
+ t_sec(t), elapsed, name);
+ else
+ fprintf(ofp, "(%8llu) [%s]\n", elapsed,
+ name);
} else {
- fprintf(ofp, "%llu + %u [%s]\n",
- (unsigned long long) t->sector,
- t_sec(t), name);
+ if (t_sec(t))
+ fprintf(ofp, "%llu + %u [%s]\n",
+ (unsigned long long) t->sector,
+ t_sec(t), name);
+ else
+ fprintf(ofp, "[%s]\n", name);
}
}
break;
- case 'B': /* Back merge */
+ case 'M': /* Back merge */
case 'F': /* Front merge */
- case 'M': /* Front or back merge */
case 'G': /* Get request */
case 'S': /* Sleep request */
- fprintf(ofp, "%llu + %u [%s]\n", (unsigned long long) t->sector,
- t_sec(t), name);
+ if (t_sec(t))
+ fprintf(ofp, "%llu + %u [%s]\n",
+ (unsigned long long) t->sector, t_sec(t), name);
+ else
+ fprintf(ofp, "[%s]\n", name);
break;
case 'P': /* Plug */
fprintf(ofp, "[%s] %u\n", name, get_pdu_int(t));
break;
- case 'A': { /* remap */
- struct blk_io_trace_remap r;
-
- get_pdu_remap(t, &r);
+ case 'A': /* remap */
fprintf(ofp, "%llu + %u <- (%d,%d) %llu\n",
- (unsigned long long) r.sector, t_sec(t),
+ (unsigned long long) t->sector, t_sec(t),
MAJOR(r.device), MINOR(r.device),
- (unsigned long long) t->sector);
+ (unsigned long long) r.sector);
break;
- }
-
+
case 'X': /* Split */
fprintf(ofp, "%llu / %u [%s]\n", (unsigned long long) t->sector,
get_pdu_int(t), name);
break;
+ case 'm': /* Message */
+ fprintf(ofp, "%*s\n", pdu_len, pdu_buf);
+ break;
+
default:
fprintf(stderr, "Unknown action %c\n", act[0]);
break;
projects / blktrace.git / blobdiff