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.

Sign up for GitHub

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

Jump to bottom

Refactor emulator start and stop functions for clarity and efficiency #22861

Merged

jchen351 merged 23 commits into main from Cjian/check_emulator_running

Dec 2, 2024

Contributor

jchen351 commented Nov 16, 2024 •

edited

Loading

Description

This pull request introduces several enhancements and new functionalities to the tools/python/util/android/android.py file, focusing on improving the management of Android emulators. The most important changes include adding a timeout parameter to the start_emulator function, adding checks to prevent multiple emulators from running simultaneously, and introducing new utility functions to manage emulator processes more effectively.

Enhancements to start_emulator function:

Added a timeout_minutes parameter to the start_emulator function to make the startup timeout configurable. [1] [2]
Added a check to prevent starting a new emulator if one with the same AVD name is already running.
Included additional emulator arguments -verbose for better control and debugging.
Added a final verification step to ensure the emulator has started successfully.

New utility functions for managing emulator processes:

Introduced check_emulator_running_using_avd_name , check_emulator_running_using_process, and check_emulator_running_using_pid to check if an emulator is running based on AVD name, process instance, or PID, respectively.
Added stop_emulator_by_proc and stop_emulator_by_pid functions to stop the emulator process using a subprocess.Popen instance or PID, with a configurable timeout.
Updated the stop_emulator function to use the new utility functions for stopping the emulator process.

These changes enhance the robustness and flexibility of the emulator management utilities, making it easier to handle different scenarios in CI environments and development workflows.

Motivation and Context

jchen351 added 4 commits

November 15, 2024 15:55


          Refactor emulator start and stop functions for clarity and efficiency.

91d7fc3


          Refactor emulator start and stop functions for clarity and efficiency.

d9af6f0


          Refactor emulator start and stop functions for clarity and efficiency.

85780c3


          Refactor emulator start and stop functions for clarity and efficiency.

afa5e9a

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

You can commit the suggested changes from lintrunner.

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

github-advanced-security bot found potential problems

View reviewed changes

tools/python/util/android/android.py Fixed Show fixed Hide fixed

jchen351 and others added 9 commits

November 15, 2024 16:58


          avd_info

1ceeb24


          result

bf977a9


          Update tools/python/util/android/android.py

a5a45ca

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Update tools/python/util/android/android.py

db94c41

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Update tools/python/util/android/android.py

5c5b014

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Update tools/python/util/android/android.py

a405d62

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          Update tools/python/util/android/android.py

b9ea99c

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

os

5f0f8a8


          Merge remote-tracking branch 'origin/Cjian/check_emulator_running' in…

01e3edd

…to Cjian/check_emulator_running

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

You can commit the suggested changes from lintrunner.

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved


          Update tools/python/util/android/android.py

4ff05f7

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

github-advanced-security bot found potential problems

View reviewed changes

tools/python/util/android/android.py Fixed Show fixed Hide fixed

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

You can commit the suggested changes from lintrunner.

tools/python/util/android/android.py Outdated Show resolved Hide resolved

snnn added the platform:mobile label

snnn assigned skottmckay

skottmckay reviewed

View reviewed changes

tools/python/util/android/android.py Outdated Show resolved Hide resolved


          Disable bluetooth

02d619f

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

You can commit the suggested changes from lintrunner.

tools/python/util/android/android.py Outdated Show resolved Hide resolved

jchen351 and others added 3 commits

November 18, 2024 10:30


          Update tools/python/util/android/android.py

f6a9526

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          remove -prop persist.sys.disable_bluetooth=true

2f3ddf1


          Check the avd name

b3c7cd4

github-actions bot reviewed

View reviewed changes

Contributor

github-actions bot left a comment

You can commit the suggested changes from lintrunner.

tools/python/util/android/android.py Outdated Show resolved Hide resolved

jchen351 and others added 2 commits

November 18, 2024 13:56


          Update tools/python/util/android/android.py

fbf5bcc

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>


          litrunner -a

b98dbd3

jchen351 requested a review from skottmckay

November 19, 2024 17:22

skottmckay reviewed

View reviewed changes

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Show resolved Hide resolved

tools/python/util/android/android.py Show resolved Hide resolved

tools/python/util/android/android.py Outdated Show resolved Hide resolved

tools/python/util/android/android.py Show resolved Hide resolved

skottmckay requested a review from edgchen1

November 21, 2024 09:42

jchen351 and others added 3 commits

November 21, 2024 12:53


          Update tools/python/util/android/android.py

342e42c

Co-authored-by: Scott McKay <skottmckay@gmail.com>


          Update tools/python/util/android/android.py

a36f12f

Co-authored-by: Scott McKay <skottmckay@gmail.com>


          Refactor the code

3c73a6e

jchen351 requested a review from skottmckay

November 21, 2024 21:14

skottmckay approved these changes

View reviewed changes

jchen351 merged commit 6c2ff5f into main

93 checks passed

jchen351 deleted the Cjian/check_emulator_running branch

December 2, 2024 17:29

guschmue pushed a commit that referenced this pull request


          Refactor emulator start and stop functions for clarity and efficiency (…

2b48f23

…#22861)

### Description
This pull request introduces several enhancements and new
functionalities to the `tools/python/util/android/android.py` file,
focusing on improving the management of Android emulators. The most
important changes include adding a timeout parameter to the
`start_emulator` function, adding checks to prevent multiple emulators
from running simultaneously, and introducing new utility functions to
manage emulator processes more effectively.

Enhancements to `start_emulator` function:

* Added a `timeout_minutes` parameter to the `start_emulator` function
to make the startup timeout configurable.
[[1]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL108-R117)
[[2]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL158-R170)
* Added a check to prevent starting a new emulator if one with the same
AVD name is already running.
* Included additional emulator arguments `-verbose` for better control
and debugging.
* Added a final verification step to ensure the emulator has started
successfully.

New utility functions for managing emulator processes:

* Introduced `check_emulator_running_using_avd_name `,
`check_emulator_running_using_process`, and
`check_emulator_running_using_pid` to check if an emulator is running
based on AVD name, process instance, or PID, respectively.
* Added `stop_emulator_by_proc` and `stop_emulator_by_pid` functions to
stop the emulator process using a `subprocess.Popen` instance or PID,
with a configurable timeout.
* Updated the `stop_emulator` function to use the new utility functions
for stopping the emulator process.

These changes enhance the robustness and flexibility of the emulator
management utilities, making it easier to handle different scenarios in
CI environments and development workflows.

### Motivation and Context

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scott McKay <skottmckay@gmail.com>

ankitm3k pushed a commit to intel/onnxruntime that referenced this pull request


          Refactor emulator start and stop functions for clarity and efficiency (…

721acf6

…microsoft#22861)

### Description
This pull request introduces several enhancements and new
functionalities to the `tools/python/util/android/android.py` file,
focusing on improving the management of Android emulators. The most
important changes include adding a timeout parameter to the
`start_emulator` function, adding checks to prevent multiple emulators
from running simultaneously, and introducing new utility functions to
manage emulator processes more effectively.

Enhancements to `start_emulator` function:

* Added a `timeout_minutes` parameter to the `start_emulator` function
to make the startup timeout configurable.
[[1]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL108-R117)
[[2]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL158-R170)
* Added a check to prevent starting a new emulator if one with the same
AVD name is already running.
* Included additional emulator arguments `-verbose` for better control
and debugging.
* Added a final verification step to ensure the emulator has started
successfully.

New utility functions for managing emulator processes:

* Introduced `check_emulator_running_using_avd_name `,
`check_emulator_running_using_process`, and
`check_emulator_running_using_pid` to check if an emulator is running
based on AVD name, process instance, or PID, respectively.
* Added `stop_emulator_by_proc` and `stop_emulator_by_pid` functions to
stop the emulator process using a `subprocess.Popen` instance or PID,
with a configurable timeout.
* Updated the `stop_emulator` function to use the new utility functions
for stopping the emulator process.

These changes enhance the robustness and flexibility of the emulator
management utilities, making it easier to handle different scenarios in
CI environments and development workflows.

### Motivation and Context

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scott McKay <skottmckay@gmail.com>

ankitm3k pushed a commit to intel/onnxruntime that referenced this pull request


          Refactor emulator start and stop functions for clarity and efficiency (…

f060b5c

…microsoft#22861)

### Description
This pull request introduces several enhancements and new
functionalities to the `tools/python/util/android/android.py` file,
focusing on improving the management of Android emulators. The most
important changes include adding a timeout parameter to the
`start_emulator` function, adding checks to prevent multiple emulators
from running simultaneously, and introducing new utility functions to
manage emulator processes more effectively.

Enhancements to `start_emulator` function:

* Added a `timeout_minutes` parameter to the `start_emulator` function
to make the startup timeout configurable.
[[1]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL108-R117)
[[2]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL158-R170)
* Added a check to prevent starting a new emulator if one with the same
AVD name is already running.
* Included additional emulator arguments `-verbose` for better control
and debugging.
* Added a final verification step to ensure the emulator has started
successfully.

New utility functions for managing emulator processes:

* Introduced `check_emulator_running_using_avd_name `,
`check_emulator_running_using_process`, and
`check_emulator_running_using_pid` to check if an emulator is running
based on AVD name, process instance, or PID, respectively.
* Added `stop_emulator_by_proc` and `stop_emulator_by_pid` functions to
stop the emulator process using a `subprocess.Popen` instance or PID,
with a configurable timeout.
* Updated the `stop_emulator` function to use the new utility functions
for stopping the emulator process.

These changes enhance the robustness and flexibility of the emulator
management utilities, making it easier to handle different scenarios in
CI environments and development workflows.

### Motivation and Context

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scott McKay <skottmckay@gmail.com>

tarekziade pushed a commit to tarekziade/onnxruntime that referenced this pull request


          Refactor emulator start and stop functions for clarity and efficiency (…

8cc5be7

…microsoft#22861)

### Description
This pull request introduces several enhancements and new
functionalities to the `tools/python/util/android/android.py` file,
focusing on improving the management of Android emulators. The most
important changes include adding a timeout parameter to the
`start_emulator` function, adding checks to prevent multiple emulators
from running simultaneously, and introducing new utility functions to
manage emulator processes more effectively.

Enhancements to `start_emulator` function:

* Added a `timeout_minutes` parameter to the `start_emulator` function
to make the startup timeout configurable.
[[1]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL108-R117)
[[2]](diffhunk://#diff-c54db556a9c445989f830c09ab90ce2704e648deaccce9c9e0ee4875ddaa864dL158-R170)
* Added a check to prevent starting a new emulator if one with the same
AVD name is already running.
* Included additional emulator arguments `-verbose` for better control
and debugging.
* Added a final verification step to ensure the emulator has started
successfully.

New utility functions for managing emulator processes:

* Introduced `check_emulator_running_using_avd_name `,
`check_emulator_running_using_process`, and
`check_emulator_running_using_pid` to check if an emulator is running
based on AVD name, process instance, or PID, respectively.
* Added `stop_emulator_by_proc` and `stop_emulator_by_pid` functions to
stop the emulator process using a `subprocess.Popen` instance or PID,
with a configurable timeout.
* Updated the `stop_emulator` function to use the new utility functions
for stopping the emulator process.

These changes enhance the robustness and flexibility of the emulator
management utilities, making it easier to handle different scenarios in
CI environments and development workflows.

### Motivation and Context

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scott McKay <skottmckay@gmail.com>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

platform:mobile