diff options
| author | fangshunjian <[email protected]> | 2019-01-11 10:51:10 +0600 |
|---|---|---|
| committer | fangshunjian <[email protected]> | 2019-01-11 10:51:10 +0600 |
| commit | 492050c0ea7a2c3a1ccb10433af23494094ab79a (patch) | |
| tree | 1aded7d8f9c1f5e057f0443581808e68361ad742 | |
| parent | 76f6fa284d304686b6dc62e8fbd4672c4e535059 (diff) | |
| parent | aebc5f8718b4b99ceae0daf66e5f3446c67125de (diff) | |
Merge branch 'master' into dev
Conflicts:
.gitignore
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | src/com/nis/nmsclient/util/ProcessUtil.java | 3 | ||||
| -rw-r--r-- | src/com/nis/systeminfo/model/SystemInfo.java | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1 +1,5 @@ +<<<<<<< HEAD /bin +======= +/bin/ +>>>>>>> refs/heads/master diff --git a/src/com/nis/nmsclient/util/ProcessUtil.java b/src/com/nis/nmsclient/util/ProcessUtil.java index 461a8d1..02deffc 100644 --- a/src/com/nis/nmsclient/util/ProcessUtil.java +++ b/src/com/nis/nmsclient/util/ProcessUtil.java @@ -1156,8 +1156,7 @@ public class ProcessUtil */ public static List<String> getLinuxProcessId(String procSearchKey) { - String cmd = "ps -ef | grep -i '" + procSearchKey.trim() - + "' | grep -v grep | awk '{print $2}'"; + String cmd = "ps -ef | grep " + procSearchKey.trim() + " | grep -v grep | awk '{print $2}'"; logger.info("getLinuxProcessId-----" + cmd); String[] shellCmd1 = new String[] { "/bin/bash", "-c", cmd }; BufferedReader bReader = null; diff --git a/src/com/nis/systeminfo/model/SystemInfo.java b/src/com/nis/systeminfo/model/SystemInfo.java index 60837c2..c628971 100644 --- a/src/com/nis/systeminfo/model/SystemInfo.java +++ b/src/com/nis/systeminfo/model/SystemInfo.java @@ -190,8 +190,10 @@ public class SystemInfo // a)物理内存信息 Mem mem = sigar.getMem(); Long memTotal = mem.getTotal();// 内存总量 - Long memUsed = mem.getUsed();// 当前内存使用量 - Long memFree = mem.getFree();// 当前内存剩余量 + //Long memUsed = mem.getUsed();// 当前内存使用量 + //Long memFree = mem.getFree();// 当前内存剩余量 + Long memFree = mem.getActualFree();// + Long memUsed = mem.getActualUsed(); sb.append(doubleFormat(memTotal / (1024 * 1024 * 1024.0), 2));// 内存总量,单位："G" sb.append(SEPARATOR); sb.append(doubleFormat(memUsed / (1024 * 1024 * 1024.0), 2));// 当前内存使用量,单位："G" |