From fd92da249ee5a20144e20f1f08fb0df70164951d Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 26 Aug 2005 14:06:49 +0200 Subject: [PATCH] Increase MAX_CPUS to 512. Use the full magic number for cpu number, not just the bottom 8 bits. --- blkparse.c | 9 +++++++-- blktrace.c | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/blkparse.c b/blkparse.c index 818f44f..491ad39 100644 --- a/blkparse.c +++ b/blkparse.c @@ -9,7 +9,7 @@ #define NELEMS(pfi) ((pfi)->stat.st_size / sizeof(struct blk_io_trace)) -#define MAX_CPUS (1 << 8) /* only 8 bits for now */ +#define MAX_CPUS (512) struct per_file_info { int cpu; @@ -363,7 +363,12 @@ int main(int argc, char *argv[]) printf("\n\n"); for (i = 0, tip = traces; i < nelems; i++, tip++) { - int cpu = tip->magic & 0xff; + int cpu = tip->magic; + + if (cpu >= MAX_CPUS) { + fprintf(stderr, "CPU number too large (%d)\n", cpu); + return 1; + } current = &per_file_info[cpu]; diff --git a/blktrace.c b/blktrace.c index 3083f04..c7150f2 100644 --- a/blktrace.c +++ b/blktrace.c @@ -194,7 +194,7 @@ void *extract(void *arg) } /* version is verified, stuff with CPU number now */ - t.magic = (t.magic & ~0xff) | tip->cpu; + t.magic = tip->cpu; ret = write(ofd, &t, sizeof(t)); if (ret < 0) { perror(op); -- 2.25.1