Skip to content
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

Name spawned threads #145

Merged
merged 4 commits into from
Nov 20, 2023
Merged

Name spawned threads #145

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
c2f467c
Name spawned threads
fornwall Oct 26, 2023
d9af670
Rename threads
fornwall Nov 20, 2023
6c3583d
Merge branch 'main' into android-main-thread-name
fornwall Nov 20, 2023
eeeb802
Fix error after merge conflict
fornwall Nov 20, 2023
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
5 changes: 5 additions & 0 deletions android-activity/src/game_activity/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,11 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
};

unsafe {
// Name thread - this needs to happen here after attaching to a JVM thread,
// since that changes the thread name to something like "Thread-2".
let thread_name = std::ffi::CStr::from_bytes_with_nul(b"android_main\0").unwrap();
libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());

let app = AndroidApp::from_ptr(NonNull::new(native_app).unwrap(), jvm.clone());

// We want to specifically catch any panic from the application's android_main
Expand Down
5 changes: 5 additions & 0 deletions android-activity/src/native_activity/glue.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -868,6 +868,11 @@ extern "C" fn ANativeActivity_onCreate(
rust_glue.notify_main_thread_running();

unsafe {
// Name thread - this needs to happen here after attaching to a JVM thread,
// since that changes the thread name to something like "Thread-2".
let thread_name = std::ffi::CStr::from_bytes_with_nul(b"android_main\0").unwrap();
libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());

// We want to specifically catch any panic from the application's android_main
// so we can finish + destroy the Activity gracefully via the JVM
catch_unwind(|| {
Expand Down
Loading