Merge ef9b42e into ad3ed12

oshi · May 16, 2020 · dc76f77 · dc76f77
2 parents ad3ed12 + ef9b42e
commit dc76f77
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/oshi-core/src/main/java/oshi/hardware/platform/linux/LinuxVirtualMemory.java b/oshi-core/src/main/java/oshi/hardware/platform/linux/LinuxVirtualMemory.java
@@ -126,10 +126,10 @@ private static Pair<Long, Long> queryVmStat() {
             String[] memorySplit = ParseUtil.whitespaces.split(checkLine);
             if (memorySplit.length > 1) {
                 switch (memorySplit[0]) {
-                case "pgpgin":
+                case "pswpin":
                     swapPagesIn = ParseUtil.parseLongOrDefault(memorySplit[1], 0L);
                     break;
-                case "pgpgout":
+                case "pswpout":
                     swapPagesOut = ParseUtil.parseLongOrDefault(memorySplit[1], 0L);
                     break;
                 default:

diff --git a/oshi-core/src/main/java/oshi/hardware/platform/unix/solaris/SolarisVirtualMemory.java b/oshi-core/src/main/java/oshi/hardware/platform/unix/solaris/SolarisVirtualMemory.java
@@ -101,15 +101,15 @@ public long getSwapPagesOut() {
 
     private static long queryPagesIn() {
         long swapPagesIn = 0L;
-        for (String s : ExecutingCommand.runNative("kstat -p cpu_stat:::pgpgin")) {
+        for (String s : ExecutingCommand.runNative("kstat -p cpu_stat:::pgswapin")) {
             swapPagesIn += ParseUtil.parseLastLong(s, 0L);
         }
         return swapPagesIn;
     }
 
     private static long queryPagesOut() {
         long swapPagesOut = 0L;
-        for (String s : ExecutingCommand.runNative("kstat -p cpu_stat:::pgpgout")) {
+        for (String s : ExecutingCommand.runNative("kstat -p cpu_stat:::pgswapout")) {
             swapPagesOut += ParseUtil.parseLastLong(s, 0L);
         }
         return swapPagesOut;