diff --git a/Zutil.jar b/Zutil.jar index 4e9d938..50bf421 100644 Binary files a/Zutil.jar and b/Zutil.jar differ diff --git a/src/zutil/osal/app/linux/ProcDiskstats.java b/src/zutil/osal/app/linux/ProcDiskstats.java index de92104..b466073 100644 --- a/src/zutil/osal/app/linux/ProcDiskstats.java +++ b/src/zutil/osal/app/linux/ProcDiskstats.java @@ -55,7 +55,7 @@ public class ProcDiskstats { BufferedReader in = new BufferedReader(new FileReader(PROC_PATH)); String line = null; while((line=in.readLine()) != null){ - String[] str = line.trim().split("\\W+", 4); + String[] str = line.trim().split("\\s+", 4); if(str.length >= 4) { String devName = str[2]; if(!hdds.containsKey(devName)){ @@ -112,7 +112,7 @@ public class ProcDiskstats { writeThroughput = new ThroughputCalculator(); } protected void update(String line){ - String[] stats = line.split("\\W+"); + String[] stats = line.split("\\s+"); if(stats.length >= 11){ readIO = Long.parseLong(stats[0]); readMerges = Long.parseLong(stats[1]); diff --git a/src/zutil/osal/app/linux/ProcStat.java b/src/zutil/osal/app/linux/ProcStat.java index 1d48f04..36d9198 100644 --- a/src/zutil/osal/app/linux/ProcStat.java +++ b/src/zutil/osal/app/linux/ProcStat.java @@ -57,7 +57,7 @@ public class ProcStat { BufferedReader in = new BufferedReader(new FileReader(PROC_PATH)); String line = null; while((line=in.readLine()) != null){ - String[] str = line.split("\\W+"); + String[] str = line.split("\\s+"); if(str[0].equals("cpu")) { cpuTotal.update(str); }