Commit 528ad3b3 authored by Simon A. F. Lund's avatar Simon A. F. Lund Committed by Jim Harris
Browse files

examples/nvme_fio_plugin: move completion-helpers 



Preparation patch for the addition of the 'initial_zone_reset' plugin-option.

Signed-off-by: default avatarSimon A. F. Lund <simon.lund@samsung.com>
Change-Id: I768fc207b74cfa2a516009e10fc2a4646d06ba72
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4948


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarNiklas Cassel <niklas.cassel@wdc.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent f896aa6f

examples/nvme/fio_plugin/fio_plugin.c

+30 −30
Original line number Diff line number Diff line
@@ -254,6 +254,36 @@ get_fio_qpair(struct spdk_fio_thread *fio_thread, struct fio_file *f) 


	return NULL;

}



/**

 * Callback function to use while processing completions until completion-indicator turns non-zero

 */

static void

pcu_cb(void *ctx, const struct spdk_nvme_cpl *cpl)

{

	int *completed = ctx;



	*completed = spdk_nvme_cpl_is_error(cpl) ? -1 : 1;

}



/**

 * Process Completions Until the given 'completed' indicator turns non-zero or an error occurs

 */

static int32_t

pcu(struct spdk_nvme_qpair *qpair, int *completed)

{

	int32_t ret;



	while (!*completed) {

		ret = spdk_nvme_qpair_process_completions(qpair, 1);

		if (ret < 0) {

			log_err("spdk/nvme: process_compl(): ret: %d\n", ret);

			return ret;

		}

	}



	return 0;

}

#endif



static void
@@ -1083,36 +1113,6 @@ spdk_fio_get_zoned_model(struct thread_data *td, struct fio_file *f, enum zbd_zo 
	return -EINVAL;

}



/**

 * Callback function to use while processing completions until completion-indicator turns non-zero

 */

static void

pcu_cb(void *ctx, const struct spdk_nvme_cpl *cpl)

{

	int *completed = ctx;



	*completed = spdk_nvme_cpl_is_error(cpl) ? -1 : 1;

}



/**

 * Process Completions Until the given 'completed' indicator turns non-zero or an error occurs

 */

static int32_t

pcu(struct spdk_nvme_qpair *qpair, int *completed)

{

	int32_t ret;



	while (!*completed) {

		ret = spdk_nvme_qpair_process_completions(qpair, 1);

		if (ret < 0) {

			log_err("spdk/nvme: process_compl(): ret: %d\n", ret);

			return ret;

		}

	}



	return 0;

}



static uint64_t

spdk_fio_qpair_mdts_nbytes(struct spdk_fio_qpair *fio_qpair)

{