From 2117b42e2e85472879eba44e91d1eebcc1446323 Mon Sep 17 00:00:00 2001 From: liuchongrui Date: Thu, 25 Sep 2014 17:01:09 +0800 Subject: [PATCH] add LimitableFieldsModel implement add LimitableFieldsModel implement --- .../monitor/model/LimitableFieldsModel.java | 10 ++++++++++ .../org/bench4q/monitor/model/MonitorMain.java | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/LimitableFieldsModel.java b/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/LimitableFieldsModel.java index 49ab3c45..c0291a98 100644 --- a/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/LimitableFieldsModel.java +++ b/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/LimitableFieldsModel.java @@ -1,5 +1,6 @@ package org.bench4q.monitor.model; +import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlElement; @@ -20,4 +21,13 @@ public class LimitableFieldsModel { this.fields = fields; } + public LimitableFieldsModel() { + this.fields = new ArrayList(); + this.fields.add("memoryUsedPercent"); + this.fields.add("processorTimePercent"); + this.fields.add("userTimePercent"); + this.fields.add("privilegedTimePercent"); + } + + } diff --git a/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/MonitorMain.java b/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/MonitorMain.java index aa80269b..ba69a868 100644 --- a/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/MonitorMain.java +++ b/Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/MonitorMain.java @@ -96,10 +96,23 @@ public class MonitorMain extends SampleModel { for (int i = 0; i < list.size(); i++){ String name = list.get(i).getName(); double limit = list.get(i).getLimit(); - if (name.equals("memoryUsedPercent")) + if (name.equals("memoryUsedPercent")){ if (limit <= this.memoryModel.getMemoryUsedPercent()) limitResult = true; } + if (name.equals("processorTimePercent")){ + if (limit <= this.processorModel.getProcessorTimePercent()) + limitResult = true; + } + if (name.equals("userTimePercent")){ + if (limit <= this.processorModel.getUserTimePercent()) + limitResult = true; + } + if (name.equals("privilegedTimePercent")){ + if (limit <= this.processorModel.getPrivilegedTimePercent()) + limitResult = true; + } + } return limitResult; }