-
Notifications
You must be signed in to change notification settings - Fork 33
EmulatorRunner.LaunchEmulator: return EmulatorLaunchResult with serial, ports, and log path #340
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Copilot
wants to merge
10
commits into
main
Choose a base branch
from
copilot/fix-9141961-61571042-81330bd6-a281-4494-810b-246682127c8d
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4a746aa
Initial plan
Copilot 5ba4132
feat: LaunchEmulator returns EmulatorLaunchResult with ports, serial,…
Copilot 819fa9d
fix: correct cref in EmulatorLaunchResult doc, cross-platform KillSle…
Copilot 3ec585d
Address review feedback: constructor, banner comments, stderr log level
rmarinho 4cd42fc
Address Copilot review: null guard, PortsResolvedAsync encapsulation,…
rmarinho 6a3241d
Fix doc comment accuracy and log bare catch exception
rmarinho 131dbe1
Validate logPath in constructor, reject whitespace-only logFile
rmarinho d3270e2
Address Jonathan review: split API, track PIDs, fix ExitCode bug
rmarinho 2ed3fc3
Merge main: SIGINT isolation, StartFireAndForget helper, fix ping→tim…
Copilot f8894ba
Simplify logFile condition, use ProcessUtils.StartFireAndForget in La…
Copilot File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
62 changes: 62 additions & 0 deletions
62
src/Xamarin.Android.Tools.AndroidSdk/Models/EmulatorLaunchResult.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Diagnostics; | ||
| using System.Threading.Tasks; | ||
|
|
||
| namespace Xamarin.Android.Tools; | ||
|
|
||
| /// <summary> | ||
| /// Returned by <see cref="EmulatorRunner.LaunchEmulator"/> with enriched launch information. | ||
| /// </summary> | ||
| public sealed class EmulatorLaunchResult | ||
| { | ||
| public EmulatorLaunchResult (Process process, string logPath) | ||
| { | ||
| if (process is null) | ||
| throw new System.ArgumentNullException (nameof (process)); | ||
| if (logPath is null) | ||
| throw new System.ArgumentNullException (nameof (logPath)); | ||
| Process = process; | ||
| LogPath = logPath; | ||
| } | ||
|
rmarinho marked this conversation as resolved.
|
||
|
|
||
| /// <summary>The running emulator process.</summary> | ||
| public Process Process { get; } | ||
|
|
||
| /// <summary>The OS process ID of the emulator process.</summary> | ||
| public int Pid => Process.Id; | ||
|
|
||
| /// <summary> | ||
| /// The emulator console port (e.g., 5554). Populated either from the pre-assigned | ||
| /// <c>-ports</c> argument or once <see cref="PortsResolvedAsync"/> completes. | ||
| /// </summary> | ||
| public int? ConsolePort { get; internal set; } | ||
|
|
||
| /// <summary> | ||
| /// The emulator ADB port (e.g., 5555). Populated either from the pre-assigned | ||
| /// <c>-ports</c> argument or once <see cref="PortsResolvedAsync"/> completes. | ||
| /// </summary> | ||
| public int? AdbPort { get; internal set; } | ||
|
|
||
| /// <summary> | ||
| /// The ADB serial for this emulator (e.g., <c>emulator-5554</c>), derived from <see cref="ConsolePort"/>. | ||
| /// Returns <c>null</c> until <see cref="ConsolePort"/> is populated. | ||
| /// </summary> | ||
| public string? Serial => ConsolePort is int p ? $"emulator-{p}" : null; | ||
|
|
||
| /// <summary> | ||
| /// The path to the emulator log file. Resolved at launch time from the <c>-logfile</c> | ||
| /// argument (if specified) or from the <c>ANDROID_AVD_HOME</c> / <c>ANDROID_USER_HOME</c> | ||
| /// environment variables, falling back to the AOSP default | ||
| /// (<c>~/.android/avd/<name>.avd/emulator.log</c>). | ||
| /// </summary> | ||
| public string LogPath { get; } | ||
|
|
||
| /// <summary> | ||
| /// A <see cref="Task"/> that completes when the emulator has reported its console and ADB | ||
| /// port assignments via stdout/stderr. If ports were pre-assigned via <c>-ports</c>, this | ||
| /// task is already completed. | ||
| /// </summary> | ||
| internal Task PortsResolvedAsync { get; set; } = Task.CompletedTask; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.