From 362879570a3ac149a6ec256d161926093e3babb1 Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Thu, 28 Feb 2019 14:42:07 -0700 Subject: [PATCH] event: Remove arg2 from spdk_app_start() We never used this anywhere, and I need to move to a model where the start up action is a thread message instead Change-Id: I6b21ba9afb93a3245aceca2fe24713ffd16d0933 Signed-off-by: Ben Walker Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/446986 Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Reviewed-by: Changpeng Liu Reviewed-by: Darek Stojaczyk Tested-by: SPDK CI Jenkins --- CHANGELOG.md | 4 ++++ app/iscsi_tgt/iscsi_tgt.c | 2 +- app/nvmf_tgt/nvmf_main.c | 2 +- app/spdk_tgt/spdk_tgt.c | 2 +- app/vhost/vhost.c | 2 +- examples/bdev/hello_world/hello_bdev.c | 2 +- examples/blob/cli/blobcli.c | 2 +- examples/blob/hello_world/hello_blob.c | 2 +- examples/sock/hello_world/hello_sock.c | 2 +- include/spdk/event.h | 3 +-- lib/event/app.c | 4 ++-- lib/rocksdb/env_spdk.cc | 2 +- test/app/bdev_svc/bdev_svc.c | 2 +- test/app/stub/stub.c | 2 +- test/bdev/bdevio/bdevio.c | 2 +- test/bdev/bdevperf/bdevperf.c | 2 +- test/blobfs/fuse/fuse.c | 2 +- test/blobfs/mkfs/mkfs.c | 2 +- test/event/event_perf/event_perf.c | 2 +- test/event/reactor/reactor.c | 2 +- test/event/reactor_perf/reactor_perf.c | 2 +- 21 files changed, 25 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41b280aad..7edbf50a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## v19.04: (Upcoming Release) +### thread + +spdk_app_start() now only accepts a single context argument. + ### nvme Added asynchronous probe support. New APIs spdk_nvme_probe_async() and diff --git a/app/iscsi_tgt/iscsi_tgt.c b/app/iscsi_tgt/iscsi_tgt.c index 7bd6f7152..1dbc606d7 100644 --- a/app/iscsi_tgt/iscsi_tgt.c +++ b/app/iscsi_tgt/iscsi_tgt.c @@ -109,7 +109,7 @@ main(int argc, char **argv) opts.usr1_handler = spdk_sigusr1; /* Blocks until the application is exiting */ - rc = spdk_app_start(&opts, spdk_startup, NULL, NULL); + rc = spdk_app_start(&opts, spdk_startup, NULL); if (rc) { SPDK_ERRLOG("Start iscsi target daemon: spdk_app_start() retn non-zero\n"); } diff --git a/app/nvmf_tgt/nvmf_main.c b/app/nvmf_tgt/nvmf_main.c index 0a27641c9..da079d481 100644 --- a/app/nvmf_tgt/nvmf_main.c +++ b/app/nvmf_tgt/nvmf_main.c @@ -72,7 +72,7 @@ main(int argc, char **argv) } /* Blocks until the application is exiting */ - rc = spdk_app_start(&opts, nvmf_tgt_started, NULL, NULL); + rc = spdk_app_start(&opts, nvmf_tgt_started, NULL); spdk_app_fini(); return rc; } diff --git a/app/spdk_tgt/spdk_tgt.c b/app/spdk_tgt/spdk_tgt.c index 482d612c2..b30e552c0 100644 --- a/app/spdk_tgt/spdk_tgt.c +++ b/app/spdk_tgt/spdk_tgt.c @@ -122,7 +122,7 @@ main(int argc, char **argv) return rc; } - rc = spdk_app_start(&opts, spdk_tgt_started, NULL, NULL); + rc = spdk_app_start(&opts, spdk_tgt_started, NULL); spdk_app_fini(); return rc; diff --git a/app/vhost/vhost.c b/app/vhost/vhost.c index 15b78e7c5..5bae19be6 100644 --- a/app/vhost/vhost.c +++ b/app/vhost/vhost.c @@ -103,7 +103,7 @@ main(int argc, char *argv[]) } /* Blocks until the application is exiting */ - rc = spdk_app_start(&opts, vhost_started, NULL, NULL); + rc = spdk_app_start(&opts, vhost_started, NULL); spdk_app_fini(); diff --git a/examples/bdev/hello_world/hello_bdev.c b/examples/bdev/hello_world/hello_bdev.c index 305a65561..29164dfa4 100644 --- a/examples/bdev/hello_world/hello_bdev.c +++ b/examples/bdev/hello_world/hello_bdev.c @@ -283,7 +283,7 @@ main(int argc, char **argv) * hello_start() returns), or if an error occurs during * spdk_app_start() before hello_start() runs. */ - rc = spdk_app_start(&opts, hello_start, &hello_context, NULL); + rc = spdk_app_start(&opts, hello_start, &hello_context); if (rc) { SPDK_ERRLOG("ERROR starting application\n"); } diff --git a/examples/blob/cli/blobcli.c b/examples/blob/cli/blobcli.c index 7238284e6..7b9948e41 100644 --- a/examples/blob/cli/blobcli.c +++ b/examples/blob/cli/blobcli.c @@ -1561,7 +1561,7 @@ main(int argc, char **argv) opts.config_file = cli_context->config_file; cli_context->app_started = true; - rc = spdk_app_start(&opts, cli_start, cli_context, NULL); + rc = spdk_app_start(&opts, cli_start, cli_context); if (rc) { printf("ERROR!\n"); } diff --git a/examples/blob/hello_world/hello_blob.c b/examples/blob/hello_world/hello_blob.c index ffcc2976d..9e607610f 100644 --- a/examples/blob/hello_world/hello_blob.c +++ b/examples/blob/hello_world/hello_blob.c @@ -477,7 +477,7 @@ main(int argc, char **argv) * hello_start() returns), or if an error occurs during * spdk_app_start() before hello_start() runs. */ - rc = spdk_app_start(&opts, hello_start, hello_context, NULL); + rc = spdk_app_start(&opts, hello_start, hello_context); if (rc) { SPDK_NOTICELOG("ERROR!\n"); } else { diff --git a/examples/sock/hello_world/hello_sock.c b/examples/sock/hello_world/hello_sock.c index db4811825..5c2a71e79 100644 --- a/examples/sock/hello_world/hello_sock.c +++ b/examples/sock/hello_world/hello_sock.c @@ -434,7 +434,7 @@ main(int argc, char **argv) hello_context.port = g_port; hello_context.verbose = g_verbose; - rc = spdk_app_start(&opts, start_net_framework, &hello_context, NULL); + rc = spdk_app_start(&opts, start_net_framework, &hello_context); if (rc) { SPDK_ERRLOG("ERROR starting application\n"); } diff --git a/include/spdk/event.h b/include/spdk/event.h index c1b5974a9..cc59c683f 100644 --- a/include/spdk/event.h +++ b/include/spdk/event.h @@ -150,12 +150,11 @@ void spdk_app_opts_init(struct spdk_app_opts *opts); * \param opts Initialization options used for this application. * \param start_fn Event function that is called when the framework starts. * \param arg1 Argument passed to function start_fn. - * \param arg2 Argument passed to function start_fn. * * \return 0 on success or non-zero on failure. */ int spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, - void *arg1, void *arg2); + void *arg1); /** * Perform final shutdown operations on an application using the event framework. diff --git a/lib/event/app.c b/lib/event/app.c index 2b1c09949..2d5a55b40 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -564,7 +564,7 @@ spdk_app_setup_trace(struct spdk_app_opts *opts) int spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, - void *arg1, void *arg2) + void *arg1) { struct spdk_conf *config = NULL; int rc; @@ -655,7 +655,7 @@ spdk_app_start(struct spdk_app_opts *opts, spdk_event_fn start_fn, g_spdk_app.rc = 0; g_init_lcore = spdk_env_get_current_core(); g_delay_subsystem_init = opts->delay_subsystem_init; - g_app_start_event = spdk_event_allocate(g_init_lcore, start_fn, arg1, arg2); + g_app_start_event = spdk_event_allocate(g_init_lcore, start_fn, arg1, NULL); rpc_start_event = spdk_event_allocate(g_init_lcore, spdk_app_start_rpc, (void *)opts->rpc_addr, NULL); diff --git a/lib/rocksdb/env_spdk.cc b/lib/rocksdb/env_spdk.cc index 8c2fe1052..91d9da5ab 100644 --- a/lib/rocksdb/env_spdk.cc +++ b/lib/rocksdb/env_spdk.cc @@ -667,7 +667,7 @@ initialize_spdk(void *arg) struct spdk_app_opts *opts = (struct spdk_app_opts *)arg; int rc; - rc = spdk_app_start(opts, spdk_rocksdb_run, NULL, NULL); + rc = spdk_app_start(opts, spdk_rocksdb_run, NULL); /* * TODO: Revisit for case of internal failure of * spdk_app_start(), itself. At this time, it's known diff --git a/test/app/bdev_svc/bdev_svc.c b/test/app/bdev_svc/bdev_svc.c index e95f95378..946fa1d82 100644 --- a/test/app/bdev_svc/bdev_svc.c +++ b/test/app/bdev_svc/bdev_svc.c @@ -104,7 +104,7 @@ main(int argc, char **argv) g_unaffinitize_thread = true; } - rc = spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id, NULL); + rc = spdk_app_start(&opts, bdev_svc_start, (void *)(intptr_t)opts.shm_id); spdk_app_fini(); diff --git a/test/app/stub/stub.c b/test/app/stub/stub.c index fd4136b55..5defa73c4 100644 --- a/test/app/stub/stub.c +++ b/test/app/stub/stub.c @@ -162,7 +162,7 @@ main(int argc, char **argv) opts.shutdown_cb = stub_shutdown; - ch = spdk_app_start(&opts, stub_start, (void *)(intptr_t)opts.shm_id, NULL); + ch = spdk_app_start(&opts, stub_start, (void *)(intptr_t)opts.shm_id); spdk_app_fini(); return ch; diff --git a/test/bdev/bdevio/bdevio.c b/test/bdev/bdevio/bdevio.c index 771312ae0..ffef2c3b8 100644 --- a/test/bdev/bdevio/bdevio.c +++ b/test/bdev/bdevio/bdevio.c @@ -967,7 +967,7 @@ main(int argc, char **argv) return rc; } - rc = spdk_app_start(&opts, test_main, NULL, NULL); + rc = spdk_app_start(&opts, test_main, NULL); spdk_app_fini(); return rc; diff --git a/test/bdev/bdevperf/bdevperf.c b/test/bdev/bdevperf/bdevperf.c index 0906e95ee..88d6b1443 100644 --- a/test/bdev/bdevperf/bdevperf.c +++ b/test/bdev/bdevperf/bdevperf.c @@ -1150,7 +1150,7 @@ main(int argc, char **argv) g_zcopy = false; } - rc = spdk_app_start(&opts, bdevperf_run, NULL, NULL); + rc = spdk_app_start(&opts, bdevperf_run, NULL); if (rc) { g_run_failed = true; } diff --git a/test/blobfs/fuse/fuse.c b/test/blobfs/fuse/fuse.c index ad1bcf26e..13b956eaa 100644 --- a/test/blobfs/fuse/fuse.c +++ b/test/blobfs/fuse/fuse.c @@ -340,7 +340,7 @@ int main(int argc, char **argv) g_fuse_argc = argc - 2; g_fuse_argv = &argv[2]; - rc = spdk_app_start(&opts, spdk_fuse_run, NULL, NULL); + rc = spdk_app_start(&opts, spdk_fuse_run, NULL); spdk_app_fini(); return rc; diff --git a/test/blobfs/mkfs/mkfs.c b/test/blobfs/mkfs/mkfs.c index 0de638642..8d1ee7166 100644 --- a/test/blobfs/mkfs/mkfs.c +++ b/test/blobfs/mkfs/mkfs.c @@ -142,7 +142,7 @@ int main(int argc, char **argv) exit(rc); } - rc = spdk_app_start(&opts, spdk_mkfs_run, NULL, NULL); + rc = spdk_app_start(&opts, spdk_mkfs_run, NULL); spdk_app_fini(); return rc; diff --git a/test/event/event_perf/event_perf.c b/test/event/event_perf/event_perf.c index bec2591a9..a2f61f733 100644 --- a/test/event/event_perf/event_perf.c +++ b/test/event/event_perf/event_perf.c @@ -174,7 +174,7 @@ main(int argc, char **argv) printf("Running I/O for %d seconds...", g_time_in_sec); fflush(stdout); - rc = spdk_app_start(&opts, event_perf_start, NULL, NULL); + rc = spdk_app_start(&opts, event_perf_start, NULL); spdk_app_fini(); performance_dump(g_time_in_sec); diff --git a/test/event/reactor/reactor.c b/test/event/reactor/reactor.c index 50164cc88..97db5ef41 100644 --- a/test/event/reactor/reactor.c +++ b/test/event/reactor/reactor.c @@ -136,7 +136,7 @@ main(int argc, char **argv) exit(1); } - rc = spdk_app_start(&opts, test_start, NULL, NULL); + rc = spdk_app_start(&opts, test_start, NULL); spdk_app_fini(); diff --git a/test/event/reactor_perf/reactor_perf.c b/test/event/reactor_perf/reactor_perf.c index ade0b5804..0a4e1a7e5 100644 --- a/test/event/reactor_perf/reactor_perf.c +++ b/test/event/reactor_perf/reactor_perf.c @@ -140,7 +140,7 @@ main(int argc, char **argv) opts.shutdown_cb = test_cleanup; - rc = spdk_app_start(&opts, test_start, NULL, NULL); + rc = spdk_app_start(&opts, test_start, NULL); spdk_app_fini();