Make sigval an union

kellda · kellda · commit 434d034ee95a · 2025-07-05T10:35:35.000+02:00
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -331,9 +331,6 @@ fn test_apple(target: &str) {
             return true;
         }
         match ty {
-            // FIXME(union): actually a union
-            "sigval" => true,
-
             // FIXME(macos): The size is changed in recent macOSes.
             "malloc_zone_t" => true,
             // it is a moving target, changing through versions
@@ -429,14 +426,6 @@ fn test_apple(target: &str) {
         }
     });
 
-    cfg.skip_field_type(move |struct_, field| {
-        match (struct_, field) {
-            // FIXME(union): actually a union
-            ("sigevent", "sigev_value") => true,
-            _ => false,
-        }
-    });
-
     cfg.volatile_item(|i| {
         use ctest::VolatileItemKind::*;
         match i {
@@ -576,23 +565,8 @@ fn test_openbsd(target: &str) {
         "sys/param.h",
     }
 
-    cfg.skip_struct(move |ty| {
-        if ty.starts_with("__c_anonymous_") {
-            return true;
-        }
-        match ty {
-            // FIXME(union): actually a union
-            "sigval" => true,
-
-            _ => false,
-        }
-    });
-
     cfg.skip_const(move |name| {
         match name {
-            // Removed in OpenBSD 7.7
-            "ATF_COM" | "ATF_PERM" | "ATF_PUBL" | "ATF_USETRAILERS" => true,
-
             // Removed in OpenBSD 7.8
             "CTL_FS" | "SO_NETPROC" => true,
 
@@ -720,9 +694,6 @@ fn test_cygwin(target: &str) {
 
             t if t.ends_with("_t") => t.to_string(),
 
-            // sigval is a struct in Rust, but a union in C:
-            "sigval" => "union sigval".to_string(),
-
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {t}"),
 
@@ -1174,8 +1145,6 @@ fn test_solarish(target: &str) {
             return true;
         }
         match ty {
-            // union, not a struct
-            "sigval" => true,
             // a bunch of solaris-only fields
             "utmpx" if is_illumos => true,
             _ => false,
@@ -1195,8 +1164,6 @@ fn test_solarish(target: &str) {
             "sigaction" if field == "sa_sigaction" => true,
             // Missing in illumos
             "sigevent" if field == "ss_sp" => true,
-            // Avoid sigval union issues
-            "sigevent" if field == "sigev_value" => true,
             // const issues
             "sigevent" if field == "sigev_notify_attributes" => true,
 
@@ -1423,8 +1390,6 @@ fn test_netbsd(target: &str) {
 
     cfg.skip_struct(move |ty| {
         match ty {
-            // This is actually a union, not a struct
-            "sigval" => true,
             // These are tested as part of the linux_fcntl tests since there are
             // header conflicts when including them with all the other structs.
             "termios2" => true,
@@ -1476,8 +1441,6 @@ fn test_netbsd(target: &str) {
         (struct_ == "ifaddrs" && field == "ifa_ifu") ||
         // sighandler_t type is super weird
         (struct_ == "sigaction" && field == "sa_sigaction") ||
-        // sigval is actually a union, but we pretend it's a struct
-        (struct_ == "sigevent" && field == "sigev_value") ||
         // aio_buf is "volatile void*" and Rust doesn't understand volatile
         (struct_ == "aiocb" && field == "aio_buf")
     });
@@ -1606,9 +1569,6 @@ fn test_dragonflybsd(target: &str) {
 
             t if t.ends_with("_t") => t.to_string(),
 
-            // sigval is a struct in Rust, but a union in C:
-            "sigval" => "union sigval".to_string(),
-
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {t}"),
 
@@ -1701,8 +1661,6 @@ fn test_dragonflybsd(target: &str) {
         (struct_ == "ifaddrs" && field == "ifa_ifu") ||
         // sighandler_t type is super weird
         (struct_ == "sigaction" && field == "sa_sigaction") ||
-        // sigval is actually a union, but we pretend it's a struct
-        (struct_ == "sigevent" && field == "sigev_value") ||
         // aio_buf is "volatile void*" and Rust doesn't understand volatile
         (struct_ == "aiocb" && field == "aio_buf")
     });
@@ -1993,9 +1951,6 @@ fn test_android(target: &str) {
 
             t if t.ends_with("_t") => t.to_string(),
 
-            // sigval is a struct in Rust, but a union in C:
-            "sigval" => "union sigval".to_string(),
-
             "Ioctl" => "int".to_string(),
 
             // put `struct` in front of all structs:.
@@ -2300,8 +2255,6 @@ fn test_android(target: &str) {
     cfg.skip_field_type(move |struct_, field| {
         // This is a weird union, don't check the type.
         (struct_ == "ifaddrs" && field == "ifa_ifu") ||
-        // sigval is actually a union, but we pretend it's a struct
-        (struct_ == "sigevent" && field == "sigev_value") ||
         // this one is an anonymous union
         (struct_ == "ff_effect" && field == "u") ||
         // FIXME(android): `sa_sigaction` has type `sighandler_t` but that type is
@@ -2504,9 +2457,6 @@ fn test_freebsd(target: &str) {
 
             t if t.ends_with("_t") => t.to_string(),
 
-            // sigval is a struct in Rust, but a union in C:
-            "sigval" => "union sigval".to_string(),
-
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {t}"),
 
@@ -3140,7 +3090,8 @@ fn test_emscripten(target: &str) {
             return true;
         }
         match ty {
-            // This is actually a union, not a struct
+            // FIXME(emscripten): Investigate why the test fails.
+            // Skip for now to unblock CI.
             "sigval" => true,
 
             // FIXME(emscripten): Investigate why the test fails.
@@ -3221,9 +3172,7 @@ fn test_emscripten(target: &str) {
         // This is a weird union, don't check the type.
         (struct_ == "ifaddrs" && field == "ifa_ifu") ||
         // sighandler_t type is super weird
-        (struct_ == "sigaction" && field == "sa_sigaction") ||
-        // sigval is actually a union, but we pretend it's a struct
-        (struct_ == "sigevent" && field == "sigev_value")
+        (struct_ == "sigaction" && field == "sa_sigaction")
     });
 
     cfg.skip_field(move |struct_, field| {
@@ -3436,9 +3385,6 @@ fn test_neutrino(target: &str) {
         match ty {
             "Elf64_Phdr" | "Elf32_Phdr" => true,
 
-            // FIXME(union): This is actually a union, not a struct
-            "sigval" => true,
-
             // union
             "_channel_connect_attr" => true,
 
@@ -3493,8 +3439,6 @@ fn test_neutrino(target: &str) {
     });
 
     cfg.skip_field_type(move |struct_, field| {
-        // sigval is actually a union, but we pretend it's a struct
-        struct_ == "sigevent" && field == "sigev_value" ||
         // Anonymous structures
         struct_ == "_idle_hook" && field == "time"
     });
@@ -3505,8 +3449,6 @@ fn test_neutrino(target: &str) {
             ("__sched_param", "reserved")
             | ("sched_param", "reserved")
             | ("sigevent", "__padding1") // ensure alignment
-            | ("sigevent", "__padding2") // union
-            | ("sigevent", "__sigev_un2") // union
             | ("sigaction", "sa_sigaction") // sighandler_t type is super weird
             | ("syspage_entry", "__reserved") // does not exist
         )
@@ -3611,10 +3553,8 @@ fn test_vxworks(target: &str) {
 
     // FIXME(vxworks)
     cfg.skip_fn(move |name| match name {
-        // sigval
-        "sigqueue" | "_sigqueue"
         // sighandler_t
-        | "signal"
+        "signal"
         // not used in static linking by default
         | "dlerror" => true,
         _ => false,
@@ -4051,9 +3991,6 @@ fn test_linux(target: &str) {
             // which is absent in glibc, has to be defined.
             "__timeval" => true,
 
-            // FIXME(union): This is actually a union, not a struct
-            "sigval" => true,
-
             // This type is tested in the `linux_termios.rs` file since there
             // are header conflicts when including them with all the other
             // structs.
@@ -4740,12 +4677,6 @@ fn test_linux(target: &str) {
             // Needs musl 1.2.3 or later.
             "pthread_getname_np" if old_musl => true,
 
-            // pthread_sigqueue uses sigval, which was initially declared
-            // as a struct but should be defined as a union. However due
-            // to the issues described here: https://github.com/rust-lang/libc/issues/2816
-            // it can't be changed from struct.
-            "pthread_sigqueue" => true,
-
             // There are two versions of basename(3) on Linux with glibc, see
             //
             // https://man7.org/linux/man-pages/man3/basename.3.html
@@ -4779,8 +4710,6 @@ fn test_linux(target: &str) {
         (struct_ == "sigaction" && field == "sa_sigaction") ||
         // __timeval type is a patch which doesn't exist in glibc
         (struct_ == "utmpx" && field == "ut_tv") ||
-        // sigval is actually a union, but we pretend it's a struct
-        (struct_ == "sigevent" && field == "sigev_value") ||
         // this one is an anonymous union
         (struct_ == "ff_effect" && field == "u") ||
         // `__exit_status` type is a patch which is absent in musl
@@ -5261,8 +5190,6 @@ fn test_haiku(target: &str) {
             return true;
         }
         match ty {
-            // FIXME(union): actually a union
-            "sigval" => true,
             // FIXME(haiku): locale_t does not exist on Haiku
             "locale_t" => true,
             // FIXME(haiku): rusage has a different layout on Haiku
@@ -5369,10 +5296,8 @@ fn test_haiku(target: &str) {
             ("stat", "st_crtime_nsec") => true,
 
             // these are actually unions, but we cannot represent it well
-            ("siginfo_t", "sigval") => true,
             ("sem_t", "named_sem_id") => true,
             ("sigaction", "sa_sigaction") => true,
-            ("sigevent", "sigev_value") => true,
             ("fpu_state", "_fpreg") => true,
             ("cpu_topology_node_info", "data") => true,
             // these fields have a simplified data definition in libc
@@ -5423,8 +5348,6 @@ fn test_haiku(target: &str) {
                 ty.to_string()
             }
 
-            // is actually a union
-            "sigval" => "union sigval".to_string(),
             t if is_union => format!("union {t}"),
             t if t.ends_with("_t") => t.to_string(),
             t if is_struct => format!("struct {t}"),
@@ -5563,9 +5486,6 @@ fn test_aix(target: &str) {
         "FILE" => ty.to_string(),
         "ACTION" => ty.to_string(),
 
-        // 'sigval' is a struct in Rust, but a union in C.
-        "sigval" => format!("union sigval"),
-
         t if t.ends_with("_t") => t.to_string(),
         t if is_struct => format!("struct {}", t),
         t if is_union => format!("union {}", t),
@@ -5586,9 +5506,6 @@ fn test_aix(target: &str) {
 
     cfg.skip_struct(move |ty| {
         match ty {
-            // FIXME(union): actually a union.
-            "sigval" => true,
-
             // '__poll_ctl_ext_u' and '__pollfd_ext_u' are for unnamed unions.
             "__poll_ctl_ext_u" => true,
             "__pollfd_ext_u" => true,
diff --git a/src/fuchsia/mod.rs b/src/fuchsia/mod.rs
@@ -240,11 +240,6 @@ s! {
         pub l_linger: c_int,
     }
 
-    pub struct sigval {
-        // Actually a union of an int and a void*
-        pub sival_ptr: *mut c_void,
-    }
-
     // <sys/time.h>
     pub struct itimerval {
         pub it_interval: crate::timeval,
@@ -1043,6 +1038,11 @@ s_no_extra_traits! {
     pub struct pthread_cond_t {
         size: [u8; crate::__SIZEOF_PTHREAD_COND_T],
     }
+
+    pub union sigval {
+        pub sival_int: c_int,
+        pub sival_ptr: *mut c_void,
+    }
 }
 
 cfg_if! {
@@ -1305,6 +1305,18 @@ cfg_if! {
                 self.size.hash(state);
             }
         }
+
+        impl PartialEq for sigval {
+            fn eq(&self, other: &sigval) -> bool {
+                unimplemented!("traits")
+            }
+        }
+        impl Eq for sigval {}
+        impl hash::Hash for sigval {
+            fn hash<H: hash::Hasher>(&self, state: &mut H) {
+                unimplemented!("traits")
+            }
+        }
     }
 }
 
diff --git a/src/unix/mod.rs b/src/unix/mod.rs
@@ -174,11 +174,6 @@ s! {
         pub l_linger: c_int,
     }
 
-    pub struct sigval {
-        // Actually a union of an int and a void*
-        pub sival_ptr: *mut c_void,
-    }
-
     // <sys/time.h>
     pub struct itimerval {
         pub it_interval: crate::timeval,
@@ -218,6 +213,29 @@ s! {
     }
 }
 
+s_no_extra_traits! {
+    pub union sigval {
+        pub sival_int: c_int,
+        pub sival_ptr: *mut c_void,
+    }
+}
+
+cfg_if! {
+    if #[cfg(feature = "extra_traits")] {
+        impl PartialEq for sigval {
+            fn eq(&self, _other: &sigval) -> bool {
+                unimplemented!("traits")
+            }
+        }
+        impl Eq for sigval {}
+        impl hash::Hash for sigval {
+            fn hash<H: hash::Hasher>(&self, _state: &mut H) {
+                unimplemented!("traits")
+            }
+        }
+    }
+}
+
 pub const INT_MIN: c_int = -2147483648;
 pub const INT_MAX: c_int = 2147483647;
 

Original file line number	Diff line number	Diff line change
`@@ -240,11 +240,6 @@ s! {`
`240`	`240`	`pub l_linger: c_int,`
`241`	`241`	`}`
`242`	`242`
`243`		`- pub struct sigval {`
`244`		`- // Actually a union of an int and a void*`
`245`		`- pub sival_ptr: *mut c_void,`
`246`		`- }`
`247`		`-`
`248`	`243`	`// <sys/time.h>`
`249`	`244`	`pub struct itimerval {`
`250`	`245`	`pub it_interval: crate::timeval,`
`@@ -1043,6 +1038,11 @@ s_no_extra_traits! {`
`1043`	`1038`	`pub struct pthread_cond_t {`
`1044`	`1039`	`size: [u8; crate::__SIZEOF_PTHREAD_COND_T],`
`1045`	`1040`	`}`
	`1041`	`+`
	`1042`	`+ pub union sigval {`
	`1043`	`+ pub sival_int: c_int,`
	`1044`	`+ pub sival_ptr: *mut c_void,`
	`1045`	`+ }`
`1046`	`1046`	`}`
`1047`	`1047`
`1048`	`1048`	`cfg_if! {`
`@@ -1305,6 +1305,18 @@ cfg_if! {`
`1305`	`1305`	`self.size.hash(state);`
`1306`	`1306`	`}`
`1307`	`1307`	`}`
	`1308`	`+`
	`1309`	`+ impl PartialEq for sigval {`
	`1310`	`+ fn eq(&self, other: &sigval) -> bool {`
	`1311`	`+ unimplemented!("traits")`
	`1312`	`+ }`
	`1313`	`+ }`
	`1314`	`+ impl Eq for sigval {}`
	`1315`	`+ impl hash::Hash for sigval {`
	`1316`	`+ fn hash<H: hash::Hasher>(&self, state: &mut H) {`
	`1317`	`+ unimplemented!("traits")`
	`1318`	`+ }`
	`1319`	`+ }`
`1308`	`1320`	`}`
`1309`	`1321`	`}`
`1310`	`1322`