ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme/fio_plugin: fix declaration after statement

Browse Source 
Change-Id: I41c67fc3df3a7823765929351eef9b159415490d
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/367125
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Daniel Verkamp 2017-06-26 12:26:26 -07:00
parent 255d0e529c
commit e09174b1eb
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/nvme/fio_plugin/fio_plugin.c
View File

@ -346,6 +346,9 @@ static int spdk_fio_queue(struct thread_data *td, struct io_u *io_u)
struct spdk_fio_request *fio_req = io_u->engine_data; struct spdk_fio_request *fio_req = io_u->engine_data;
struct spdk_fio_qpair *fio_qpair; struct spdk_fio_qpair *fio_qpair;
struct spdk_nvme_ns *ns = NULL; struct spdk_nvme_ns *ns = NULL;
uint32_t block_size;
uint64_t lba;
uint32_t lba_count;
/* Find the namespace that corresponds to the file in the io_u */ /* Find the namespace that corresponds to the file in the io_u */
fio_qpair = fio_thread->fio_qpair; fio_qpair = fio_thread->fio_qpair;
@ -360,9 +363,9 @@ static int spdk_fio_queue(struct thread_data *td, struct io_u *io_u)
return FIO_Q_COMPLETED; return FIO_Q_COMPLETED;
} }
uint32_t block_size = spdk_nvme_ns_get_sector_size(ns); block_size = spdk_nvme_ns_get_sector_size(ns);
uint64_t lba = io_u->offset / block_size; lba = io_u->offset / block_size;
uint32_t lba_count = io_u->xfer_buflen / block_size; lba_count = io_u->xfer_buflen / block_size;
switch (io_u->ddir) { switch (io_u->ddir) {
case DDIR_READ: case DDIR_READ:
@ -420,9 +423,11 @@ static int spdk_fio_getevents(struct thread_data *td, unsigned int min,
} }
if (t) { if (t) {
uint64_t elapse;
clock_gettime(CLOCK_MONOTONIC_RAW, &t1); clock_gettime(CLOCK_MONOTONIC_RAW, &t1);
uint64_t elapse = ((t1.tv_sec - t0.tv_sec) * 1000000000L) elapse = ((t1.tv_sec - t0.tv_sec) * 1000000000L)
+ t1.tv_nsec - t0.tv_nsec; + t1.tv_nsec - t0.tv_nsec;
if (elapse > timeout) { if (elapse > timeout) {
break; break;
} }