From 0a08e104cf185bfabc1c461d5ac3148a75d11f47 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 24 Nov 2021 20:40:57 -0500 Subject: [PATCH] spelling: examples Part of #2256 * asymmetric * bookkeeping * current * errors * execution * initialize * initing * management * occurred * operations * prepping * purposes * similar * syncing * terminate Change-Id: I7336d98c1327020ab83c9e01e6bf1e4f5f7b5d7d Signed-off-by: Josh Soref Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/10403 Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Tomasz Zawadzki --- examples/accel/perf/accel_perf.c | 4 ++-- examples/blob/cli/blobcli.c | 4 ++-- examples/blob/hello_world/hello_blob.c | 6 +++--- examples/idxd/perf/perf.c | 2 +- examples/nvme/abort/abort.c | 2 +- examples/nvme/arbitration/arbitration.c | 2 +- examples/nvme/fio_plugin/README.md | 2 +- examples/nvme/fio_plugin/fio_plugin.c | 4 ++-- examples/nvme/identify/identify.c | 4 ++-- examples/nvme/nvme_manage/nvme_manage.c | 2 +- examples/nvme/perf/perf.c | 10 +++++----- examples/nvme/reconnect/reconnect.c | 2 +- examples/nvmf/nvmf/nvmf.c | 4 ++-- 13 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/accel/perf/accel_perf.c b/examples/accel/perf/accel_perf.c index 339c48eb3..50768bd74 100644 --- a/examples/accel/perf/accel_perf.c +++ b/examples/accel/perf/accel_perf.c @@ -512,7 +512,7 @@ _build_batch(struct worker_thread *worker, struct ap_task *task) /* Prep the command re-using the last completed command's task */ rc = _batch_prep_cmd(worker, task, worker_batch); if (rc) { - fprintf(stderr, "error preping command for batch\n"); + fprintf(stderr, "error prepping command for batch\n"); goto error; } @@ -918,7 +918,7 @@ _init_thread(void *arg1) rc = _batch_prep_cmd(worker, task, worker_batch); if (rc) { - fprintf(stderr, "error preping command\n"); + fprintf(stderr, "error prepping command\n"); goto error; } } diff --git a/examples/blob/cli/blobcli.c b/examples/blob/cli/blobcli.c index 2282f95ed..3415a580e 100644 --- a/examples/blob/cli/blobcli.c +++ b/examples/blob/cli/blobcli.c @@ -45,7 +45,7 @@ /* * The following is not a public header file, but the CLI does expose - * some internals of blobstore for dev/debug puposes so we + * some internals of blobstore for dev/debug purposes so we * include it here. */ #include "../lib/blob/blobstore.h" @@ -277,7 +277,7 @@ close_cb(void *arg1, int bserrno) } /* - * Callback function for sync'ing metadata. + * Callback function for syncing metadata. */ static void sync_cb(void *arg1, int bserrno) diff --git a/examples/blob/hello_world/hello_blob.c b/examples/blob/hello_world/hello_blob.c index 0f071ad0d..a579f2cee 100644 --- a/examples/blob/hello_world/hello_blob.c +++ b/examples/blob/hello_world/hello_blob.c @@ -251,7 +251,7 @@ blob_write(struct hello_context_t *hello_context) } /* - * Callback function for sync'ing metadata. + * Callback function for syncing metadata. */ static void sync_complete(void *arg1, int bserrno) @@ -372,7 +372,7 @@ bs_init_complete(void *cb_arg, struct spdk_blob_store *bs, SPDK_NOTICELOG("entry\n"); if (bserrno) { - unload_bs(hello_context, "Error init'ing the blobstore", + unload_bs(hello_context, "Error initing the blobstore", bserrno); return; } @@ -468,7 +468,7 @@ main(int argc, char **argv) * can pass in an spdk_bs_opts if we want something other than * the defaults (cluster size, etc), but here we'll just take the * defaults. We'll also pass in a struct that we'll use for - * callbacks so we've got efficient bookeeping of what we're + * callbacks so we've got efficient bookkeeping of what we're * creating. This is an async operation and bs_init_complete() * will be called when it is complete. */ diff --git a/examples/idxd/perf/perf.c b/examples/idxd/perf/perf.c index 6e9c88f75..0ad6eec81 100644 --- a/examples/idxd/perf/perf.c +++ b/examples/idxd/perf/perf.c @@ -824,7 +824,7 @@ init_idxd_chan_entry(struct idxd_chan_entry *t, struct spdk_idxd_device *idxd) local_qd = spdk_idxd_chan_get_max_operations(t->ch); if (g_queue_depth > local_qd) { fprintf(stdout, - "g_queue_depth is changed from %d to %d because of idxd (%p)'s max operatons per chan=%d\n", + "g_queue_depth is changed from %d to %d because of idxd (%p)'s max operations per chan=%d\n", g_queue_depth, local_qd, idxd, local_qd); g_queue_depth = local_qd; } diff --git a/examples/nvme/abort/abort.c b/examples/nvme/abort/abort.c index d4e9f50b6..c8a6d5568 100644 --- a/examples/nvme/abort/abort.c +++ b/examples/nvme/abort/abort.c @@ -1114,7 +1114,7 @@ cleanup: unregister_controllers(); if (rc != 0) { - fprintf(stderr, "%s: errors occured\n", argv[0]); + fprintf(stderr, "%s: errors occurred\n", argv[0]); } return rc; diff --git a/examples/nvme/arbitration/arbitration.c b/examples/nvme/arbitration/arbitration.c index a8e96b6a5..1a12d5599 100644 --- a/examples/nvme/arbitration/arbitration.c +++ b/examples/nvme/arbitration/arbitration.c @@ -1123,7 +1123,7 @@ main(int argc, char **argv) cleanup(task_count); if (rc != 0) { - fprintf(stderr, "%s: errors occured\n", argv[0]); + fprintf(stderr, "%s: errors occurred\n", argv[0]); } return rc; diff --git a/examples/nvme/fio_plugin/README.md b/examples/nvme/fio_plugin/README.md index 528dc1686..a6058b67d 100644 --- a/examples/nvme/fio_plugin/README.md +++ b/examples/nvme/fio_plugin/README.md @@ -94,7 +94,7 @@ When testing FIO on multiple NVMe SSDs with SPDK plugin, it is recommended to us It has been observed that there are some performance gap between FIO(with SPDK plugin enabled) and SPDK perf (examples/nvme/perf/perf) on testing multiple NVMe SSDs. If you use one job(i.e., use one CPU core) configured for FIO test, the performance is worse than SPDK perf (also using one CPU core) against many NVMe SSDs. But if you use -multiple jobs for FIO test, the performance of FIO is similiar with SPDK perf. After analyzing this phenomenon, we +multiple jobs for FIO test, the performance of FIO is similar with SPDK perf. After analyzing this phenomenon, we think that is caused by the FIO architecture. Mainly FIO can scale with multiple threads (i.e., using CPU cores), but it is not good to use one thread against many I/O devices. diff --git a/examples/nvme/fio_plugin/fio_plugin.c b/examples/nvme/fio_plugin/fio_plugin.c index bd2be763d..55b4bc4c4 100644 --- a/examples/nvme/fio_plugin/fio_plugin.c +++ b/examples/nvme/fio_plugin/fio_plugin.c @@ -1162,7 +1162,7 @@ static int spdk_fio_getevents(struct thread_data *td, unsigned int min, spdk_nvme_qpair_process_completions(fio_qpair->qpair, max - fio_thread->iocq_count); if (fio_thread->iocq_count >= min) { - /* reset the currrent handling qpair */ + /* reset the current handling qpair */ fio_thread->fio_qpair_current = fio_qpair; return fio_thread->iocq_count; } @@ -1182,7 +1182,7 @@ static int spdk_fio_getevents(struct thread_data *td, unsigned int min, } } - /* reset the currrent handling qpair */ + /* reset the current handling qpair */ fio_thread->fio_qpair_current = fio_qpair; return fio_thread->iocq_count; } diff --git a/examples/nvme/identify/identify.c b/examples/nvme/identify/identify.c index e42c0b6c7..43f64f1a4 100644 --- a/examples/nvme/identify/identify.c +++ b/examples/nvme/identify/identify.c @@ -1476,7 +1476,7 @@ print_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_transport printf("Asymmetric Namespace Access Log Page: Supported\n"); printf("ANA Transition Time : %u sec\n", cdata->anatt); printf("\n"); - printf("Aymmetric Namespace Access Capabilities\n"); + printf("Asymmetric Namespace Access Capabilities\n"); printf(" ANA Optimized State : %s\n", cdata->anacap.ana_optimized_state ? "Supported" : "Not Supported"); printf(" ANA Non-Optimized State : %s\n", @@ -1862,7 +1862,7 @@ print_controller(struct spdk_nvme_ctrlr *ctrlr, const struct spdk_nvme_transport } else { printf("Not Reported\n"); } - printf("Maximum Thermal Managment Temperature: "); + printf("Maximum Thermal Management Temperature: "); if (cdata->mxtmt) { printf("%u Kelvin (%d Celsius)\n", cdata->mxtmt, (int)cdata->mxtmt - 273); } else { diff --git a/examples/nvme/nvme_manage/nvme_manage.c b/examples/nvme/nvme_manage/nvme_manage.c index 2f6de54ad..236311761 100644 --- a/examples/nvme/nvme_manage/nvme_manage.c +++ b/examples/nvme/nvme_manage/nvme_manage.c @@ -1445,7 +1445,7 @@ opal_revert_tper(struct dev *iter) return; } printf("Please be noted this operation will erase ALL DATA on this drive\n"); - printf("Please don't ternminate this excecution. Otherwise undefined error may occur\n"); + printf("Please don't terminate this execution. Otherwise undefined error may occur\n"); printf("Please input password for revert TPer:"); while ((ch = getchar()) != '\n' && ch != EOF); passwd_p = get_line(passwd, SPDK_OPAL_MAX_PASSWORD_SIZE, stdin, true); diff --git a/examples/nvme/perf/perf.c b/examples/nvme/perf/perf.c index 10c255857..a549e2b22 100644 --- a/examples/nvme/perf/perf.c +++ b/examples/nvme/perf/perf.c @@ -2270,8 +2270,8 @@ static const struct option g_perf_cmdline_opts[] = { {"io-unit-size", required_argument, NULL, PERF_IO_UNIT_SIZE}, #define PERF_IO_QUEUES_PER_NS 'P' {"num-qpairs", required_argument, NULL, PERF_IO_QUEUES_PER_NS}, -#define PERF_SKIP_ERRRORS 'Q' - {"skip-errors", required_argument, NULL, PERF_SKIP_ERRRORS}, +#define PERF_SKIP_ERRORS 'Q' + {"skip-errors", required_argument, NULL, PERF_SKIP_ERRORS}, #define PERF_ENABLE_URING 'R' {"enable-uring", no_argument, NULL, PERF_ENABLE_URING}, #define PERF_DEFAULT_SOCK_IMPL 'S' @@ -2315,7 +2315,7 @@ parse_args(int argc, char **argv, struct spdk_env_opts *env_opts) case PERF_TIME: case PERF_RW_MIXREAD: case PERF_NUM_UNUSED_IO_QPAIRS: - case PERF_SKIP_ERRRORS: + case PERF_SKIP_ERRORS: val = spdk_strtol(optarg, 10); if (val < 0) { fprintf(stderr, "Converting a string to integer failed\n"); @@ -2356,7 +2356,7 @@ parse_args(int argc, char **argv, struct spdk_env_opts *env_opts) g_rw_percentage = val; g_mix_specified = true; break; - case PERF_SKIP_ERRRORS: + case PERF_SKIP_ERRORS: g_quiet_count = val; break; case PERF_NUM_UNUSED_IO_QPAIRS: @@ -2959,7 +2959,7 @@ cleanup: pthread_mutex_destroy(&g_stats_mutex); if (rc != 0) { - fprintf(stderr, "%s: errors occured\n", argv[0]); + fprintf(stderr, "%s: errors occurred\n", argv[0]); } return rc; diff --git a/examples/nvme/reconnect/reconnect.c b/examples/nvme/reconnect/reconnect.c index b31c724bd..5f5370d76 100644 --- a/examples/nvme/reconnect/reconnect.c +++ b/examples/nvme/reconnect/reconnect.c @@ -1160,7 +1160,7 @@ cleanup: unregister_workers(); if (rc != 0) { - fprintf(stderr, "%s: errors occured\n", argv[0]); + fprintf(stderr, "%s: errors occurred\n", argv[0]); /* * return a generic error to the caller. This allows us to * distinguish between a failure in the script and something diff --git a/examples/nvmf/nvmf/nvmf.c b/examples/nvmf/nvmf/nvmf.c index 448aeb905..abff0c16e 100644 --- a/examples/nvmf/nvmf/nvmf.c +++ b/examples/nvmf/nvmf/nvmf.c @@ -399,7 +399,7 @@ nvmf_init_threads(void) return -1; } - fprintf(stdout, "nvmf threads initlize successfully\n"); + fprintf(stdout, "nvmf threads initialize successfully\n"); return 0; err_exit: @@ -765,7 +765,7 @@ nvmf_target_advance_state(void) switch (g_target_state) { case NVMF_INIT_SUBSYSTEM: - /* initlize the bdev layer */ + /* initialize the bdev layer */ spdk_subsystem_init(nvmf_subsystem_init_done, NULL); return; case NVMF_INIT_TARGET: