qemu-io: small cleanups for the aio code
PATCH 1/2 qemu-io: small cleanups for the aio code
Address a couple of review comments from Kevin.
qemu-io.c +15 -23
@@ -769,25 +769,23 @@ aio_write_done(void *opaque, int ret) {struct aio_ctx *ctx = opaque;struct timeval t2; -int total; -int cnt =1 ;gettimeofday (&t2,NULL ); - total = ctx->qiov.size;if (ret <0 ) {printf ("aio_write failed: %s\n" ,strerror (-ret));return ; } -if (ctx->qflag) +if (ctx->qflag) {return ; + }/* Finally, report back -- -C gives a parsable format */ t2 =tsub (t2, ctx->t1); -print_report ("wrote" , &t2, ctx->offset, ctx->qiov.size, total, cnt, - ctx->Cflag); +print_report ("wrote" , &t2, ctx->offset, ctx->qiov.size, + ctx->qiov.size,1 , ctx->Cflag);qemu_io_free (ctx->buf);free (ctx);
@@ -800,44 +798,41 @@ aio_read_done(void *opaque, int ret) {struct aio_ctx *ctx = opaque;struct timeval t2; -int total; -int cnt =1 ;gettimeofday (&t2,NULL ); - total = ctx->qiov.size; -if (ret <0 ) {printf ("readv failed: %s\n" ,strerror (-ret));return ; }if (ctx->Pflag) { -void *cmp_buf =malloc (total); +void *cmp_buf =malloc (ctx->qiov.size); -memset (cmp_buf, ctx->pattern, total); -if (memcmp (ctx->buf, cmp_buf, total)) { +memset (cmp_buf, ctx->pattern, ctx->qiov.size); +if (memcmp (ctx->buf, cmp_buf, ctx->qiov.size)) {printf ("Pattern verification failed at offset %lld, " "%d bytes\n" , - (long long ) ctx->offset, total); + (long long ) ctx->offset, ctx->qiov.size); }free (cmp_buf); } -if (ctx->qflag) +if (ctx->qflag) {return ; + } -if (ctx->vflag) -dump_buffer (ctx->buf, ctx->offset, total); +if (ctx->vflag) { +dump_buffer (ctx->buf, ctx->offset, ctx->qiov.size); + }/* Finally, report back -- -C gives a parsable format */ t2 =tsub (t2, ctx->t1); -print_report ("read" , &t2, ctx->offset, ctx->qiov.size, total, cnt, - ctx->Cflag); +print_report ("read" , &t2, ctx->offset, ctx->qiov.size, + ctx->qiov.size,1 , ctx->Cflag);qemu_io_free (ctx->buf);free (ctx); - } static void
@@ -870,8 +865,6 @@ aio_read_f(int argc, char **argv)struct aio_ctx *ctx =calloc (1 ,sizeof (struct aio_ctx ));BlockDriverAIOCB *acb; - ctx->pattern =0xcd ; -while ((c =getopt (argc, argv,"CP:qv" )) !=EOF ) {switch (c) {case 'C' :
@@ -1035,7 +1028,6 @@ aio_write_f(int argc, char **argv)return 0 ; } -for (i = optind; i < argc; i++) {size_t len;
qemu-io.c aio_read_done(void *opaque, int ret) · line 816
Quoted 13 lines · Christoph Hellwig
qemu-io.c +4
-4if (ctx->Pflag) { -void *cmp_buf =malloc (total); +void *cmp_buf =malloc (ctx->qiov.size); -memset (cmp_buf, ctx->pattern, total); -if (memcmp (ctx->buf, cmp_buf, total)) { +memset (cmp_buf, ctx->pattern, ctx->qiov.size); +if (memcmp (ctx->buf, cmp_buf, ctx->qiov.size)) {printf ("Pattern verification failed at offset %lld, " "%d bytes\n" , - (long long ) ctx->offset, total); + (long long ) ctx->offset, ctx->qiov.size);
This breaks the build because ctx->qiov.size is a size_t and your format parameter is a %d.
Regards,
Anthony Liguori
Quoted 11 lines · Anthony Liguori
qemu-io.c aio_read_done(void *opaque, int ret) · line 816
Quoted 8 lines
qemu-io.c +2
-1-if (memcmp (ctx->buf, cmp_buf, total)) { +memset (cmp_buf, ctx->pattern, ctx->qiov.size); +if (memcmp (ctx->buf, cmp_buf, ctx->qiov.size)) {printf("Pattern verification failed at offset %lld, " "%d bytes\n",qemu-io.c +1
-1- (long long) ctx->offset, total); + (long long) ctx->offset, ctx->qiov.size);This breaks the build because
ctx->qiov.sizeis asize_tand your format parameter is a %d.
Work fine on 32 bit x86 :) But yeah, the correct format that works on all platforms would be %zd.
Quoted 13 lines · Christoph Hellwig
Quoted 11 lines · Anthony Liguori
qemu-io.c aio_read_done(void *opaque, int ret) · line 816
Quoted 8 lines
qemu-io.c +2
-1-if (memcmp (ctx->buf, cmp_buf, total)) { +memset (cmp_buf, ctx->pattern, ctx->qiov.size); +if (memcmp (ctx->buf, cmp_buf, ctx->qiov.size)) {printf("Pattern verification failed at offset %lld, " "%d bytes\n",qemu-io.c +1
-1- (long long) ctx->offset, total); + (long long) ctx->offset, ctx->qiov.size);This breaks the build because
ctx->qiov.sizeis asize_tand your format parameter is a %d.
Quoted 2 lines
Work fine on 32 bit x86 :) But yeah, the correct format that works on all platforms would be %zd.
Just a small correction - it wouldn't work on Windows.
Signature · 1 line
mailto:[email protected]
Quoted 4 lines · malc
Quoted 2 lines
Work fine on 32 bit x86 :) But yeah, the correct format that works on all platforms would be %zd.
Just a small correction - it wouldn't work on Windows.
Why would it generally not work on windows? %zd is in C99 and thus it should be supported by any recent Windows compiler and library.
Quoted 8 lines · Christoph Hellwig
Quoted 4 lines · malc
Quoted 2 lines
Work fine on 32 bit x86 :) But yeah, the correct format that works on all platforms would be %zd.
Just a small correction - it wouldn't work on Windows.
Why would it generally not work on windows? %zd is in C99 and thus it should be supported by any recent Windows compiler and library.
Windows compilers don't generally support C99.
-- Jamie
Quoted 8 lines · Christoph Hellwig
Quoted 4 lines · malc
Quoted 2 lines
Work fine on 32 bit x86 :) But yeah, the correct format that works on all platforms would be %zd.
Just a small correction - it wouldn't work on Windows.
Why would it generally not work on windows? %zd is in C99 and thus it should be supported by any recent Windows compiler and library.
GCC the compiler does support it, the mingw32's runtime library though does not.
Signature · 1 line
mailto:[email protected]