diff options
| author | Erlang/OTP <otp@erlang.org> | 2020-03-04 08:23:49 +0100 |
|---|---|---|
| committer | Erlang/OTP <otp@erlang.org> | 2020-03-04 08:23:49 +0100 |
| commit | b3f5b04e05fedfc5a05e8121c225cc1ebbd39403 (patch) | |
| tree | 0fb27ebd34b66bbc8a2d2f901bc3e0402cbe5f3e | |
| parent | b782c794514ef154dac73959d60edc14452cffe1 (diff) | |
| parent | 8fa3635514b7ab1aa6ce14fdf8327aff4b5c46fd (diff) | |
| download | erlang-b3f5b04e05fedfc5a05e8121c225cc1ebbd39403.tar.gz | |
Merge branch 'rickard/+SDio-range/OTP-16481' into maint-21
* rickard/+SDio-range/OTP-16481:
Fix valid range for +SDio
# Conflicts:
# erts/doc/src/erl.xml
| -rw-r--r-- | erts/doc/src/erl.xml | 4 | ||||
| -rw-r--r-- | erts/emulator/beam/erl_init.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 133f160dc9..9a6c0a41a5 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -1016,8 +1016,8 @@ </item> <tag><marker id="+SDio"/><c><![CDATA[+SDio DirtyIOSchedulers]]></c></tag> <item> - <p>Sets the number of dirty I/O scheduler threads to create. - Valid range is 0-1024. By + <p>Sets the number of dirty I/O scheduler threads to create. + Valid range is 1-1024. By default, the number of dirty I/O scheduler threads created is 10, same as the default number of threads in the <seealso marker="#async_thread_pool_size">async thread pool</seealso>.</p> diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 163724ed3c..94eb3d5e35 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -707,7 +707,7 @@ void erts_usage(void) erts_fprintf(stderr, "-SDPcpu p1:p2 specify dirty CPU schedulers (p1) and dirty CPU schedulers\n"); erts_fprintf(stderr, " online (p2) as percentages of logical processors configured\n"); erts_fprintf(stderr, " and logical processors available, respectively\n"); - erts_fprintf(stderr, "-SDio n set number of dirty I/O schedulers, valid range is [0-%d]\n", + erts_fprintf(stderr, "-SDio n set number of dirty I/O schedulers, valid range is [1-%d]\n", ERTS_MAX_NO_OF_DIRTY_IO_SCHEDULERS); erts_fprintf(stderr, "-t size set the maximum number of atoms the emulator can handle\n"); erts_fprintf(stderr, " valid range is [%d-%d]\n", @@ -1052,7 +1052,7 @@ early_init(int *argc, char **argv) /* } else if (sys_strncmp(type, "io", 2) == 0) { arg = get_arg(argv[i]+5, argv[i+1], &i); dirty_io_scheds = atoi(arg); - if (dirty_io_scheds < 0 || + if (dirty_io_scheds < 1 || dirty_io_scheds > ERTS_MAX_NO_OF_DIRTY_IO_SCHEDULERS) { erts_fprintf(stderr, "bad number of dirty I/O schedulers %s\n", |