Commit 84230409 authored by Ben Walker's avatar Ben Walker
Browse files

examples: Simplify register_workers algorithm 



Several examples have a function to associate workers
with threads. Simplify that algorithm.

This seems to just shift some of the complexity
from register_workers down to main, but in the long
run the DPDK threading will get abstracted into
env as well and greatly simplify that part.

Change-Id: Ic106dde58fa5351a1ce0a058161b08062e121d3b
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 16ae5879

examples/ioat/perf/perf.c

+22 −30
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 */



#include <assert.h>

#include <stdio.h>

#include <unistd.h>

#include <stdlib.h>
@@ -161,31 +162,20 @@ register_workers(void) 
{

	unsigned lcore;

	struct worker_thread *worker;

	struct worker_thread *prev_worker;



	worker = malloc(sizeof(struct worker_thread));

	if (worker == NULL) {

		perror("worker_thread malloc");

		return -1;

	}

	g_workers = NULL;

	g_num_workers = 0;



	memset(worker, 0, sizeof(struct worker_thread));

	worker->lcore = rte_get_master_lcore();



	g_workers = worker;

	g_num_workers = 1;



	RTE_LCORE_FOREACH_SLAVE(lcore) {

		prev_worker = worker;

		worker = malloc(sizeof(struct worker_thread));

	RTE_LCORE_FOREACH(lcore) {

		worker = calloc(1, sizeof(*worker));

		if (worker == NULL) {

			perror("worker_thread malloc");

			fprintf(stderr, "Unable to allocate worker\n");

			return -1;

		}



		memset(worker, 0, sizeof(struct worker_thread));

		worker->lcore = lcore;

		prev_worker->next = worker;

		worker->next = g_workers;

		g_workers = worker;

		g_num_workers++;

	}
@@ -515,7 +505,8 @@ int 
main(int argc, char **argv)

{

	int rc;

	struct worker_thread *worker;

	struct worker_thread *worker, *master_worker;

	unsigned master_core;



	if (parse_args(argc, argv) != 0) {

		return 1;
@@ -557,25 +548,26 @@ main(int argc, char **argv) 
	}



	/* Launch all of the slave workers */

	worker = g_workers->next;

	master_core = rte_get_master_lcore();

	master_worker = NULL;

	worker = g_workers;

	while (worker != NULL) {

		if (worker->lcore != master_core) {

			rte_eal_remote_launch(work_fn, worker, worker->lcore);

		} else {

			assert(master_worker == NULL);

			master_worker = worker;

		}

		worker = worker->next;

	}



	rc = work_fn(g_workers);

	assert(master_worker != NULL);

	rc = work_fn(master_worker);

	if (rc < 0) {

		goto cleanup;

	}



	worker = g_workers->next;

	while (worker != NULL) {

		if (rte_eal_wait_lcore(worker->lcore) < 0) {

			rc = -1;

			goto cleanup;

		}

		worker = worker->next;

	}

	rte_eal_mp_wait_lcore();



	rc = dump_result();

examples/nvme/arbitration/arbitration.c

+27 −35
Original line number Diff line number Diff line
@@ -430,18 +430,18 @@ cleanup(void) 
	struct worker_thread *next_worker	= NULL;

	struct arb_task *task			= NULL;



	do {

	while (entry) {

		next_entry = entry->next;

		free(entry);

		entry = next_entry;

	} while (entry);

	};



	do {

	while (worker) {

		next_worker = worker->next;

		free(worker->ns_ctx);

		free(worker);

		worker = next_worker;

	} while (worker);

	};



	if (rte_mempool_get(task_pool, (void **)&task) == 0) {

		spdk_free(task->buf);
@@ -827,38 +827,27 @@ register_workers(void) 
{

	unsigned lcore;

	struct worker_thread *worker;

	struct worker_thread *prev_worker;

	enum spdk_nvme_qprio qprio = SPDK_NVME_QPRIO_URGENT;



	worker = malloc(sizeof(struct worker_thread));

	if (worker == NULL) {

		perror("worker_thread malloc");

		return 1;

	}



	memset(worker, 0, sizeof(struct worker_thread));

	worker->lcore = rte_get_master_lcore();

	g_workers = NULL;

	g_arbitration.num_workers = 0;



	g_workers = worker;

	worker->qprio = qprio;

	g_arbitration.num_workers = 1;



	RTE_LCORE_FOREACH_SLAVE(lcore) {

		prev_worker = worker;

		worker = malloc(sizeof(struct worker_thread));

	RTE_LCORE_FOREACH(lcore) {

		worker = calloc(1, sizeof(*worker));

		if (worker == NULL) {

			perror("worker_thread malloc");

			return 1;

			fprintf(stderr, "Unable to allocate worker\n");

			return -1;

		}



		memset(worker, 0, sizeof(struct worker_thread));

		worker->lcore = lcore;

		prev_worker->next = worker;

		worker->next = g_workers;

		g_workers = worker;

		g_arbitration.num_workers++;



		if (g_arbitration.arbitration_mechanism == SPDK_NVME_CAP_AMS_WRR) {

			qprio++;

		}



		worker->qprio = qprio % SPDK_NVME_QPRIO_MAX;

	}
@@ -1090,7 +1079,8 @@ int 
main(int argc, char **argv)

{

	int rc;

	struct worker_thread *worker;

	struct worker_thread *worker, *master_worker;

	unsigned master_core;

	char task_pool_name[30];

	uint32_t task_count;

	struct spdk_env_opts opts;
@@ -1145,21 +1135,23 @@ main(int argc, char **argv) 
	printf("Initialization complete. Launching workers.\n");



	/* Launch all of the slave workers */

	worker = g_workers->next;

	master_core = rte_get_master_lcore();

	master_worker = NULL;

	worker = g_workers;

	while (worker != NULL) {

		if (worker->lcore != master_core) {

			rte_eal_remote_launch(work_fn, worker, worker->lcore);

		} else {

			assert(master_worker == NULL);

			master_worker = worker;

		}

		worker = worker->next;

	}



	rc = work_fn(g_workers);

	assert(master_worker != NULL);

	rc = work_fn(master_worker);



	worker = g_workers->next;

	while (worker != NULL) {

		if (rte_eal_wait_lcore(worker->lcore) < 0) {

			rc = 1;

		}

		worker = worker->next;

	}

	rte_eal_mp_wait_lcore();



	print_stats();

examples/nvme/perf/perf.c

+21 −29
Original line number Diff line number Diff line
@@ -989,31 +989,20 @@ register_workers(void) 
{

	unsigned lcore;

	struct worker_thread *worker;

	struct worker_thread *prev_worker;



	worker = malloc(sizeof(struct worker_thread));

	if (worker == NULL) {

		perror("worker_thread malloc");

		return -1;

	}



	memset(worker, 0, sizeof(struct worker_thread));

	worker->lcore = rte_get_master_lcore();

	g_workers = NULL;

	g_num_workers = 0;



	g_workers = worker;

	g_num_workers = 1;



	RTE_LCORE_FOREACH_SLAVE(lcore) {

		prev_worker = worker;

		worker = malloc(sizeof(struct worker_thread));

	RTE_LCORE_FOREACH(lcore) {

		worker = calloc(1, sizeof(*worker));

		if (worker == NULL) {

			perror("worker_thread malloc");

			fprintf(stderr, "Unable to allocate worker\n");

			return -1;

		}



		memset(worker, 0, sizeof(struct worker_thread));

		worker->lcore = lcore;

		prev_worker->next = worker;

		worker->next = g_workers;

		g_workers = worker;

		g_num_workers++;

	}
@@ -1204,7 +1193,8 @@ associate_workers_with_ns(void) 
int main(int argc, char **argv)

{

	int rc;

	struct worker_thread *worker;

	struct worker_thread *worker, *master_worker;

	unsigned master_core;

	char task_pool_name[30];

	uint32_t task_count;

	struct spdk_env_opts opts;
@@ -1271,21 +1261,23 @@ int main(int argc, char **argv) 
	printf("Initialization complete. Launching workers.\n");



	/* Launch all of the slave workers */

	worker = g_workers->next;

	master_core = rte_get_master_lcore();

	master_worker = NULL;

	worker = g_workers;

	while (worker != NULL) {

		if (worker->lcore != master_core) {

			rte_eal_remote_launch(work_fn, worker, worker->lcore);

		} else {

			assert(master_worker == NULL);

			master_worker = worker;

		}

		worker = worker->next;

	}



	rc = work_fn(g_workers);

	assert(master_worker != NULL);

	rc = work_fn(master_worker);



	worker = g_workers->next;

	while (worker != NULL) {

		if (rte_eal_wait_lcore(worker->lcore) < 0) {

			rc = -1;

		}

		worker = worker->next;

	}

	rte_eal_mp_wait_lcore();



	print_stats();