From 7e7f5d385694ca345e0b47d8c59c7c966ee60a30 Mon Sep 17 00:00:00 2001 From: xizheyin Date: Tue, 11 Feb 2025 01:01:00 +0800 Subject: Replace mem::zeroed with mem::MaybeUninit::uninit for large struct in unix Signed-off-by: xizheyin --- library/std/src/sys/pal/unix/stack_overflow.rs | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'library/std/src/sys/pal/unix/stack_overflow.rs') diff --git a/library/std/src/sys/pal/unix/stack_overflow.rs b/library/std/src/sys/pal/unix/stack_overflow.rs index db5c6bd3a1c..1ccf2011ea1 100644 --- a/library/std/src/sys/pal/unix/stack_overflow.rs +++ b/library/std/src/sys/pal/unix/stack_overflow.rs @@ -319,9 +319,14 @@ mod imp { ))] unsafe fn get_stack_start() -> Option<*mut libc::c_void> { let mut ret = None; - let mut attr: libc::pthread_attr_t = crate::mem::zeroed(); - #[cfg(target_os = "freebsd")] - assert_eq!(libc::pthread_attr_init(&mut attr), 0); + let attr: mem::MaybeUninit = if cfg!(target_os = "freebsd") { + let mut attr = mem::MaybeUninit::uninit(); + assert_eq!(libc::pthread_attr_init((&raw mut attr) as *mut _), 0); + attr + } else { + mem::MaybeUninit::zeroed() + }; + let mut attr = unsafe { attr.assume_init() }; #[cfg(target_os = "freebsd")] let e = libc::pthread_attr_get_np(libc::pthread_self(), &mut attr); #[cfg(not(target_os = "freebsd"))] @@ -509,9 +514,15 @@ mod imp { // FIXME: I am probably not unsafe. unsafe fn current_guard() -> Option> { let mut ret = None; - let mut attr: libc::pthread_attr_t = crate::mem::zeroed(); - #[cfg(target_os = "freebsd")] - assert_eq!(libc::pthread_attr_init(&mut attr), 0); + let attr: mem::MaybeUninit = if cfg!(target_os = "freebsd") { + let mut attr = mem::MaybeUninit::uninit(); + assert_eq!(libc::pthread_attr_init((&raw mut attr) as *mut _), 0); + attr + } else { + mem::MaybeUninit::zeroed() + }; + + let mut attr = unsafe { attr.assume_init() }; #[cfg(target_os = "freebsd")] let e = libc::pthread_attr_get_np(libc::pthread_self(), &mut attr); #[cfg(not(target_os = "freebsd"))] -- cgit 1.4.1-3-g733a5 From 604364fcf44e0843e4ea9818daaf97418da233d5 Mon Sep 17 00:00:00 2001 From: xizheyin Date: Wed, 19 Feb 2025 13:20:03 +0800 Subject: remove assume_init in stack_overflow Signed-off-by: xizheyin --- library/std/src/sys/pal/unix/stack_overflow.rs | 15 +++++++++------ library/std/src/sys/pal/unix/thread.rs | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'library/std/src/sys/pal/unix/stack_overflow.rs') diff --git a/library/std/src/sys/pal/unix/stack_overflow.rs b/library/std/src/sys/pal/unix/stack_overflow.rs index 1ccf2011ea1..0550223eb9a 100644 --- a/library/std/src/sys/pal/unix/stack_overflow.rs +++ b/library/std/src/sys/pal/unix/stack_overflow.rs @@ -319,26 +319,29 @@ mod imp { ))] unsafe fn get_stack_start() -> Option<*mut libc::c_void> { let mut ret = None; - let attr: mem::MaybeUninit = if cfg!(target_os = "freebsd") { + let mut attr: mem::MaybeUninit = if cfg!(target_os = "freebsd") { let mut attr = mem::MaybeUninit::uninit(); assert_eq!(libc::pthread_attr_init((&raw mut attr) as *mut _), 0); attr } else { mem::MaybeUninit::zeroed() }; - let mut attr = unsafe { attr.assume_init() }; + #[cfg(target_os = "freebsd")] - let e = libc::pthread_attr_get_np(libc::pthread_self(), &mut attr); + let e = libc::pthread_attr_get_np(libc::pthread_self(), attr.as_mut_ptr()); #[cfg(not(target_os = "freebsd"))] - let e = libc::pthread_getattr_np(libc::pthread_self(), &mut attr); + let e = libc::pthread_getattr_np(libc::pthread_self(), attr.as_mut_ptr()); if e == 0 { let mut stackaddr = crate::ptr::null_mut(); let mut stacksize = 0; - assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr, &mut stacksize), 0); + assert_eq!( + libc::pthread_attr_getstack(attr.as_ptr(), &mut stackaddr, &mut stacksize), + 0 + ); ret = Some(stackaddr); } if e == 0 || cfg!(target_os = "freebsd") { - assert_eq!(libc::pthread_attr_destroy(&mut attr), 0); + assert_eq!(libc::pthread_attr_destroy(attr.as_mut_ptr()), 0); } ret } diff --git a/library/std/src/sys/pal/unix/thread.rs b/library/std/src/sys/pal/unix/thread.rs index d476f6600bf..e23d3d6d647 100644 --- a/library/std/src/sys/pal/unix/thread.rs +++ b/library/std/src/sys/pal/unix/thread.rs @@ -51,7 +51,6 @@ impl Thread { let mut native: libc::pthread_t = mem::zeroed(); let mut attr: mem::MaybeUninit = mem::MaybeUninit::uninit(); assert_eq!(libc::pthread_attr_init(attr.as_mut_ptr()), 0); - //let mut attr: libc::pthread_attr_t = unsafe { attr.assume_init() }; #[cfg(target_os = "espidf")] if stack > 0 { -- cgit 1.4.1-3-g733a5 From 70f11ee0c063fa85dff72306c2ec29532b8cabeb Mon Sep 17 00:00:00 2001 From: xizheyin Date: Wed, 19 Feb 2025 20:16:28 +0800 Subject: fix by comments Signed-off-by: xizheyin --- library/std/src/sys/pal/unix/stack_overflow.rs | 38 ++++++++++++-------------- 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'library/std/src/sys/pal/unix/stack_overflow.rs') diff --git a/library/std/src/sys/pal/unix/stack_overflow.rs b/library/std/src/sys/pal/unix/stack_overflow.rs index 0550223eb9a..43ece63457f 100644 --- a/library/std/src/sys/pal/unix/stack_overflow.rs +++ b/library/std/src/sys/pal/unix/stack_overflow.rs @@ -319,14 +319,12 @@ mod imp { ))] unsafe fn get_stack_start() -> Option<*mut libc::c_void> { let mut ret = None; - let mut attr: mem::MaybeUninit = if cfg!(target_os = "freebsd") { - let mut attr = mem::MaybeUninit::uninit(); - assert_eq!(libc::pthread_attr_init((&raw mut attr) as *mut _), 0); - attr - } else { - mem::MaybeUninit::zeroed() - }; - + let mut attr: mem::MaybeUninit = mem::MaybeUninit::uninit(); + if !cfg!(target_os = "freebsd") { + attr = mem::MaybeUninit::zeroed(); + } + #[cfg(target_os = "freebsd")] + assert_eq!(libc::pthread_attr_init(attr.as_mut_ptr()), 0); #[cfg(target_os = "freebsd")] let e = libc::pthread_attr_get_np(libc::pthread_self(), attr.as_mut_ptr()); #[cfg(not(target_os = "freebsd"))] @@ -517,22 +515,20 @@ mod imp { // FIXME: I am probably not unsafe. unsafe fn current_guard() -> Option> { let mut ret = None; - let attr: mem::MaybeUninit = if cfg!(target_os = "freebsd") { - let mut attr = mem::MaybeUninit::uninit(); - assert_eq!(libc::pthread_attr_init((&raw mut attr) as *mut _), 0); - attr - } else { - mem::MaybeUninit::zeroed() - }; - let mut attr = unsafe { attr.assume_init() }; + let mut attr: mem::MaybeUninit = mem::MaybeUninit::uninit(); + if !cfg!(target_os = "freebsd") { + attr = mem::MaybeUninit::zeroed(); + } + #[cfg(target_os = "freebsd")] + assert_eq!(libc::pthread_attr_init(attr.as_mut_ptr()), 0); #[cfg(target_os = "freebsd")] - let e = libc::pthread_attr_get_np(libc::pthread_self(), &mut attr); + let e = libc::pthread_attr_get_np(libc::pthread_self(), attr.as_mut_ptr()); #[cfg(not(target_os = "freebsd"))] - let e = libc::pthread_getattr_np(libc::pthread_self(), &mut attr); + let e = libc::pthread_getattr_np(libc::pthread_self(), attr.as_mut_ptr()); if e == 0 { let mut guardsize = 0; - assert_eq!(libc::pthread_attr_getguardsize(&attr, &mut guardsize), 0); + assert_eq!(libc::pthread_attr_getguardsize(attr.as_ptr(), &mut guardsize), 0); if guardsize == 0 { if cfg!(all(target_os = "linux", target_env = "musl")) { // musl versions before 1.1.19 always reported guard @@ -545,7 +541,7 @@ mod imp { } let mut stackptr = crate::ptr::null_mut::(); let mut size = 0; - assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackptr, &mut size), 0); + assert_eq!(libc::pthread_attr_getstack(attr.as_ptr(), &mut stackptr, &mut size), 0); let stackaddr = stackptr.addr(); ret = if cfg!(any(target_os = "freebsd", target_os = "netbsd", target_os = "hurd")) { @@ -566,7 +562,7 @@ mod imp { }; } if e == 0 || cfg!(target_os = "freebsd") { - assert_eq!(libc::pthread_attr_destroy(&mut attr), 0); + assert_eq!(libc::pthread_attr_destroy(attr.as_mut_ptr()), 0); } ret } -- cgit 1.4.1-3-g733a5