diff options
| author | Rickard Green <[email protected]> | 2011-11-30 13:59:14 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2011-11-30 13:59:14 +0100 |
| commit | c2c93dd69c0d66a836ec938aeabbc7130960e445 (patch) | |
| tree | 119903c273301f6c2121d010d9b3957d01d70af4 /erts/emulator/beam/erl_cpu_topology.c | |
| parent | 9b4bc065ba9fb47a9573d5e11f306452a65df3f1 (diff) | |
| parent | 58f5f45566b827e74ff623398bdf6d0b6fcebdb3 (diff) | |
| download | otp-c2c93dd69c0d66a836ec938aeabbc7130960e445.tar.gz otp-c2c93dd69c0d66a836ec938aeabbc7130960e445.tar.bz2 otp-c2c93dd69c0d66a836ec938aeabbc7130960e445.zip | |
Merge branch 'rickard/default-unbound/OTP-9726'
* rickard/default-unbound/OTP-9726:
Use unbound schedulers as default
Diffstat (limited to 'erts/emulator/beam/erl_cpu_topology.c')
| -rw-r--r-- | erts/emulator/beam/erl_cpu_topology.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/erts/emulator/beam/erl_cpu_topology.c b/erts/emulator/beam/erl_cpu_topology.c index 03c0ef904a..cc930ba1e3 100644 --- a/erts/emulator/beam/erl_cpu_topology.c +++ b/erts/emulator/beam/erl_cpu_topology.c @@ -1729,16 +1729,8 @@ erts_init_cpu_topology(void) scheduler2cpu_map[ix].bound_id = -1; } - if (cpu_bind_order == ERTS_CPU_BIND_UNDEFINED) { - int ncpus = erts_get_cpu_configured(cpuinfo); - if (ncpus < 1 || erts_no_schedulers < ncpus) - cpu_bind_order = ERTS_CPU_BIND_NONE; - else - cpu_bind_order = ((system_cpudata || user_cpudata) - && (erts_bind_to_cpu(cpuinfo, -1) != -ENOTSUP) - ? ERTS_CPU_BIND_DEFAULT_BIND - : ERTS_CPU_BIND_NONE); - } + if (cpu_bind_order == ERTS_CPU_BIND_UNDEFINED) + cpu_bind_order = ERTS_CPU_BIND_NONE; reader_groups_map = add_cpu_groups(reader_groups, reader_groups_callback, |