Skip to content
This repository has been archived by the owner on Dec 7, 2019. It is now read-only.

Speed up emulator port allocation #46

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Speed up emulator port allocation #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d122ff9
Speed up emulator port allocation
rtjag Aug 1, 2018
0718ddc
Fix test
rtjag Aug 1, 2018
70a6d36
Merge remote-tracking branch 'gojuno/master' into feature/faster_port…
rtjag Aug 25, 2018
87af598
Use atomic int instead of synchronized block.
rtjag Aug 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 21 additions & 24 deletions swarmer/src/main/kotlin/com/gojuno/swarmer/Emulators.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import rx.schedulers.Schedulers
import rx.schedulers.Schedulers.io
import java.io.File
import java.lang.System.nanoTime
import java.util.concurrent.Semaphore
import java.util.concurrent.TimeUnit
import java.util.concurrent.TimeUnit.*
import java.util.concurrent.TimeoutException
import java.util.concurrent.atomic.AtomicInteger
import java.util.concurrent.atomic.AtomicLong

val sh: String = "/bin/sh"
Expand All @@ -33,18 +33,14 @@ fun startEmulators(
connectedAdbDevices: () -> Observable<Set<AdbDevice>> = ::connectedAdbDevices,
createAvd: (args: Commands.Start) -> Observable<Unit> = ::createAvd,
applyConfig: (args: Commands.Start) -> Observable<Unit> = ::applyConfig,
emulator: (args: Commands.Start) -> String = ::emulatorBinary,
findAvailablePortsForNewEmulator: () -> Observable<Pair<Int, Int>> = ::findAvailablePortsForNewEmulator,
emulatorCmd: (args: Commands.Start) -> String = ::emulatorBinary,
findAvailablePortsForNewEmulator: () -> Observable<Pair<Int, Int>> = {findAvailablePortsForNewEmulator(connectedAdbDevices)},
startEmulatorProcess: (List<String>, Commands.Start) -> Observable<Notification> = ::startEmulatorProcess,
waitForEmulatorToStart: (Commands.Start, () -> Observable<Set<AdbDevice>>, Observable<Notification>, Pair<Int, Int>) -> Observable<Emulator> = ::waitForEmulatorToStart,
waitForEmulatorToFinishBoot: (Emulator, Commands.Start) -> Observable<Emulator> = ::waitForEmulatorToFinishBoot
) {
val startTime = System.nanoTime()

// Sometimes on Linux "emulator -verbose -avd" does not print serial id of started emulator,
// so by allocating ports manually we know which serial id emulator will have.
val availablePortsSemaphore = Semaphore(1)

val startedEmulators = connectedAdbDevices()
.doOnNext { log("Already running emulators: $it") }
.flatMap {
Expand All @@ -54,12 +50,11 @@ fun startEmulators(
args = command,
createAvd = createAvd,
applyConfig = applyConfig,
availablePortsSemaphore = availablePortsSemaphore,
findAvailablePortsForNewEmulator = findAvailablePortsForNewEmulator,
startEmulatorProcess = startEmulatorProcess,
waitForEmulatorToStart = waitForEmulatorToStart,
connectedAdbDevices = connectedAdbDevices,
emulator = emulator,
emulatorCmd = emulatorCmd,
waitForEmulatorToFinishBoot = waitForEmulatorToFinishBoot
)
}
Expand Down Expand Up @@ -87,29 +82,26 @@ private fun startEmulator(
args: Commands.Start,
createAvd: (args: Commands.Start) -> Observable<Unit>,
applyConfig: (args: Commands.Start) -> Observable<Unit>,
availablePortsSemaphore: Semaphore,
findAvailablePortsForNewEmulator: () -> Observable<Pair<Int, Int>>,
startEmulatorProcess: (List<String>, Commands.Start) -> Observable<Notification>,
waitForEmulatorToStart: (Commands.Start, () -> Observable<Set<AdbDevice>>, Observable<Notification>, Pair<Int, Int>) -> Observable<Emulator>,
connectedAdbDevices: () -> Observable<Set<AdbDevice>> = ::connectedAdbDevices,
emulator: (Commands.Start) -> String,
emulatorCmd: (Commands.Start) -> String,
waitForEmulatorToFinishBoot: (Emulator, Commands.Start) -> Observable<Emulator>
): Observable<Emulator> =
createAvd(args)
.flatMap { applyConfig(args) }
.map { availablePortsSemaphore.acquire() }
.flatMap { findAvailablePortsForNewEmulator() }
.doOnNext { log("Ports for emulator ${args.emulatorName}: ${it.first}, ${it.second}.") }
.flatMap { ports ->
startEmulatorProcess(
// Unix only, PR welcome.
listOf(sh, "-c", "${emulator(args)} ${if (args.verbose) "-verbose" else ""} -avd ${args.emulatorName} -ports ${ports.first},${ports.second} ${args.emulatorStartOptions.joinToString(" ")} &"),
listOf(sh, "-c", "${emulatorCmd(args)} ${if (args.verbose) "-verbose" else ""} -avd ${args.emulatorName} -ports ${ports.first},${ports.second} ${args.emulatorStartOptions.joinToString(" ")} &"),
args
).let { process ->
waitForEmulatorToStart(args, connectedAdbDevices, process, ports)
}
}
.map { emulator -> availablePortsSemaphore.release().let { emulator } }
.flatMap { emulator ->
when (args.redirectLogcatTo) {
null -> Observable.just(emulator)
Expand Down Expand Up @@ -233,18 +225,23 @@ private fun emulatorBinary(args: Commands.Start): String =
emulator
}

private fun findAvailablePortsForNewEmulator(): Observable<Pair<Int, Int>> = connectedAdbDevices()
private val assignedPortsMax: AtomicInteger = AtomicInteger(5552)
/**
* Sometimes on Linux "emulator -verbose -avd" does not print serial id of started emulator,
* so by allocating ports manually we know which serial id emulator will have.
*/
internal fun findAvailablePortsForNewEmulator(connectedAdbDevices:() -> Observable<Set<AdbDevice>>): Observable<Pair<Int, Int>> =
connectedAdbDevices()
.map { it.filter { it.isEmulator } }
.map {
if (it.isEmpty()) {
5554
} else {
it
.map { it.id }
.map { it.substringAfter("emulator-") }
.map { it.toInt() }
.max()!! + 2
}
it.map { it.id }
.map { it.substringAfter("emulator-") }
.map { it.toInt() }.max() ?: 5552
.let { runningEmulatorPortsMax ->
assignedPortsMax.updateAndGet { portMax ->
maxOf(runningEmulatorPortsMax, portMax) + 2
}
}
}
.map { it to it + 1 }

Expand Down
30 changes: 27 additions & 3 deletions swarmer/src/test/kotlin/com/gojuno/swarmer/EmulatorsSpec.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ import com.nhaarman.mockito_kotlin.argumentCaptor
import com.nhaarman.mockito_kotlin.mock
import com.nhaarman.mockito_kotlin.verify
import com.nhaarman.mockito_kotlin.whenever
import org.assertj.core.api.Assertions.assertThat
import org.jetbrains.spek.api.Spek
import org.jetbrains.spek.api.dsl.describe
import org.jetbrains.spek.api.dsl.it
import rx.Completable
import rx.Observable
import rx.Single
import rx.schedulers.Schedulers
import java.io.File
import java.util.concurrent.TimeUnit

Expand Down Expand Up @@ -93,9 +95,10 @@ class EmulatorsSpec : Spek({
)
)

val EMULATOR_PORTS = Pair(12, 34)

describe("start emulators command called") {

val EMULATOR_PORTS = Pair(12, 34)

val connectedAdbDevices by memoized {
{ Observable.just(emptySet<AdbDevice>()) }
}
Expand Down Expand Up @@ -167,7 +170,7 @@ class EmulatorsSpec : Spek({
connectedAdbDevices = connectedAdbDevices,
createAvd = createAvd,
applyConfig = applyConfig,
emulator = emulator,
emulatorCmd = emulator,
startEmulatorProcess = startEmulatorsProcess,
waitForEmulatorToStart = waitForEmulatorToStart,
findAvailablePortsForNewEmulator = findAvailablePortsForNewEmulator,
Expand All @@ -187,4 +190,25 @@ class EmulatorsSpec : Spek({
}
}
}

describe("find available ports for new emulator") {

val connectedAdbDevices by memoized {
{ Observable.just(emptySet<AdbDevice>()) }
}

it("does not return duplicated ports") {


val testSubscriber = Observable.from(1..100)
.flatMap {
findAvailablePortsForNewEmulator(connectedAdbDevices)
.subscribeOn(Schedulers.io())
}.test().awaitTerminalEvent()
val allocatedPorts = testSubscriber.onNextEvents

assertThat(allocatedPorts).doesNotHaveDuplicates()
println("Allocated ports: $allocatedPorts")
}
}
})