Commit dcd1fb79 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

example/perf: move allocating ns_worker 



Next patch in series will add another caller for
the allocate_ns_worker.

Change-Id: I60281b519265b27d661c2b1ca94e09dc68dbbf57
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14414


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: default avatarDong Yi <dongx.yi@intel.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@nvidia.com>
parent b6e9e1ab

examples/nvme/perf/perf.c

+20 −9
Original line number Diff line number Diff line
@@ -2829,12 +2829,30 @@ unregister_controllers(void) 
	}

}



static int

allocate_ns_worker(struct ns_entry *entry, struct worker_thread *worker)

{

	struct ns_worker_ctx	*ns_ctx;



	ns_ctx = calloc(1, sizeof(struct ns_worker_ctx));

	if (!ns_ctx) {

		return -1;

	}



	printf("Associating %s with lcore %d\n", entry->name, worker->lcore);

	ns_ctx->stats.min_tsc = UINT64_MAX;

	ns_ctx->entry = entry;

	ns_ctx->histogram = spdk_histogram_data_alloc();

	TAILQ_INSERT_TAIL(&worker->ns_ctx, ns_ctx, link);



	return 0;

}



static int

associate_workers_with_ns(void)

{

	struct ns_entry		*entry = TAILQ_FIRST(&g_namespaces);

	struct worker_thread	*worker = TAILQ_FIRST(&g_workers);

	struct ns_worker_ctx	*ns_ctx;

	int			i, count;



	/* Each core contains single worker, and namespaces are associated as follows:
@@ -2849,17 +2867,10 @@ associate_workers_with_ns(void) 
			break;

		}



		ns_ctx = calloc(1, sizeof(struct ns_worker_ctx));

		if (!ns_ctx) {

		if (allocate_ns_worker(entry, worker) != 0) {

			return -1;

		}



		printf("Associating %s with lcore %d\n", entry->name, worker->lcore);

		ns_ctx->stats.min_tsc = UINT64_MAX;

		ns_ctx->entry = entry;

		ns_ctx->histogram = spdk_histogram_data_alloc();

		TAILQ_INSERT_TAIL(&worker->ns_ctx, ns_ctx, link);



		worker = TAILQ_NEXT(worker, link);

		if (worker == NULL) {

			worker = TAILQ_FIRST(&g_workers);