Make sigval an union

Author: kellda

libc-test/build.rs

@@ -293,9 +293,6 @@ fn test_apple(target: &str) {
             return true;
         }
         match ty {
-            // FIXME: actually a union
-            "sigval" => true,
-
             // FIXME: The size is changed in recent macOSes.
             "malloc_zone_t" => true,
             // it is a moving target, changing through versions
@@ -391,14 +388,6 @@ fn test_apple(target: &str) {
         }
     });
 
-    cfg.skip_field_type(move |struct_, field| {
-        match (struct_, field) {
-            // FIXME: actually a union
-            ("sigevent", "sigev_value") => true,
-            _ => false,
-        }
-    });
-
     cfg.volatile_item(|i| {
         use ctest::VolatileItemKind::*;
         match i {
@@ -538,27 +527,6 @@ fn test_openbsd(target: &str) {
         "sys/param.h",
     }
 
-    cfg.skip_struct(move |ty| {
-        if ty.starts_with("__c_anonymous_") {
-            return true;
-        }
-        match ty {
-            // FIXME: actually a union
-            "sigval" => true,
-
-            _ => false,
-        }
-    });
-
-    cfg.skip_const(move |name| {
-        match name {
-            // Removed in OpenBSD 7.7 (unused since 1991)
-            "ATF_COM" | "ATF_PERM" | "ATF_PUBL" | "ATF_USETRAILERS" => true,
-
-            _ => false,
-        }
-    });
-
     cfg.skip_fn(move |name| {
         match name {
             // futex() has volatile arguments, but that doesn't exist in Rust.
@@ -953,8 +921,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,
@@ -974,8 +940,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,
 
@@ -1198,8 +1162,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,
@@ -1250,8 +1212,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")
     });
@@ -1380,9 +1340,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" => format!("union sigval"),
-
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {}", t),
 
@@ -1476,8 +1433,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")
     });
@@ -1768,9 +1723,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" => format!("union sigval"),
-
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {}", t),
 
@@ -2061,8 +2013,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: `sa_sigaction` has type `sighandler_t` but that type is
@@ -2268,9 +2218,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" => format!("union sigval"),
-
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {}", t),
 
@@ -2890,13 +2837,13 @@ fn test_emscripten(target: &str) {
 
     cfg.skip_struct(move |ty| {
         match ty {
-            // This is actually a union, not a struct
-            "sigval" => true,
+            // FIXME: It was removed in
+            // emscripten-core/emscripten@953e414
+            "pthread_mutexattr_t" => true,
 
             // FIXME: Investigate why the test fails.
             // Skip for now to unblock CI.
             "pthread_condattr_t" => true,
-            "pthread_mutexattr_t" => true,
 
             // No epoll support
             // https://github.com/emscripten-core/emscripten/issues/5033
@@ -2969,8 +2916,9 @@ fn test_emscripten(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
+        // FIXME: is this necessary?
+        (struct_ == "aiocb" && field == "aio_buf")
     });
 
     cfg.skip_field(move |struct_, field| {
@@ -3164,9 +3112,6 @@ fn test_neutrino(target: &str) {
         match ty {
             "Elf64_Phdr" | "Elf32_Phdr" => true,
 
-            // FIXME: This is actually a union, not a struct
-            "sigval" => true,
-
             // union
             "_channel_connect_attr" => true,
 
@@ -3218,8 +3163,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"
     });
@@ -3228,8 +3171,6 @@ fn test_neutrino(target: &str) {
         (struct_ == "__sched_param" && field == "reserved") ||
         (struct_ == "sched_param" && field == "reserved") ||
         (struct_ == "sigevent" && field == "__padding1") || // ensure alignment
-        (struct_ == "sigevent" && field == "__padding2") || // union
-        (struct_ == "sigevent" && field == "__sigev_un2") || // union
         // sighandler_t type is super weird
         (struct_ == "sigaction" && field == "sa_sigaction") ||
         // does not exist
@@ -3338,10 +3279,8 @@ fn test_vxworks(target: &str) {
 
     // FIXME
     cfg.skip_fn(move |name| match name {
-        // sigval
-        "sigqueue" | "_sigqueue"
         // sighandler_t
-        | "signal"
+        "signal"
         // not used in static linking by default
         | "dlerror" => true,
         _ => false,
@@ -3747,9 +3686,6 @@ fn test_linux(target: &str) {
             // which is absent in glibc, has to be defined.
             "__timeval" => true,
 
-            // FIXME: 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.
@@ -4415,8 +4351,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
@@ -4860,8 +4794,6 @@ fn test_haiku(target: &str) {
             return true;
         }
         match ty {
-            // FIXME: actually a union
-            "sigval" => true,
             // FIXME: locale_t does not exist on Haiku
             "locale_t" => true,
             // FIXME: rusage has a different layout on Haiku
@@ -4968,10 +4900,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
@@ -5022,8 +4952,6 @@ fn test_haiku(target: &str) {
                 ty.to_string()
             }
 
-            // is actually a union
-            "sigval" => format!("union sigval"),
             t if is_union => format!("union {}", t),
             t if t.ends_with("_t") => t.to_string(),
             t if is_struct => format!("struct {}", t),

src/fuchsia/mod.rs

@@ -253,11 +253,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: ::timeval,
@@ -1046,6 +1041,11 @@ s_no_extra_traits! {
     pub struct pthread_cond_t {
         size: [u8; ::__SIZEOF_PTHREAD_COND_T],
     }
+
+    pub union sigval {
+        pub sival_int: ::int,
+        pub sival_ptr: *mut ::c_void,
+    }
 }
 
 cfg_if! {
@@ -1340,16 +1340,6 @@ cfg_if! {
             }
         }
 
-        impl PartialEq for sigevent {
-            fn eq(&self, other: &sigevent) -> bool {
-                self.sigev_value == other.sigev_value
-                    && self.sigev_signo == other.sigev_signo
-                    && self.sigev_notify == other.sigev_notify
-                    && self.sigev_notify_function == other.sigev_notify_function
-                    && self.sigev_notify_attributes == other.sigev_notify_attributes
-            }
-        }
-        impl Eq for sigevent {}
         impl ::fmt::Debug for sigevent {
             fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
                 f.debug_struct("sigevent")
@@ -1361,70 +1351,10 @@ cfg_if! {
                     .finish()
             }
         }
-        impl ::hash::Hash for sigevent {
-            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-                self.sigev_value.hash(state);
-                self.sigev_signo.hash(state);
-                self.sigev_notify.hash(state);
-                self.sigev_notify_function.hash(state);
-                self.sigev_notify_attributes.hash(state);
-            }
-        }
 
-        impl PartialEq for pthread_cond_t {
-            fn eq(&self, other: &pthread_cond_t) -> bool {
-                self.size.iter().zip(other.size.iter()).all(|(a, b)| a == b)
-            }
-        }
-        impl Eq for pthread_cond_t {}
-        impl ::fmt::Debug for pthread_cond_t {
+        impl ::fmt::Debug for sigval {
             fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
-                f.debug_struct("pthread_cond_t")
-                    // FIXME: .field("size", &self.size)
-                    .finish()
-            }
-        }
-        impl ::hash::Hash for pthread_cond_t {
-            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-                self.size.hash(state);
-            }
-        }
-
-        impl PartialEq for pthread_mutex_t {
-            fn eq(&self, other: &pthread_mutex_t) -> bool {
-                self.size.iter().zip(other.size.iter()).all(|(a, b)| a == b)
-            }
-        }
-        impl Eq for pthread_mutex_t {}
-        impl ::fmt::Debug for pthread_mutex_t {
-            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
-                f.debug_struct("pthread_mutex_t")
-                    // FIXME: .field("size", &self.size)
-                    .finish()
-            }
-        }
-        impl ::hash::Hash for pthread_mutex_t {
-            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-                self.size.hash(state);
-            }
-        }
-
-        impl PartialEq for pthread_rwlock_t {
-            fn eq(&self, other: &pthread_rwlock_t) -> bool {
-                self.size.iter().zip(other.size.iter()).all(|(a, b)| a == b)
-            }
-        }
-        impl Eq for pthread_rwlock_t {}
-        impl ::fmt::Debug for pthread_rwlock_t {
-            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result {
-                f.debug_struct("pthread_rwlock_t")
-                    // FIXME: .field("size", &self.size)
-                    .finish()
-            }
-        }
-        impl ::hash::Hash for pthread_rwlock_t {
-            fn hash<H: ::hash::Hasher>(&self, state: &mut H) {
-                self.size.hash(state);
+                f.debug_struct("sigval").finish_non_exhaustive()
             }
         }
     }