From 5c5a44f0082886b3e08c52ba8634263673620bf9 Mon Sep 17 00:00:00 2001 From: Nick Connolly Date: Tue, 17 Nov 2020 16:22:36 +0000 Subject: [PATCH] test: Use PRId64 for portability POSIX defines PRId64/PRIu64/PRIx64 for printing 64-bit values in a portable way. Replace a few references to %ld to remove the assumption about the size of a long. Similarly, use %z with size_t arguments. Where the value being printed is an unsigned 64-bit value, use PRIu64 instead of %ld. Add a cast when comparing an enum to an integer value. Add an explicit uint64_t cast to the definition of BLOCK_CNT to prevent value truncation. Signed-off-by: Nick Connolly Change-Id: I093cffe7e79bc04eba012f4ffaf33062a642d062 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5137 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto --- test/app/fuzz/common/fuzz_common.h | 2 +- test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c | 2 +- test/app/fuzz/nvme_fuzz/nvme_fuzz.c | 10 ++++++---- test/bdev/bdevperf/bdevperf.c | 4 ++-- test/nvme/reset/reset.c | 8 ++++---- test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c | 2 +- .../lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c | 2 +- test/unit/lib/iscsi/iscsi.c/iscsi_ut.c | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/test/app/fuzz/common/fuzz_common.h b/test/app/fuzz/common/fuzz_common.h index 7619f4fb1..a333ea7ba 100644 --- a/test/app/fuzz/common/fuzz_common.h +++ b/test/app/fuzz/common/fuzz_common.h @@ -247,7 +247,7 @@ fuzz_parse_args_into_array(const char *file, void **arr, size_t ele_size, const rc = cb_fn((void *)arr_idx_pointer, obj_start, values_in_obj); if (rc == false) { - fprintf(stderr, "failed to parse file after %lu elements.\n", arr_elements_used); + fprintf(stderr, "failed to parse file after %zu elements.\n", arr_elements_used); goto fail; } diff --git a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c index 27124eb4f..8a2579a03 100644 --- a/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c +++ b/test/app/fuzz/iscsi_fuzz/iscsi_fuzz.c @@ -233,7 +233,7 @@ cleanup(void) struct fuzz_iscsi_dev_ctx *dev_ctx, *tmp; TAILQ_FOREACH_SAFE(dev_ctx, &g_dev_list, link, tmp) { - printf("device %p stats: Sent %lu valid opcode PDUs, %lu invalid opcode PDUs.\n", + printf("device %p stats: Sent %" PRIu64 " valid opcode PDUs, %" PRIu64 " invalid opcode PDUs.\n", dev_ctx, dev_ctx->num_valid_pdus, dev_ctx->num_sent_pdus - dev_ctx->num_valid_pdus); free(dev_ctx); diff --git a/test/app/fuzz/nvme_fuzz/nvme_fuzz.c b/test/app/fuzz/nvme_fuzz/nvme_fuzz.c index b068cb905..0a74bff6e 100644 --- a/test/app/fuzz/nvme_fuzz/nvme_fuzz.c +++ b/test/app/fuzz/nvme_fuzz/nvme_fuzz.c @@ -343,7 +343,7 @@ nvme_fuzz_cpl_cb(void *cb_arg, const struct spdk_nvme_cpl *cpl) qp->completed_cmd_counter++; if (spdk_unlikely(cpl->status.sc == SPDK_NVME_SC_SUCCESS)) { - fprintf(stderr, "The following %s command (command num %lu) completed successfully\n", + fprintf(stderr, "The following %s command (command num %" PRIu64 ") completed successfully\n", qp->is_admin ? "Admin" : "I/O", qp->completed_cmd_counter); qp->successful_completed_cmd_counter++; json_dump_nvme_cmd(&ctx->cmd); @@ -354,7 +354,7 @@ nvme_fuzz_cpl_cb(void *cb_arg, const struct spdk_nvme_cpl *cpl) __sync_bool_compare_and_swap(&g_successful_io_opcodes[ctx->cmd.opc], false, true); } } else if (g_verbose_mode == true) { - fprintf(stderr, "The following %s command (command num %lu) failed as expected.\n", + fprintf(stderr, "The following %s command (command num %" PRIu64 ") failed as expected.\n", qp->is_admin ? "Admin" : "I/O", qp->completed_cmd_counter); json_dump_nvme_cmd(&ctx->cmd); } @@ -512,10 +512,12 @@ free_namespaces(void) struct nvme_fuzz_ns *ns, *tmp; TAILQ_FOREACH_SAFE(ns, &g_ns_list, tailq, tmp) { - printf("NS: %p I/O qp, Total commands completed: %lu, total successful commands: %lu, random_seed: %u\n", + printf("NS: %p I/O qp, Total commands completed: %" PRIu64 ", total successful commands: %" PRIu64 + ", random_seed: %u\n", ns->ns, ns->io_qp.completed_cmd_counter, ns->io_qp.successful_completed_cmd_counter, ns->io_qp.random_seed); - printf("NS: %p admin qp, Total commands completed: %lu, total successful commands: %lu, random_seed: %u\n", + printf("NS: %p admin qp, Total commands completed: %" PRIu64 ", total successful commands: %" PRIu64 + ", random_seed: %u\n", ns->ns, ns->a_qp.completed_cmd_counter, ns->a_qp.successful_completed_cmd_counter, ns->a_qp.random_seed); diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index 4d11aea83..7d2443d8b 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -504,7 +504,7 @@ bdevperf_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) if (!job->reset && !job->continue_on_failure) { bdevperf_job_drain(job); g_run_rc = -1; - printf("task offset: %lu on job bdev=%s fails\n", + printf("task offset: %" PRIu64 " on job bdev=%s fails\n", task->offset_blocks, job->name); } } else if (job->verify || job->reset) { @@ -516,7 +516,7 @@ bdevperf_complete(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) task->md_buf, spdk_bdev_io_get_md_buf(bdev_io), spdk_bdev_get_md_size(job->bdev), job->io_size_blocks, md_check)) { - printf("Buffer mismatch! Target: %s Disk Offset: %lu\n", job->name, task->offset_blocks); + printf("Buffer mismatch! Target: %s Disk Offset: %" PRIu64 "\n", job->name, task->offset_blocks); printf(" First dword expected 0x%x got 0x%x\n", *(int *)task->buf, *(int *)iovs[0].iov_base); bdevperf_job_drain(job); g_run_rc = -1; diff --git a/test/nvme/reset/reset.c b/test/nvme/reset/reset.c index 597443d0e..a3dba4eea 100644 --- a/test/nvme/reset/reset.c +++ b/test/nvme/reset/reset.c @@ -352,11 +352,11 @@ print_stats(void) } printf("========================================================\n"); - printf("%16lu IO completed successfully\n", total_completed_io); - printf("%16lu IO completed with error\n", total_completed_err_io); + printf("%16" PRIu64 " IO completed successfully\n", total_completed_io); + printf("%16" PRIu64 " IO completed with error\n", total_completed_err_io); printf("--------------------------------------------------------\n"); - printf("%16lu IO completed total\n", total_completed_io + total_completed_err_io); - printf("%16lu IO submitted\n", total_submitted_io); + printf("%16" PRIu64 " IO completed total\n", total_completed_io + total_completed_err_io); + printf("%16" PRIu64 " IO submitted\n", total_submitted_io); if (total_submitted_io != (total_completed_io + total_completed_err_io)) { fprintf(stderr, "Some IO are missing......\n"); diff --git a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c index 535acd29d..15eed95a3 100644 --- a/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c +++ b/test/unit/lib/bdev/raid/bdev_raid.c/bdev_raid_ut.c @@ -882,7 +882,7 @@ verify_raid_bdev(struct rpc_bdev_raid_create *r, bool presence, uint32_t raid_st CU_ASSERT(pbdev->strip_size_shift == spdk_u32log2(((r->strip_size_kb * 1024) / g_block_len))); CU_ASSERT(pbdev->blocklen_shift == spdk_u32log2(g_block_len)); - CU_ASSERT(pbdev->state == raid_state); + CU_ASSERT((uint32_t)pbdev->state == raid_state); CU_ASSERT(pbdev->num_base_bdevs == r->base_bdevs.num_base_bdevs); CU_ASSERT(pbdev->num_base_bdevs_discovered == r->base_bdevs.num_base_bdevs); CU_ASSERT(pbdev->level == r->level); diff --git a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c index a98a742ed..bf62922c0 100644 --- a/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c +++ b/test/unit/lib/bdev/vbdev_zone_block.c/vbdev_zone_block_ut.c @@ -40,7 +40,7 @@ #include "bdev/zone_block/vbdev_zone_block.c" #include "bdev/zone_block/vbdev_zone_block_rpc.c" -#define BLOCK_CNT (1024ul * 1024ul * 1024ul * 1024ul) +#define BLOCK_CNT ((uint64_t)1024ul * 1024ul * 1024ul * 1024ul) #define BLOCK_SIZE 4096 /* Globals */ diff --git a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c index a102ceda5..962630e74 100644 --- a/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c +++ b/test/unit/lib/iscsi/iscsi.c/iscsi_ut.c @@ -1573,7 +1573,7 @@ check_scsi_task(struct spdk_iscsi_pdu *pdu, enum spdk_scsi_data_dir dir) task = pdu->task; CU_ASSERT(task != NULL); CU_ASSERT(task->pdu == pdu); - CU_ASSERT(task->scsi.dxfer_dir == dir); + CU_ASSERT(task->scsi.dxfer_dir == (uint32_t)dir); iscsi_task_put(task); pdu->task = NULL;