Commit ab0bc5c2 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Tomasz Zawadzki
Browse files

lib/thread: Use function name as poller name by using macro SPDK_POLLER_REGISTER 



We will be create fine name for each poller but it will need large
effort. Replacing spdk_poller_register by the macro SPDK_POLLER_REGISTER
will provide better name than function address with minimum effort.

Following patches may improve function name for clarification.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: If862a274c5879065c3f7cb04dcb5ca7844523e68
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1781


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarMaciej Szwed <maciej.szwed@intel.com>
Community-CI: Broadcom CI
parent 2eabc715

examples/accel/perf/accel_perf.c

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ _worker_stop(void *arg) 


	/* now let the worker drain and check it's outstanding IO with a poller */

	worker->is_draining = true;

	worker->is_draining_poller = spdk_poller_register(_check_draining, worker, 0);

	worker->is_draining_poller = SPDK_POLLER_REGISTER(_check_draining, worker, 0);



	return 0;

}
@@ -311,7 +311,7 @@ _init_thread(void *arg1) 
	}



	/* Register a poller that will stop the worker at time elapsed */

	worker->stop_poller = spdk_poller_register(_worker_stop, worker,

	worker->stop_poller = SPDK_POLLER_REGISTER(_worker_stop, worker,

			      g_time_in_sec * 1000000ULL);



	g_workers = worker;

examples/nvmf/nvmf/nvmf.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ nvmf_target_advance_state(void) 
			nvmf_tgt_start_subsystems(&g_nvmf_tgt);

			break;

		case NVMF_INIT_START_ACCEPTOR:

			g_acceptor_poller = spdk_poller_register(nvmf_tgt_acceptor_poll, &g_nvmf_tgt,

			g_acceptor_poller = SPDK_POLLER_REGISTER(nvmf_tgt_acceptor_poll, &g_nvmf_tgt,

					    g_acceptor_poll_rate);

			fprintf(stdout, "Acceptor running\n");

			g_target_state = NVMF_RUNNING;

examples/sock/hello_world/hello_sock.c

+5 −5
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ hello_sock_quit(struct hello_context_t *ctx, int rc) 
	ctx->rc = rc;

	spdk_poller_unregister(&ctx->poller_out);

	if (!ctx->time_out) {

		ctx->time_out = spdk_poller_register(hello_sock_close_timeout_poll, ctx,

		ctx->time_out = SPDK_POLLER_REGISTER(hello_sock_close_timeout_poll, ctx,

						     CLOSE_TIMEOUT_US);

	}

	return 0;
@@ -238,8 +238,8 @@ hello_sock_connect(struct hello_context_t *ctx) 
	fcntl(STDIN_FILENO, F_SETFL, fcntl(STDIN_FILENO, F_GETFL) | O_NONBLOCK);



	g_is_running = true;

	ctx->poller_in = spdk_poller_register(hello_sock_recv_poll, ctx, 0);

	ctx->poller_out = spdk_poller_register(hello_sock_writev_poll, ctx, 0);

	ctx->poller_in = SPDK_POLLER_REGISTER(hello_sock_recv_poll, ctx, 0);

	ctx->poller_out = SPDK_POLLER_REGISTER(hello_sock_writev_poll, ctx, 0);



	return 0;

}
@@ -366,9 +366,9 @@ hello_sock_listen(struct hello_context_t *ctx) 
	/*

	 * Start acceptor and group poller

	 */

	ctx->poller_in = spdk_poller_register(hello_sock_accept_poll, ctx,

	ctx->poller_in = SPDK_POLLER_REGISTER(hello_sock_accept_poll, ctx,

					      ACCEPT_TIMEOUT_US);

	ctx->poller_out = spdk_poller_register(hello_sock_group_poll, ctx, 0);

	ctx->poller_out = SPDK_POLLER_REGISTER(hello_sock_group_poll, ctx, 0);



	return 0;

}

lib/bdev/bdev.c

+4 −4
Original line number Diff line number Diff line
@@ -2317,7 +2317,7 @@ bdev_enable_qos(struct spdk_bdev *bdev, struct spdk_bdev_channel *ch) 
			qos->timeslice_size =

				SPDK_BDEV_QOS_TIMESLICE_IN_USEC * spdk_get_ticks_hz() / SPDK_SEC_TO_USEC;

			qos->last_timeslice = spdk_get_ticks();

			qos->poller = spdk_poller_register(bdev_channel_poll_qos,

			qos->poller = SPDK_POLLER_REGISTER(bdev_channel_poll_qos,

							   qos,

							   SPDK_BDEV_QOS_TIMESLICE_IN_USEC);

		}
@@ -2437,7 +2437,7 @@ spdk_bdev_set_timeout(struct spdk_bdev_desc *desc, uint64_t timeout_in_sec, 


	if (timeout_in_sec) {

		assert(cb_fn != NULL);

		desc->io_timeout_poller = spdk_poller_register(bdev_poll_timeout_io,

		desc->io_timeout_poller = SPDK_POLLER_REGISTER(bdev_poll_timeout_io,

					  desc,

					  SPDK_BDEV_IO_POLL_INTERVAL_IN_MSEC * SPDK_SEC_TO_USEC /

					  1000);
@@ -3044,7 +3044,7 @@ spdk_bdev_set_qd_sampling_period(struct spdk_bdev *bdev, uint64_t period) 
	}



	if (period != 0) {

		bdev->internal.qd_poller = spdk_poller_register(bdev_calculate_measured_queue_depth, bdev,

		bdev->internal.qd_poller = SPDK_POLLER_REGISTER(bdev_calculate_measured_queue_depth, bdev,

					   period);

	}

}
@@ -6144,7 +6144,7 @@ bdev_lock_lba_range_check_io(void *_i) 
	 */

	TAILQ_FOREACH(bdev_io, &ch->io_submitted, internal.ch_link) {

		if (bdev_io_range_is_locked(bdev_io, range)) {

			ctx->poller = spdk_poller_register(bdev_lock_lba_range_check_io, i, 100);

			ctx->poller = SPDK_POLLER_REGISTER(bdev_lock_lba_range_check_io, i, 100);

			return 1;

		}

	}

lib/blobfs/blobfs.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ __start_cache_pool_mgmt(void *ctx) 
	pthread_spin_init(&g_caches_lock, 0);



	assert(g_cache_pool_mgmt_poller == NULL);

	g_cache_pool_mgmt_poller = spdk_poller_register(_blobfs_cache_pool_reclaim, NULL,

	g_cache_pool_mgmt_poller = SPDK_POLLER_REGISTER(_blobfs_cache_pool_reclaim, NULL,

				   BLOBFS_CACHE_POOL_POLL_PERIOD_IN_US);

}