admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

iscsi-perf.c: Use %llu format string.

Browse Source 
Compiling with clang gives a format warning like
iscsi-perf.c:98:53: error: format specifies type 'unsigned long' but the
argument has type 'uint64_t' (aka 'unsigned long long')
      [-Werror,-Wformat]
so replace %lu with %llu where appropriate.

Signed-off-by: Sitsofe Wheeler <sitsofe@yahoo.com>
This commit is contained in:
Sitsofe Wheeler
2015-03-01 15:31:25 +00:00
parent de7b38d9a0
commit 04ff9584ee
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/iscsi-perf.c
View File

@@ -76,12 +76,12 @@ void progress(struct client *client) {
uint64_t aiops = 1000000000UL * (client->iops) / (now - client->first_ns); uint64_t aiops = 1000000000UL * (client->iops) / (now - client->first_ns);
if (!_runtime) { if (!_runtime) {
finished = 1; finished = 1;
printf ("iops average %lu (%lu MB/s) ", aiops, (aiops * blocks_per_io * client->blocksize) >> 20); printf ("iops average %llu (%llu MB/s) ", aiops, (aiops * blocks_per_io * client->blocksize) >> 20);
} else { } else {
uint64_t iops = 1000000000UL * (client->iops - client->last_iops) / (now - client->last_ns); uint64_t iops = 1000000000UL * (client->iops - client->last_iops) / (now - client->last_ns);
printf ("%02lu:%02lu:%02lu - ", (_runtime % 3600) / 60, _runtime / 60, _runtime % 60); printf ("%02llu:%02llu:%02llu - ", (_runtime % 3600) / 60, _runtime / 60, _runtime % 60);
printf ("lba %lu, iops current %lu (%lu MB/s), ", client->pos, iops, (iops * blocks_per_io * client->blocksize) >> 20); printf ("lba %llu, iops current %llu (%llu MB/s), ", client->pos, iops, (iops * blocks_per_io * client->blocksize) >> 20);
printf ("iops average %lu (%lu MB/s) ", aiops, (aiops * blocks_per_io * client->blocksize) >> 20); printf ("iops average %llu (%llu MB/s) ", aiops, (aiops * blocks_per_io * client->blocksize) >> 20);
} }
fflush(stdout); fflush(stdout);
client->last_ns = now; client->last_ns = now;
@@ -274,14 +274,14 @@ int main(int argc, char *argv[])
scsi_free_scsi_task(task); scsi_free_scsi_task(task);
printf("capacity is %lu blocks or %lu byte (%lu MB)\n", client.num_blocks, client.num_blocks * client.blocksize, printf("capacity is %llu blocks or %llu byte (%llu MB)\n", client.num_blocks, client.num_blocks * client.blocksize,
(client.num_blocks * client.blocksize) >> 20); (client.num_blocks * client.blocksize) >> 20);
printf("performing %s READ with %d parallel requests\nfixed transfer size of %d blocks (%d byte)\n", printf("performing %s READ with %d parallel requests\nfixed transfer size of %d blocks (%d byte)\n",
client.random ? "random" : "sequential", max_in_flight, blocks_per_io, blocks_per_io * client.blocksize); client.random ? "random" : "sequential", max_in_flight, blocks_per_io, blocks_per_io * client.blocksize);
if (runtime) { if (runtime) {
printf("will run for %lu seconds.\n", runtime); printf("will run for %llu seconds.\n", runtime);
} else { } else {
printf("infinite runtime - press CTRL-C to abort.\n"); printf("infinite runtime - press CTRL-C to abort.\n");
} }