From 52f69a4fab46e5875027f1652873bc78e02e4e88 Mon Sep 17 00:00:00 2001
From: Florian Fittkau <ffi@informatik.uni-kiel.de>
Date: Thu, 18 Jun 2015 16:00:46 +0200
Subject: [PATCH] 1.0
---
build.xml | 4 +-
...z.live_trace_processing.default.properties | 2 +-
.../probe/JDBCAspect.java | 8 ++-
.../system_mon/SystemMonitor.java | 4 +-
.../system_mon/SystemMonitorSigarProbe.java | 54 -------------------
5 files changed, 8 insertions(+), 64 deletions(-)
delete mode 100644 src/explorviz/live_trace_processing/system_mon/SystemMonitorSigarProbe.java
diff --git a/build.xml b/build.xml
index 3e04649..d9a9497 100644
--- a/build.xml
+++ b/build.xml
@@ -74,7 +74,7 @@
<zipfileset excludes="META-INF/*.SF" src="lib/aspectjweaver-1.8.5.jar"/>
<zipfileset excludes="META-INF/*.SF" src="lib/slf4j-api-1.7.5.jar"/>
<zipfileset excludes="META-INF/*.SF" src="lib/disruptor-3.3.0.jar"/>
- <zipfileset excludes="META-INF/*.SF" src="lib/sigar.jar"/>
+ <!-- <zipfileset excludes="META-INF/*.SF" src="lib/sigar.jar"/> -->
<!-- <zipfileset excludes="META-INF/*.SF" src="lib/hsqldb-2.3.1.jar"/> -->
<!-- <zipfileset excludes="META-INF/*.SF" src="lib/servlet-api-3.0.jar"/> -->
</jar>
@@ -101,7 +101,7 @@
<zipfileset excludes="META-INF/*.SF" src="${build.dir}/explorviz-common.jar"/>
<zipfileset excludes="META-INF/*.SF" src="lib/slf4j-api-1.7.5.jar"/>
<zipfileset excludes="META-INF/*.SF" src="lib/disruptor-3.3.0.jar"/>
- <zipfileset excludes="META-INF/*.SF" src="lib/sigar.jar"/>
+ <!-- <zipfileset excludes="META-INF/*.SF" src="lib/sigar.jar"/> -->
</jar>
</target>
diff --git a/src/META-INF/explorviz.live_trace_processing.default.properties b/src/META-INF/explorviz.live_trace_processing.default.properties
index b06af98..06fc540 100644
--- a/src/META-INF/explorviz.live_trace_processing.default.properties
+++ b/src/META-INF/explorviz.live_trace_processing.default.properties
@@ -24,7 +24,7 @@ explorviz.live_trace_processing.debug=false
explorviz.live_trace_processing.android_monitoring=false
explorviz.live_trace_processing.monitoring_enabled=true
-explorviz.live_trace_processing.system_monitoring_enabled=false
+explorviz.live_trace_processing.system_monitoring_enabled=true
explorviz.live_trace_processing.continous_monitoring_enabled=false
diff --git a/src/explorviz/live_trace_processing/probe/JDBCAspect.java b/src/explorviz/live_trace_processing/probe/JDBCAspect.java
index e534c5c..ace6231 100644
--- a/src/explorviz/live_trace_processing/probe/JDBCAspect.java
+++ b/src/explorviz/live_trace_processing/probe/JDBCAspect.java
@@ -32,9 +32,9 @@ public class JDBCAspect {
/* Related JDBC calls */
/* http://docs.oracle.com/javase/7/docs/api/java/sql/Statement.html */
private static final String RELATED_CALLS =
- /** Connection **/
- /* createStatment */
- "(call(java.sql.Statement java.sql.Connection.createStatement()) "
+ /** Connection **/
+ /* createStatment */
+ "(call(java.sql.Statement java.sql.Connection.createStatement()) "
/* prepareStatement */
+ "|| call(java.sql.PreparedStatement java.sql.Connection.prepareStatement(String)) "
+ "|| call(java.sql.PreparedStatement java.sql.Connection.prepareStatement(String, String[])) "
@@ -337,8 +337,6 @@ public class JDBCAspect {
}
formattedReturnValue = String.valueOf(numberOfRows);
break;
-
- // TODO - relevant return types?
case "STATEMENT":
break;
case "PREPAREDSTATEMENT":
diff --git a/src/explorviz/live_trace_processing/system_mon/SystemMonitor.java b/src/explorviz/live_trace_processing/system_mon/SystemMonitor.java
index 57093a4..c422138 100644
--- a/src/explorviz/live_trace_processing/system_mon/SystemMonitor.java
+++ b/src/explorviz/live_trace_processing/system_mon/SystemMonitor.java
@@ -27,11 +27,11 @@ public class SystemMonitor {
@Override
public void run() {
try {
- final double cpuUtil = SystemMonitorSigarProbe.getSystemCpuLoad();
+ final double cpuUtil = SystemMonitorProbe.getSystemCpuLoad();
if (cpuUtil >= 0) { // fixes -1 bug in first seconds
final SystemMonitoringRecord record = new SystemMonitoringRecord(cpuUtil,
SystemMonitorProbe.getUsedPhysicalMemorySize(), SystemMonitorProbe
- .getTotalPhysicalMemorySize(), null);
+ .getTotalPhysicalMemorySize(), null);
MonitoringController.sendOutSystemRecord(record);
}
} catch (final Exception e) {
diff --git a/src/explorviz/live_trace_processing/system_mon/SystemMonitorSigarProbe.java b/src/explorviz/live_trace_processing/system_mon/SystemMonitorSigarProbe.java
deleted file mode 100644
index 166beb5..0000000
--- a/src/explorviz/live_trace_processing/system_mon/SystemMonitorSigarProbe.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package explorviz.live_trace_processing.system_mon;
-
-import org.hyperic.sigar.CpuPerc;
-import org.hyperic.sigar.Mem;
-import org.hyperic.sigar.Sigar;
-import org.hyperic.sigar.SigarException;
-
-public class SystemMonitorSigarProbe {
- private final static Sigar sigar = new Sigar();
-
- public static double getSystemCpuLoad() {
- CpuPerc cpu = null;
- try {
- cpu = sigar.getCpuPerc();
- } catch (final SigarException se) {
- se.printStackTrace();
- }
-
- return cpu.getCombined();
- }
-
- public static long getTotalPhysicalMemorySize() {
- Mem mem = null;
- try {
- mem = sigar.getMem();
- } catch (final SigarException se) {
- se.printStackTrace();
- }
-
- return mem.getTotal();
- }
-
- public static long getFreePhysicalMemorySize() {
- Mem mem = null;
- try {
- mem = sigar.getMem();
- } catch (final SigarException se) {
- se.printStackTrace();
- }
-
- return mem.getFree();
- }
-
- public static long getUsedPhysicalMemorySize() {
- Mem mem = null;
- try {
- mem = sigar.getMem();
- } catch (final SigarException se) {
- se.printStackTrace();
- }
-
- return mem.getUsed();
- }
-}
--
GitLab