systeminformation 5.7.11 → 5.8.0

package/CHANGELOG.md

@@ -77,6 +77,10 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 5.8.0          | 2021-08-02     | `disksIO()` added waitTime, waitPercent (linux) |
+| 5.7.14         | 2021-08-01     | `cpu()` cache calculation fix (linux) |
+| 5.7.13         | 2021-07-28     | `osInfo()` fix uefi detection (win) |
+| 5.7.12         | 2021-07-27     | `osInfo()` fix uefi detection (win) |
 | 5.7.11         | 2021-07-27     | typescript typings fix `bluetoothDevices()` |
 | 5.7.10         | 2021-07-26     | typescript typings fix `processLoad()` |
 | 5.7.9          | 2021-07-25     | `uuid()` better regedit path detection (win) |

package/README.md

@@ -103,6 +103,7 @@ si.cpu()
 
 (last 7 major and minor version releases)
 
+- Version 5.8.0: `disksIO()` added waitTime, waitPercent (linux)
 - Version 5.7.0: `diskLayout()` added S.M.A.R.T for Windows (if installed)
 - Version 5.6.0: `cpuTemperature()` added added socket and chipset temp (linux)
 - Version 5.5.0: `dockerVolumes()` added
@@ -446,6 +447,12 @@ Full function reference with examples can be found at [https://systeminformation
 | | rIO_sec | X |  | X |  |  | read IO per sec (* see notes) |
 | | wIO_sec | X |  | X |  |  | write IO per sec (* see notes) |
 | | tIO_sec | X |  | X |  |  | total IO per sec (* see notes) |
+| | rWaitTime | X |  |  |  |  | read IO request time (* see notes) |
+| | wWaitTime | X |  |  |  |  | write IO request time (* see notes) |
+| | tWaitTime | X |  |  |  |  | total IO request time (* see notes) |
+| | rWaitPercent | X |  |  |  |  | read IO request time percent (* see notes) |
+| | wWaitPercent | X |  |  |  |  | write IO request time percent (* see notes) |
+| | tWaitPercent | X |  |  |  |  | total IO request time percent (* see notes) |
 | | ms | X |  | X |  |  | interval length (for per second values) |
 | si.fsSize(cb) | [{...}] | X | X | X | X |  | returns array of mounted file systems |
 | | [0].fs | X | X | X | X |  | name of file system |

package/lib/cpu.js

@@ -636,13 +636,13 @@ function getCpu() {
             result.stepping = util.getValue(lines, 'stepping');
             result.revision = util.getValue(lines, 'cpu revision');
             result.cache.l1d = util.getValue(lines, 'l1d cache');
-            if (result.cache.l1d) { result.cache.l1d = parseInt(result.cache.l1d) * (result.cache.l1d.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l1d) { result.cache.l1d = parseInt(result.cache.l1d) * (result.cache.l1d.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l1d.indexOf('K') !== -1 ? 1024 : 1)); }
             result.cache.l1i = util.getValue(lines, 'l1i cache');
-            if (result.cache.l1i) { result.cache.l1i = parseInt(result.cache.l1i) * (result.cache.l1i.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l1i) { result.cache.l1i = parseInt(result.cache.l1i) * (result.cache.l1i.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l1i.indexOf('K') !== -1 ? 1024 : 1)); }
             result.cache.l2 = util.getValue(lines, 'l2 cache');
-            if (result.cache.l2) { result.cache.l2 = parseInt(result.cache.l2) * (result.cache.l2.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l2) { result.cache.l2 = parseInt(result.cache.l2) * (result.cache.l2.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l2.indexOf('K') !== -1 ? 1024 : 1)); }
             result.cache.l3 = util.getValue(lines, 'l3 cache');
-            if (result.cache.l3) { result.cache.l3 = parseInt(result.cache.l3) * (result.cache.l3.indexOf('K') !== -1 ? 1024 : 1); }
+            if (result.cache.l3) { result.cache.l3 = parseInt(result.cache.l3) * (result.cache.l3.indexOf('M') !== -1 ? 1024 * 1024 : (result.cache.l3.indexOf('K') !== -1 ? 1024 : 1)); }
 
             const threadsPerCore = util.getValue(lines, 'thread(s) per core') || '1';
             // const coresPerSocketInt = parseInt(util.getValue(lines, 'cores(s) per socket') || '1', 10);
@@ -1285,16 +1285,16 @@ function cpuCache(callback) {
               lines.forEach(function (line) {
                 let parts = line.split(':');
                 if (parts[0].toUpperCase().indexOf('L1D CACHE') !== -1) {
-                  result.l1d = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l1d = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
                 if (parts[0].toUpperCase().indexOf('L1I CACHE') !== -1) {
-                  result.l1i = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l1i = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
                 if (parts[0].toUpperCase().indexOf('L2 CACHE') !== -1) {
-                  result.l2 = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l2 = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
                 if (parts[0].toUpperCase().indexOf('L3 CACHE') !== -1) {
-                  result.l3 = parseInt(parts[1].trim()) * (parts[1].indexOf('K') !== -1 ? 1024 : 1);
+                  result.l3 = parseInt(parts[1].trim()) * (parts[1].indexOf('M') !== -1 ? 1024 * 1024 : (parts[1].indexOf('K') !== -1 ? 1024 : 1));
                 }
               });
             }

package/lib/filesystem.js

@@ -590,7 +590,7 @@ function fsStats(callback) {
 
 exports.fsStats = fsStats;
 
-function calcDiskIO(rIO, wIO) {
+function calcDiskIO(rIO, wIO, rWaitTime, wWaitTime, tWaitTime) {
   let result = {
     rIO: 0,
     wIO: 0,
@@ -598,6 +598,12 @@ function calcDiskIO(rIO, wIO) {
     rIO_sec: null,
     wIO_sec: null,
     tIO_sec: null,
+    rWaitTime: 0,
+    wWaitTime: 0,
+    tWaitTime: 0,
+    rWaitPercent: null,
+    wWaitPercent: null,
+    tWaitPercent: null,
     ms: 0
   };
   if (_disk_io && _disk_io.ms) {
@@ -608,22 +614,43 @@ function calcDiskIO(rIO, wIO) {
     result.rIO_sec = (result.rIO - _disk_io.rIO) / (result.ms / 1000);
     result.wIO_sec = (result.wIO - _disk_io.wIO) / (result.ms / 1000);
     result.tIO_sec = result.rIO_sec + result.wIO_sec;
+    result.rWaitTime = rWaitTime;
+    result.wWaitTime = wWaitTime;
+    result.tWaitTime = tWaitTime;
+    result.rWaitPercent = (result.rWaitTime - _disk_io.rWaitTime) * 100 / (result.ms);
+    result.wWaitPercent = (result.wWaitTime - _disk_io.wWaitTime) * 100 / (result.ms);
+    result.tWaitPercent = (result.tWaitTime - _disk_io.tWaitTime) * 100 / (result.ms);
     _disk_io.rIO = rIO;
     _disk_io.wIO = wIO;
     _disk_io.rIO_sec = result.rIO_sec;
     _disk_io.wIO_sec = result.wIO_sec;
     _disk_io.tIO_sec = result.tIO_sec;
+    _disk_io.rWaitTime = rWaitTime;
+    _disk_io.wWaitTime = wWaitTime;
+    _disk_io.tWaitTime = tWaitTime;
+    _disk_io.rWaitPercent = result.rWaitPercent;
+    _disk_io.wWaitPercent = result.wWaitPercent;
+    _disk_io.tWaitPercent = result.tWaitPercent;
     _disk_io.last_ms = result.ms;
     _disk_io.ms = Date.now();
   } else {
     result.rIO = rIO;
     result.wIO = wIO;
     result.tIO = rIO + wIO;
+    result.rWaitTime = rWaitTime;
+    result.wWaitTime = wWaitTime;
+    result.tWaitTime = tWaitTime;
     _disk_io.rIO = rIO;
     _disk_io.wIO = wIO;
     _disk_io.rIO_sec = null;
     _disk_io.wIO_sec = null;
     _disk_io.tIO_sec = null;
+    _disk_io.rWaitTime = rWaitTime;
+    _disk_io.wWaitTime = wWaitTime;
+    _disk_io.tWaitTime = tWaitTime;
+    _disk_io.rWaitPercent = null;
+    _disk_io.wWaitPercent = null;
+    _disk_io.tWaitPercent = null;
     _disk_io.last_ms = 0;
     _disk_io.ms = Date.now();
   }
@@ -648,10 +675,19 @@ function disksIO(callback) {
         rIO_sec: null,
         wIO_sec: null,
         tIO_sec: null,
+        rWaitTime: 0,
+        wWaitTime: 0,
+        tWaitTime: 0,
+        rWaitPercent: null,
+        wWaitPercent: null,
+        tWaitPercent: null,
         ms: 0
       };
       let rIO = 0;
       let wIO = 0;
+      let rWaitTime = 0;
+      let wWaitTime = 0;
+      let tWaitTime = 0;
 
       if ((_disk_io && !_disk_io.ms) || (_disk_io && _disk_io.ms && Date.now() - _disk_io.ms >= 500)) {
         if (_linux || _freebsd || _openbsd || _netbsd) {
@@ -671,8 +707,11 @@ function disksIO(callback) {
                 let stats = line.split(';');
                 rIO += parseInt(stats[0]);
                 wIO += parseInt(stats[4]);
+                rWaitTime += parseInt(stats[3]);
+                wWaitTime += parseInt(stats[7]);
+                tWaitTime += parseInt(stats[10]);
               });
-              result = calcDiskIO(rIO, wIO);
+              result = calcDiskIO(rIO, wIO, rWaitTime, wWaitTime, tWaitTime);
 
               if (callback) {
                 callback(result);
@@ -699,7 +738,7 @@ function disksIO(callback) {
                   wIO += parseInt(line[0]);
                 }
               });
-              result = calcDiskIO(rIO, wIO);
+              result = calcDiskIO(rIO, wIO, rWaitTime, wWaitTime, tWaitTime);
             }
             if (callback) {
               callback(result);
@@ -715,6 +754,12 @@ function disksIO(callback) {
         result.rIO_sec = _disk_io.rIO_sec;
         result.wIO_sec = _disk_io.wIO_sec;
         result.tIO_sec = _disk_io.tIO_sec;
+        result.rWaitTime = _disk_io.rWaitTime;
+        result.wWaitTime = _disk_io.wWaitTime;
+        result.tWaitTime = _disk_io.tWaitTime;
+        result.rWaitPercent = _disk_io.rWaitPercent;
+        result.wWaitPercent = _disk_io.wWaitPercent;
+        result.tWaitPercent = _disk_io.tWaitPercent;
         if (callback) {
           callback(result);
         }

package/lib/osinfo.js

@@ -365,14 +365,14 @@ function isUefiLinux() {
     process.nextTick(() => {
       fs.stat('/sys/firmware/efi', function (err) {
         if (!err) {
-          resolve(true);
+          return resolve(true);
         } else {
           exec('dmesg | grep -E "EFI v"', function (error, stdout) {
             if (!error) {
               const lines = stdout.toString().split('\n');
-              resolve(lines.length > 0);
+              return resolve(lines.length > 0);
             }
-            resolve(false);
+            return resolve(false);
           });
         }
       });
@@ -387,21 +387,20 @@ function isUefiWindows() {
         exec('findstr /C:"Detected boot environment" "%windir%\\Panther\\setupact.log"', util.execOptsWin, function (error, stdout) {
           if (!error) {
             const line = stdout.toString().split('\n\r')[0];
-            resolve(line.toLowerCase().indexOf('efi') >= 0);
-            return;
+            return resolve(line.toLowerCase().indexOf('efi') >= 0);
           } else {
             exec('echo %firmware_type%', util.execOptsWin, function (error, stdout) {
               if (!error) {
                 const line = stdout.toString() || '';
-                resolve(line.toLowerCase().indexOf('efi') >= 0);
+                return resolve(line.toLowerCase().indexOf('efi') >= 0);
+              } else {
+                return resolve(false);
               }
-              resolve(false);
             });
           }
-          resolve(false);
         });
       } catch (e) {
-        resolve(false);
+        return resolve(false);
       }
     });
   });
@@ -1015,18 +1014,18 @@ function shell(callback) {
     process.nextTick(() => {
       if (_windows) {
         resolve('cmd');
+      } else {
+        let result = '';
+        exec('echo $SHELL', function (error, stdout) {
+          if (!error) {
+            result = stdout.toString().split('\n')[0];
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
       }
-
-      let result = '';
-      exec('echo $SHELL', function (error, stdout) {
-        if (!error) {
-          result = stdout.toString().split('\n')[0];
-        }
-        if (callback) {
-          callback(result);
-        }
-        resolve(result);
-      });
     });
   });
 }

package/lib/processes.js

@@ -33,18 +33,24 @@ const _sunos = (_platform === 'sunos');
 
 const _processes_cpu = {
   all: 0,
+  all_utime: 0,
+  all_stime: 0,
   list: {},
   ms: 0,
   result: {}
 };
 const _services_cpu = {
   all: 0,
+  all_utime: 0,
+  all_stime: 0,
   list: {},
   ms: 0,
   result: {}
 };
 const _process_cpu = {
   all: 0,
+  all_utime: 0,
+  all_stime: 0,
   list: {},
   ms: 0,
   result: {}
@@ -471,10 +477,10 @@ function calcProcStatWin(procStat, all, _cpu_old) {
   }
   return {
     pid: procStat.pid,
-    utime: procStat.utime,
-    stime: procStat.stime,
-    cpuu: cpuu,
-    cpus: cpus
+    utime: cpuu > 0 ? procStat.utime : 0,
+    stime: cpus > 0 ? procStat.stime : 0,
+    cpuu: cpuu > 0 ? cpuu : 0,
+    cpus: cpus > 0 ? cpus : 0
   };
 }
 
@@ -788,8 +794,8 @@ function processes(callback) {
                 let procs = [];
                 let procStats = [];
                 let list_new = {};
-                let allcpuu = 0;
-                let allcpus = 0;
+                let allcpuu = _processes_cpu.all_utime;
+                let allcpus = _processes_cpu.all_stime;
                 for (let i = 0; i < processSections.length; i++) {
                   if (processSections[i].trim() !== '') {
                     let lines = processSections[i].trim().split('\r\n');
@@ -862,6 +868,8 @@ function processes(callback) {
                 }
                 // store old values
                 _processes_cpu.all = allcpuu + allcpus;
+                _processes_cpu.all_utime = allcpuu;
+                _processes_cpu.all_stime = allcpus;
                 // _processes_cpu.list = list_new;
                 _processes_cpu.list = Object.assign({}, list_new);
                 _processes_cpu.ms = Date.now() - _processes_cpu.ms;
@@ -953,8 +961,8 @@ function processLoad(proc, callback) {
                 let processSections = stdout.split(/\n\s*\n/);
                 let procStats = [];
                 let list_new = {};
-                let allcpuu = 0;
-                let allcpus = 0;
+                let allcpuu = _process_cpu.all_utime;
+                let allcpus = _process_cpu.all_stime;
 
                 // go through all processes
                 for (let i = 0; i < processSections.length; i++) {
@@ -1051,6 +1059,8 @@ function processLoad(proc, callback) {
                 }
                 // store old values
                 _process_cpu.all = allcpuu + allcpus;
+                _process_cpu.all_utime = allcpuu;
+                _process_cpu.all_stime = allcpus;
                 // _process_cpu.list = list_new;
                 _process_cpu.list = Object.assign({}, list_new);
                 _process_cpu.ms = Date.now() - _process_cpu.ms;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systeminformation",
-  "version": "5.7.11",
+  "version": "5.8.0",
   "description": "Simple system and OS information library",
   "license": "MIT",
   "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",