Skip to content

Commit d9af670

Browse files
committed
Rename threads
1 parent c2f467c commit d9af670

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

android-activity/src/game_activity/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
926926
};
927927

928928
thread::Builder::new()
929-
.name("android-stdio".to_string())
929+
.name("stdio-to-logcat".to_string())
930930
.spawn(move || {
931931
let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
932932
let mut reader = BufReader::new(file);
@@ -960,7 +960,7 @@ pub unsafe extern "C" fn _rust_glue_entry(native_app: *mut ffi::android_app) {
960960
unsafe {
961961
// Name thread - this needs to happen here after attaching to a JVM thread,
962962
// since that changes the thread name to something like "Thread-2".
963-
let thread_name = CStr::from_bytes_with_nul(b"android-main\0").unwrap();
963+
let thread_name = CStr::from_bytes_with_nul(b"android_main\0").unwrap();
964964
libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
965965

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

android-activity/src/native_activity/glue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ extern "C" fn ANativeActivity_onCreate(
846846
};
847847

848848
std::thread::Builder::new()
849-
.name("android-stdio".to_string())
849+
.name("stdio-to-logcat".to_string())
850850
.spawn(move || {
851851
let tag = CStr::from_bytes_with_nul(b"RustStdoutStderr\0").unwrap();
852852
let mut reader = BufReader::new(file);
@@ -904,7 +904,7 @@ extern "C" fn ANativeActivity_onCreate(
904904
unsafe {
905905
// Name thread - this needs to happen here after attaching to a JVM thread,
906906
// since that changes the thread name to something like "Thread-2".
907-
let thread_name = CStr::from_bytes_with_nul(b"android-main\0").unwrap();
907+
let thread_name = CStr::from_bytes_with_nul(b"android_main\0").unwrap();
908908
libc::pthread_setname_np(libc::pthread_self(), thread_name.as_ptr());
909909

910910
// We want to specifically catch any panic from the application's android_main

0 commit comments

Comments
 (0)