p05617423
/
bench4q
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modify limitFieldModel and test

This commit is contained in:
liuchongrui 2014-10-10 10:23:43 +08:00
parent 9f596fc2a2
commit 25e553a178
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/api/MainController.java
View File

@ -1,8 +1,6 @@
package org.bench4q.monitor.api; package org.bench4q.monitor.api;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@ -32,7 +30,7 @@ public class MainController {
@RequestMapping(value = "/limitableFields") @RequestMapping(value = "/limitableFields")
@ResponseBody @ResponseBody
public LimitableFieldsModel limitableFields() { public LimitableFieldsModel limitableFields() throws SigarException {
return new LimitableFieldsModel(); return new LimitableFieldsModel();
} }

17
Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/LimitableFieldsModel.java
View File

@ -7,6 +7,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import org.hyperic.sigar.SigarException;
@XmlRootElement(name = "limitableFields") @XmlRootElement(name = "limitableFields")
public class LimitableFieldsModel { public class LimitableFieldsModel {
private List<String> fieldsParent; private List<String> fieldsParent;
@ -21,17 +24,19 @@ public class LimitableFieldsModel {
this.fields = fields; this.fields = fields;
} }
public LimitableFieldsModel() { public LimitableFieldsModel() throws SigarException {
this.fields = new ArrayList<String>(); this.fields = new ArrayList<String>();
this.fieldsParent = new ArrayList<String>(); this.fieldsParent = new ArrayList<String>();
String stringMemoryModel = new MemoryModel().getClass().getName();
String stringProcessorModel = new ProcessorModel().getClass().getName();
this.fields.add("MemoryUsedPercent"); this.fields.add("MemoryUsedPercent");
this.fieldsParent.add("org.bench4q.monitor.model.MemoryModel"); this.fieldsParent.add(stringMemoryModel);
this.fields.add("ProcessorTimePercent"); this.fields.add("ProcessorTimePercent");
this.fieldsParent.add("org.bench4q.monitor.model.ProcessorModel"); this.fieldsParent.add(stringProcessorModel);
this.fields.add("UserTimePercent"); this.fields.add("UserTimePercent");
this.fieldsParent.add("org.bench4q.monitor.model.ProcessorModel"); this.fieldsParent.add(stringProcessorModel);
this.fields.add("PrivilegedTimePercent"); this.fields.add("PrivilegedTimePercent");
this.fieldsParent.add("org.bench4q.monitor.model.ProcessorModel"); this.fieldsParent.add(stringProcessorModel);
} }
public String validname(String name){ public String validname(String name){
@ -49,6 +54,6 @@ public class LimitableFieldsModel {
public void setFieldsParent(List<String> fieldsParent) { public void setFieldsParent(List<String> fieldsParent) {
this.fieldsParent = fieldsParent; this.fieldsParent = fieldsParent;
} }
} }

1
Bench4Q-Monitor-Sigar/src/main/java/org/bench4q/monitor/model/MonitorMain.java
View File

@ -108,6 +108,7 @@ public class MonitorMain extends SampleModel {
Method mget=c.getMethod("get"+name); Method mget=c.getMethod("get"+name);
double currentvalue=(Double) mget.invoke(obj); double currentvalue=(Double) mget.invoke(obj);
if (currentvalue >= limit) limitResult = true; if (currentvalue >= limit) limitResult = true;
//System.out.println(name+": "+currentvalue);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

5
Bench4Q-Monitor-Sigar/src/test/java/org/bench4q/monitor/Test_LimitableFieldsModel.java
View File

@ -3,15 +3,18 @@ package org.bench4q.monitor;
import java.util.List; import java.util.List;
import org.bench4q.monitor.model.LimitableFieldsModel; import org.bench4q.monitor.model.LimitableFieldsModel;
import org.hyperic.sigar.SigarException;
import org.junit.Test; import org.junit.Test;
public class Test_LimitableFieldsModel { public class Test_LimitableFieldsModel {
@Test @Test
public void testLimitableFieldsModelGet(){ public void testLimitableFieldsModelGet() throws SigarException{
LimitableFieldsModel limitList = new LimitableFieldsModel(); LimitableFieldsModel limitList = new LimitableFieldsModel();
List<String> result = limitList.getFields(); List<String> result = limitList.getFields();
List<String> resultP = limitList.getFieldsParent();
for (int i = 0; i < result.size(); i++){ for (int i = 0; i < result.size(); i++){
System.out.println(result.get(i).toString()); System.out.println(result.get(i).toString());
System.out.println(resultP.get(i).toString());
} }
} }

12
Bench4Q-Monitor-Sigar/src/test/java/org/bench4q/monitor/controler/Test_MainControler.java
View File

@ -16,14 +16,14 @@ public class Test_MainControler {
LimitModel.ParameterModel params2 = new LimitModel.ParameterModel(); LimitModel.ParameterModel params2 = new LimitModel.ParameterModel();
LimitModel.ParameterModel params3 = new LimitModel.ParameterModel(); LimitModel.ParameterModel params3 = new LimitModel.ParameterModel();
LimitModel.ParameterModel params4 = new LimitModel.ParameterModel(); LimitModel.ParameterModel params4 = new LimitModel.ParameterModel();
params1.setName("memoryUsedPercent"); params1.setName("MemoryUsedPercent");
params1.setLimit(100); params1.setLimit(100);
params2.setName("processorTimePercent"); params2.setName("ProcessorTimePercent");
params2.setLimit(10); params2.setLimit(100);
params3.setName("userTimePercent"); params3.setName("UserTimePercent");
params3.setLimit(100); params3.setLimit(100);
params4.setName("privilegedTimePercent"); params4.setName("PrivilegedTimePercent");
params4.setLimit(100); params4.setLimit(20);
List<LimitModel.ParameterModel> list = new ArrayList<LimitModel.ParameterModel>(); List<LimitModel.ParameterModel> list = new ArrayList<LimitModel.ParameterModel>();
list.add(params1); list.add(params1);
list.add(params2); list.add(params2);