fix(build): update jdk version for travis

Author: mcolmant

.travis.yml

@@ -27,7 +27,7 @@ scala:
   - 2.11.7
 
 jdk:
-  - openjdk7
+  - oraclejdk8
 
 # workaround for openjdk buffer overflow
 addons:

powerapi-core/src/main/scala/org/powerapi/module/disk/simple/DiskSimpleFormula.scala

@@ -22,11 +22,9 @@
  */
 package org.powerapi.module.disk.simple
 
-import java.time.Clock
 import java.util.UUID
 
 import akka.actor.Actor
-import akka.event.LoggingReceive
 import org.joda.time.DateTime
 import org.powerapi.core.MessageBus
 import org.powerapi.core.target.Target

powerapi-core/src/main/scala/org/powerapi/reporter/InfluxDisplay.scala

@@ -22,13 +22,9 @@
  */
 package org.powerapi.reporter
 
-import java.util.UUID
-
 import com.paulgoldbaum.influxdbclient.Parameter.Precision
 import com.paulgoldbaum.influxdbclient.{InfluxDB, Point}
 import org.powerapi.PowerDisplay
-import org.powerapi.core.power.Power
-import org.powerapi.core.target.Target
 import org.powerapi.module.PowerChannel.AggregatePowerReport
 
 /**

powerapi-core/src/test/resources/configuration-suite.conf

@@ -29,6 +29,7 @@ powerapi.procfs.process-path = "p4/%?pid"
 powerapi.sysfs.timeinstates-path = "p5"
 powerapi.sysfs.cgroup-sysfs-path = "p6"
 powerapi.procfs.disk-stats-path = "p7"
+powerapi.procfs.mounts-path = "p1/mounts"
 powerapi.cpu.tdp = 120
 powerapi.cpu.tdp-factor = 0.80
 powerapi.sigar.native-path = "./../external-libs/sigar-bin"
@@ -116,3 +117,52 @@ rapl.supported-architectures = [
   {id = 63, model = "Haswell-EP"}
   {id = 61, model = "Broadwell"}
 ]
+
+
+powerapi.disk.formulae = [
+  { name = "sda",
+    models = {
+      read = [
+        { condition = "<= 78966784", coeffs = [ 0.00, 1.01e-07 ] }
+        { condition = "> 78966784", coeffs = [ 7.62, 1.72e-10 ] }
+      ],
+      write = [
+        { condition = "<= 66674688", coeffs = [ 0.00, 1.13e-07 ] }
+        { condition = "> 66674688", coeffs = [ 8.33, 1.79e-09 ] }
+      ]
+    }
+  }
+
+  { name = "sdb",
+    models = {
+      read = [
+        { condition = "<= 10", coeffs = [ 0.00, 0.003 ] }
+        { condition = "> 10", coeffs = [ 2, 0.15 ] }
+      ],
+      write = [
+        { condition = "<= 5", coeffs = [ 0.00, 0.001 ] }
+        { condition = "> 5", coeffs = [ 3, 0.25 ] }
+      ]
+    }
+  }
+]
+powerapi.disk.interval = 1s
+
+disk-test {
+  powerapi.disk.formulae = [
+    { name = "sdb",
+      models = {
+        read = [
+          { condition = "<= 100", coeffs = [ 0.00, 0.0013 ] }
+          { condition = "> 100", coeffs = [ 2.13, 0.28 ] }
+        ],
+        write = [
+          { condition = "<= 1000", coeffs = [ 0.00, 0.0016 ] }
+          { condition = "> 1000", coeffs = [ 3.15, 0.40 ] }
+        ]
+      }
+    }
+  ]
+
+  powerapi.disk.interval = 250ms
+}