refactor(supervisors): removes the state machine written inside the supervisors

This commit deletes the state machines in each actor supervisor (error-prone).
Theirs codes are not sensitive, so we can easily process each message without to code the different states.

Author: mcolmant

.travis.yml

@@ -6,7 +6,7 @@ script:
 before_install:
 - openssl aes-256-cbc -K $encrypted_48ebb0d1c0b9_key -iv $encrypted_48ebb0d1c0b9_iv
   -in secrets.tar.enc -out secrets.tar -d
-- tar xvf secrets.tar
+- tar xf secrets.tar
 after_success:
 - sbt coverageReport
 - sbt coverageAggregate

powerapi-cli/src/main/scala/org/powerapi/app/PowerAPI.scala

@@ -128,7 +128,7 @@ object PowerAPI extends App {
         |Build a software-defined power meter. Do not forget to configure correctly the modules (see the documentation).
         |
         |usage: ./powerapi modules [cpu-simple|cpu-dvfs|libpfm-core|libpfm-core-proces|powerspy|rapl,...] \
-        |                          monitor --frequency [ms] --targets [pid, ..., app, ...)|all] --agg [max|min|geomean|logsum|mean|median|stdev|sum|variance] --[console,file [filepath],chart] \
+        |                          monitor --frequency [ms] --targets [pid, ..., app, ...|all] --agg [max|min|geomean|logsum|mean|median|stdev|sum|variance] --[console,file [filepath],chart] \
         |                  duration [s]
         |
         |example: ./powerapi modules cpu-simple monitor --frequency 1000 --targets firefox --agg max --console monitor --targets chrome --agg max --console \

powerapi-core/build.sbt

@@ -44,7 +44,7 @@ pomExtra := {
     <developer>
       <id>mcolmant</id>
       <name>Maxime Colmant</name>
-      <url>http://researchers.lille.inria.fr/colmant/</url>
+      <url>http://mcolmant.github.io/</url>
     </developer>
     <developer>
       <id>rouvoy</id>

powerapi-core/src/main/scala/org/powerapi/core/ClockActors.scala

@@ -108,16 +108,6 @@ class Clocks(eventBus: MessageBus) extends Supervisor {
   }
 
   def receive: PartialFunction[Any, Unit] = LoggingReceive {
-    case msg: ClockStart => {
-      start(msg)
-      context.become(running)
-    }
-  } orElse default
-
-  /**
-   * Running state.
-   */
-  def running: Actor.Receive = LoggingReceive {
     case msg: ClockStart => start(msg)
     case msg: ClockStop => stop(msg)
     case msg: ClockStopAll => stopAll(msg)

powerapi-core/src/main/scala/org/powerapi/core/MonitorActors.scala

@@ -140,16 +140,6 @@ class Monitors(eventBus: MessageBus) extends Supervisor with Configuration  {
   }
 
   def receive: PartialFunction[Any, Unit] = LoggingReceive {
-    case msg: MonitorStart => {
-      start(msg)
-      context.become(running)
-    }
-  } orElse default
-
-  /**
-   * Running state.
-   */
-  def running: Actor.Receive = LoggingReceive {
     case msg: MonitorStart => start(msg)
     case msg: MonitorAggFunction => setAggregatingFunction(msg)
     case msg: MonitorStop => stop(msg)

powerapi-core/src/test/scala/org/powerapi/core/ClockSuite.scala

@@ -62,7 +62,6 @@ class ClockSuite(system: ActorSystem) extends UnitTest(system) {
     val _system = ActorSystem("ClockSuiteTest1", eventListener)
 
     val frequency = 50.milliseconds
-    val clocks = _system.actorOf(Props(classOf[Clocks], eventBus), "clocks1")
     val clock = _system.actorOf(Props(classOf[ClockChild], eventBus, frequency), "clock1")
 
     EventFilter.warning(occurrences = 1, source = clock.path.toString).intercept({
@@ -89,12 +88,7 @@ class ClockSuite(system: ActorSystem) extends UnitTest(system) {
     EventFilter.info(occurrences = 1, source = clock.path.toString).intercept({
       clock ! ClockStop("test", frequency)
     })(_system)
-
-    EventFilter.warning(occurrences = 1, source = clocks.path.toString).intercept({
-      stopClock(frequency)(eventBus)
-    })(_system)
-
-    Await.result(gracefulStop(clocks, timeout.duration), timeout.duration)
+    
     Await.result(gracefulStop(clock, timeout.duration), timeout.duration)
     _system.shutdown()
     _system.awaitTermination(timeout.duration)

powerapi-core/src/test/scala/org/powerapi/core/MonitorSuite.scala

@@ -73,7 +73,6 @@ class MonitorSuite(system: ActorSystem) extends UnitTest(system) {
     val targets = List[Target](1)
 
     val monitor = _system.actorOf(Props(classOf[MonitorChild], eventBus, muid, frequency, targets), "monitor1")
-    val monitors = _system.actorOf(Props(classOf[Monitors], eventBus), "monitors1")
 
     EventFilter.warning(occurrences = 1, source = monitor.path.toString).intercept({
       monitor ! MonitorStop("test", muid)
@@ -96,16 +95,11 @@ class MonitorSuite(system: ActorSystem) extends UnitTest(system) {
       monitor ! MonitorStop("test", UUID.randomUUID())
     })(_system)
 
-    EventFilter.warning(occurrences = 1, source = monitors.path.toString).intercept({
-      stopMonitor(muid)(eventBus)
-    })(_system)
-
     receiveWhile(10.seconds, idle = 2.seconds) {
       case msg: MonitorTick => {}
     }
 
     Await.result(gracefulStop(monitor, timeout.duration), timeout.duration)
-    Await.result(gracefulStop(monitors, timeout.duration), timeout.duration)
     _system.shutdown()
     _system.awaitTermination(timeout.duration)
   }
@@ -458,8 +452,8 @@ class MonitorSuite(system: ActorSystem) extends UnitTest(system) {
     val monitor3 = new Monitor(eventBus, reporters)
 
     val display = new PowerDisplay {
-      def display(timestamp: Long, targets: Set[Target], devices: Set[String], power: Power): Unit = {
-        testActor ! s"$timestamp, ${targets.mkString(",")}, ${devices.mkString(",")}, $power"
+      def display(muid: UUID, timestamp: Long, targets: Set[Target], devices: Set[String], power: Power): Unit = {
+        testActor ! s"$muid, $timestamp, ${targets.mkString(",")}, ${devices.mkString(",")}, $power"
       }
     }
 
@@ -469,7 +463,7 @@ class MonitorSuite(system: ActorSystem) extends UnitTest(system) {
 
     monitor.to(display)
     publishRawPowerReport(monitor.muid, 1, 15.W, "gpu", tickMock)(eventBus)
-    expectMsgClass(classOf[String]) should equal(s"${tickMock.timestamp}, ${Process(1)}, gpu, ${15000.mW}")
+    expectMsgClass(classOf[String]) should equal(s"${monitor.muid}, ${tickMock.timestamp}, ${Process(1)}, gpu, ${15000.mW}")
     reporters.actorSelection("user/*") ! Identify(None)
     val reporter = expectMsgClass(classOf[ActorIdentity]).getRef