Skip to content
This repository was archived by the owner on Mar 11, 2019. It is now read-only.

Commit 6722161

Browse files
committed
Merge pull request #68 from Spirals-Team/fix#59
fix(#59): Increases the actor timeouts
2 parents 70424f6 + 56b5d91 commit 6722161

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object PowerMeterMessages {
5151
trait PowerMeterConfiguration extends Configuration {
5252
lazy val timeout: Timeout = load { _.getDuration("powerapi.actors.timeout", TimeUnit.MILLISECONDS) } match {
5353
case ConfigValue(value) => Timeout(value.milliseconds)
54-
case _ => Timeout(1l.seconds)
54+
case _ => Timeout(15l.seconds)
5555
}
5656
}
5757

powerapi-core/src/main/scala/org/powerapi/module/libpfm/LibpfmCoreSensorConfiguration.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import scala.concurrent.duration.DurationLong
3939
trait LibpfmCoreSensorConfiguration extends Configuration {
4040
lazy val timeout: Timeout = load { _.getDuration("powerapi.actors.timeout", TimeUnit.MILLISECONDS) } match {
4141
case ConfigValue(value) => Timeout(value.milliseconds)
42-
case _ => Timeout(1l.seconds)
42+
case _ => Timeout(15l.seconds)
4343
}
4444

4545
lazy val topology: Map[Int, Set[Int]] = load { conf =>
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
# Configuration parameters to edit with your own settings.
2-
interval = 250ms
3-
42
powerspy.mac = "00:0B:CE:07:1E:9B"
53

64
powerapi.cpu.topology = [
@@ -10,10 +8,6 @@ powerapi.cpu.topology = [
108
{ core = 3, indexes = [3, 7] }
119
]
1210

13-
powerapi.sampling.step-duration = 5
14-
powerapi.sampling.sampling-directory = "samples"
15-
powerapi.sampling.processing-directory = "processing"
16-
powerapi.sampling.computing-directory = "formulae"
1711
powerapi.sampling.dvfs = true
1812
powerapi.sampling.turbo = true
1913

@@ -23,7 +17,9 @@ powerapi.cycles-polynom-regression.unhalted-cycles-event = "CPU_CLK_UNHALTED:THR
2317
powerapi.cycles-polynom-regression.ref-cycles-event = "CPU_CLK_UNHALTED:REF_P"
2418

2519
# You should not change these parameters
26-
powerapi.actors.timeout = 30s
20+
interval = 1s
21+
powerapi.actors.timeout = 15s
2722
powerapi.sampling.interval = ${interval}
2823
powerspy.interval = ${interval}
2924
powerapi.sampling.steps = [100, 25]
25+
powerapi.sampling.step-duration = 10

0 commit comments

Comments
 (0)