raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Revert "Look for perf-java-flames on path in MultiJVM perf support" (#25022)

Browse source 
* Revert "Look for perf-java-flames on path in MultiJVM perf support (#25003)"

This reverts commit 3e11092388.
This commit is contained in:
Christopher Batey 2018-04-30 14:58:33 +01:00 • committed by GitHub
parent d870d37bb3
commit 945440a38d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-multi-node-testkit/src/main/mima-filters/2.5.12.backwards.excludes
View file

@ -1,2 +0,0 @@
# Internal API changes
ProblemFilters.exclude[DirectMissingMethodProblem]("akka.remote.testkit.PerfFlamesSupport.perfJavaFlamesPath")

20
akka-multi-node-testkit/src/main/scala/akka/remote/testkit/PerfFlamesSupport.scala
View file

@ -4,18 +4,13 @@
package akka.remote.testkit
import PerfFlamesSupport._
import java.io.File
import akka.remote.testconductor.RoleName
import scala.concurrent.Future
import scala.concurrent.duration._
import scala.language.postfixOps
object PerfFlamesSupport {
val Command = "perf-java-flames"
}
/**
* INTERNAL API: Support trait allowing trivially recording perf metrics from [[MultiNodeSpec]]s
*/
@ -37,7 +32,7 @@ private[akka] trait PerfFlamesSupport { _: MultiNodeSpec ⇒
val name = ManagementFactory.getRuntimeMXBean.getName
val pid = name.substring(0, name.indexOf('@')).toInt
val perfCommand = s"$Command $pid"
val perfCommand = s"$perfJavaFlamesPath $pid"
println(s"[perf @ $myself($pid)][OUT]: " + perfCommand)
import scala.sys.process._
@ -50,10 +45,13 @@ private[akka] trait PerfFlamesSupport { _: MultiNodeSpec ⇒
}
}
def perfJavaFlamesPath: String =
"/home/ubuntu/perf-java-flames"
def isPerfJavaFlamesAvailable: Boolean = {
import scala.sys.process._
val isIt = (s"type $Command" !) == 0
if (!isIt) println(s"WARN: perf-java-flames not on the path! Skipping perf profiling.")
val isIt = new File(perfJavaFlamesPath).exists()
if (!isIt) println(s"WARN: perf-java-flames not available under [$perfJavaFlamesPath]! Skipping perf profiling.")
isIt
}
}

25
akka-remote-tests/src/multi-jvm/scala/akka/remote/artery/FanInThrougputSpec.scala
View file

@ -4,17 +4,26 @@
package akka.remote.artery
import java.nio.ByteBuffer
import java.text.SimpleDateFormat
import java.util.Date
import java.util.concurrent.Executors
import akka.actor._
import akka.remote.artery.MaxThroughputSpec._
import akka.remote.testconductor.RoleName
import akka.remote.testkit.{ MultiNodeConfig, PerfFlamesSupport }
import akka.remote.{ RemoteActorRefProvider, RemotingMultiNodeSpec }
import akka.testkit._
import com.typesafe.config.ConfigFactory
import java.util.concurrent.TimeUnit.NANOSECONDS
import scala.concurrent.duration._
import akka.actor._
import akka.remote.{ RARP, RemoteActorRefProvider, RemotingMultiNodeSpec }
import akka.remote.testconductor.RoleName
import akka.remote.testkit.MultiNodeConfig
import akka.remote.testkit.MultiNodeSpec
import akka.remote.testkit.PerfFlamesSupport
import akka.remote.testkit.STMultiNodeSpec
import akka.serialization.ByteBufferSerializer
import akka.serialization.SerializerWithStringManifest
import akka.testkit._
import com.typesafe.config.ConfigFactory
import akka.remote.artery.compress.CompressionProtocol.Events.ReceivedActorRefCompressionTable
import akka.remote.artery.MaxThroughputSpec._
object FanInThroughputSpec extends MultiNodeConfig {
val totalNumberOfNodes =