diff options
author | Rickard Green <rickard@erlang.org> | 2020-02-24 11:35:23 +0100 |
---|---|---|
committer | Rickard Green <rickard@erlang.org> | 2020-02-24 11:35:23 +0100 |
commit | 6f4f0faac0b0d34e09246fd1f067dbad37dec300 (patch) | |
tree | 9fb21259665107cc2bbc7d6c50964355e5598a4d | |
parent | 9b83b5b3f4df355ca3f2551cc5001a90cb8e9a90 (diff) | |
parent | 8fa3635514b7ab1aa6ce14fdf8327aff4b5c46fd (diff) | |
download | erlang-6f4f0faac0b0d34e09246fd1f067dbad37dec300.tar.gz |
Merge branch 'rickard/+SDio-range/OTP-16481' into maint
* rickard/+SDio-range/OTP-16481:
Fix valid range for +SDio
-rw-r--r-- | erts/doc/src/erl.xml | 2 | ||||
-rw-r--r-- | erts/emulator/beam/erl_init.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml index 174a40b929..a37707f7f9 100644 --- a/erts/doc/src/erl.xml +++ b/erts/doc/src/erl.xml @@ -1053,7 +1053,7 @@ <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 + Valid range is 1-1024. By default, the number of dirty I/O scheduler threads created is 10.</p> <p>The amount of dirty IO schedulers is not limited by the amount of normal schedulers <seealso marker="#+SDcpu">like the amount of diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c index 547e4064a2..5f0352f5c0 100644 --- a/erts/emulator/beam/erl_init.c +++ b/erts/emulator/beam/erl_init.c @@ -694,7 +694,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", @@ -1054,7 +1054,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", |