diff --git a/CHANGELOG.md b/CHANGELOG.md index 45b0980..7363a38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 4.14.12 | 2019-10-14 | getCpu() fixed multi socket detection (linux) | | 4.14.11 | 2019-10-01 | type definitions fix dockerInfo | | 4.14.10 | 2019-10-01 | type definitions fix memLayout | | 4.14.9 | 2019-10-01 | `processLoad()` fix windows | diff --git a/README.md b/README.md index ce10d1a..90e52ac 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ [![Caretaker][caretaker-image]][caretaker-url] [![MIT license][license-img]][license-url] -**2019-03-12** - 5th birthday of systeminformation. This is amazing. Started as a small projekt just for myself, it now has > 8,000 lines of code, > 200 versions published, up to 100,000 downloads per month, > 1 Mio downloads overall. Thank you to all who contributed to this project! +This is amazing. Started as a small projekt just for myself, it now has > 9,000 lines of code, > 200 versions published, up to 150,000 downloads per month, > 1 Mio downloads overall. Thank you to all who contributed to this project! ## New Version 4.0 diff --git a/docs/history.html b/docs/history.html index fc5914f..75eb7e6 100644 --- a/docs/history.html +++ b/docs/history.html @@ -83,6 +83,11 @@ + + 4.14.12 + 2019-10-14 + getCpu() fixed multi socket detection (linux) + 4.14.11 2019-10-01 diff --git a/docs/index.html b/docs/index.html index dc1f279..a2edab7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -168,7 +168,7 @@
systeminformation
-
Current Version: 4.14.11
+
Current Version: 4.14.12
@@ -199,7 +199,7 @@
Downloads last month
-
192
+
200
Dependends
diff --git a/lib/cpu.js b/lib/cpu.js index 26a6f0e..21c7930 100644 --- a/lib/cpu.js +++ b/lib/cpu.js @@ -336,31 +336,6 @@ function getCpu() { result.socket = util.getValue(lines2, 'Upgrade').replace('Socket', '').trim(); } resolve(result); - - // // # processurs & # threads/core - method 1 - // let threadsPerCoreInt = 0; - // let lines3 = []; - // exec('cat /proc/cpuinfo | grep -E "physical id|core id"', function (error2, stdout3) { - // lines3 = stdout3.toString().split('\n'); - // if (lines3 && lines3.length) { - // result.processors = util.countUniqueLines(lines3, 'physical id') || 1; - // result.physicalCores = util.countLinesStartingWith(lines3, 'core id') / result.processors; - // if (result.physicalCores) { - // threadsPerCoreInt = result.cores / result.physicalCores; - // } - // } - // // # threads/core - method 2 - // if (threadsPerCoreInt === 0) { - // const threadsPerCore = util.getValue(lines, 'thread(s) per core'); - // if (threadsPerCore) { - // threadsPerCoreInt = parseInt(threadsPerCore, 10); - // if (!isNaN(threadsPerCoreInt)) { - // result.physicalCores = result.cores / threadsPerCoreInt; - // } - // } - // } - // resolve(result); - // }); }); }); } diff --git a/lib/util.js b/lib/util.js index 7d49b45..a72e1cd 100644 --- a/lib/util.js +++ b/lib/util.js @@ -455,11 +455,6 @@ function countUniqueLines(lines, startingWith) { return uniqueLines.length; } -// function countLinesStartingWith(lines, startingWith) { -// startingWith = startingWith || ''; -// return lines.filter(el => el.startsWith(startingWith)).length; -// } - function noop() { } exports.toInt = toInt;