gnu: Handle timeval.tv_usec for glibc 64-bit time_t

snogge · snogge · commit d80d6ae63939 · 2025-05-23T15:29:09.000+02:00
For 64 bit time on 32 bit linux glibc timeval.tv_usec is actually __suseconds64_t (64 bits) while suseconds_t is still 32 bits. References: https://github.com/bminor/glibc/blob/e78caeb4ff812ae19d24d65f4d4d48508154277b/time/bits/types/struct_timeval.h
diff --git a/src/unix/linux_like/linux/gnu/b32/mod.rs b/src/unix/linux_like/linux/gnu/b32/mod.rs
@@ -15,6 +15,7 @@ pub type __fsword_t = i32;
 pub type fsblkcnt64_t = u64;
 pub type fsfilcnt64_t = u64;
 pub type __syscall_ulong_t = c_ulong;
+pub type __suseconds64_t = i64;
 
 cfg_if! {
     if #[cfg(target_arch = "riscv32")] {
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -56,10 +56,14 @@ s! {
         pub modtime: time_t,
     }
 
-    // FIXME(time): Needs updates at least for glibc _TIME_BITS=64
     pub struct timeval {
         pub tv_sec: time_t,
+        #[cfg(not(gnu_time_bits64))]
         pub tv_usec: suseconds_t,
+        // For 64 bit time on 32 bit linux glibc, suseconds_t is still
+        // a 32 bit type.  Use __suseconds64_t instead
+        #[cfg(gnu_time_bits64)]
+        pub tv_usec: __suseconds64_t,
     }
 
     // linux x32 compatibility

Original file line number	Diff line number	Diff line change
`@@ -56,10 +56,14 @@ s! {`
`56`	`56`	`pub modtime: time_t,`
`57`	`57`	`}`
`58`	`58`
`59`		`- // FIXME(time): Needs updates at least for glibc _TIME_BITS=64`
`60`	`59`	`pub struct timeval {`
`61`	`60`	`pub tv_sec: time_t,`
	`61`	`+ #[cfg(not(gnu_time_bits64))]`
`62`	`62`	`pub tv_usec: suseconds_t,`
	`63`	`+ // For 64 bit time on 32 bit linux glibc, suseconds_t is still`
	`64`	`+ // a 32 bit type. Use __suseconds64_t instead`
	`65`	`+ #[cfg(gnu_time_bits64)]`
	`66`	`+ pub tv_usec: __suseconds64_t,`
`63`	`67`	`}`
`64`	`68`
`65`	`69`	`// linux x32 compatibility`