Commit c4a39a11 authored by Lukas Sommer's avatar Lukas Sommer
Browse files

Merge branch '172-corestats-don-t-work-with-alternative-coredir' into '2018.2'

Resolve "`corestats` don't work with alternative `coreDir`"

See merge request !27
parents 8a46cd6a 76f152cd
Pipeline #679 passed with stage
in 6 minutes and 57 seconds
...@@ -90,7 +90,7 @@ object CoreStatistics { ...@@ -90,7 +90,7 @@ object CoreStatistics {
(for (t <- r.timing; c <- cd.averageClockCycles) (for (t <- r.timing; c <- cd.averageClockCycles)
yield "%2.2f" format (1.0 / ((t.clockPeriod * c) / 1000000000.0f))).getOrElse("") yield "%2.2f" format (1.0 / ((t.clockPeriod * c) / 1000000000.0f))).getOrElse("")
) mkString "," ) mkString ","
} getOrElse "" } getOrElse "NA,NA"
private def dumpMaxDelayPath(r: Option[TimingReport]): String = private def dumpMaxDelayPath(r: Option[TimingReport]): String =
Seq(r.map(_.maxDelayPath.slack), Seq(r.map(_.maxDelayPath.slack),
......
...@@ -107,7 +107,7 @@ final object FileAssetManager extends Publisher { ...@@ -107,7 +107,7 @@ final object FileAssetManager extends Publisher {
def update(e: BasePathManager.Event): Unit = e match { def update(e: BasePathManager.Event): Unit = e match {
case BasePathManager.BasePathChanged(base, path) => case BasePathManager.BasePathChanged(base, path) =>
_dirs.synchronized { _dirs += base -> path } _dirs.synchronized { _dirs += base -> path }
if (e equals Entities.Cores) reports.clear(Some(Set(path))) if (base equals Entities.Cores) reports.clear(Some(Set(path)))
restartWatcher() restartWatcher()
publish(Events.BasePathChanged(base, path)) publish(Events.BasePathChanged(base, path))
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment