diff options
| author | Bruce Yinhe <[email protected]> | 2014-10-28 09:35:04 +0100 |
|---|---|---|
| committer | Bruce Yinhe <[email protected]> | 2014-10-28 09:35:04 +0100 |
| commit | 3f5685c7354dc481294013cf86d2f9621300c139 (patch) | |
| tree | 734f08db013df554ffdb85bbe41ad0cb1a560568 | |
| parent | 51250a4c8a3d0b9998820221b8f2f93ae275649e (diff) | |
| parent | c8ae3f2797d9c613e07b916683c51efea2da81aa (diff) | |
| download | otp-3f5685c7354dc481294013cf86d2f9621300c139.tar.gz otp-3f5685c7354dc481294013cf86d2f9621300c139.tar.bz2 otp-3f5685c7354dc481294013cf86d2f9621300c139.zip | |
Merge branch 'pguyot/fix-freebsd-cpu-topology' into maint
OTP-12267
* pguyot/fix-freebsd-cpu-topology:
Fix bug in FreeBSD topology detection code
| -rw-r--r-- | erts/lib_src/common/erl_misc_utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/lib_src/common/erl_misc_utils.c b/erts/lib_src/common/erl_misc_utils.c index d58a28b5cb..7833dd8219 100644 --- a/erts/lib_src/common/erl_misc_utils.c +++ b/erts/lib_src/common/erl_misc_utils.c @@ -1515,7 +1515,7 @@ const char* parse_topology_spec_group(erts_cpu_info_t *cpuinfo, const char* xml, if (is_thread_group) { thread++; } else { - *core_p = (*core_p)++; + *core_p = (*core_p) + 1; } index_procs++; } @@ -1535,9 +1535,9 @@ const char* parse_topology_spec_group(erts_cpu_info_t *cpuinfo, const char* xml, if (parentCacheLevel == 0) { *core_p = 0; - *processor_p = (*processor_p)++; + *processor_p = (*processor_p) + 1; } else { - *core_p = (*core_p)++; + *core_p = (*core_p) + 1; } if (error) |