Merge branch 'timespec-noncopy' into 'master'

do not derive Copy for timespec

See merge request redox-os/relibc!1082

src/header/bits_time/mod.rs

@@ -5,7 +5,7 @@ use crate::{
 
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/time.h.html>.
 #[repr(C)]
-#[derive(Clone, Copy, Default, Debug)]
+#[derive(Clone, Default, Debug)]
 pub struct timespec {
     pub tv_sec: time_t,
     pub tv_nsec: c_long,

src/header/pthread/mutex.rs

@@ -76,7 +76,7 @@ pub unsafe extern "C" fn pthread_mutex_timedlock(
     mutex: *mut pthread_mutex_t,
     abstime: &timespec,
 ) -> c_int {
-    let relative = match timespec_realtime_to_monotonic(*abstime) {
+    let relative = match timespec_realtime_to_monotonic(abstime.clone()) {
         Ok(relative) => relative,
         Err(err) => return e(Err(err)),
     };

src/header/semaphore/mod.rs

@@ -96,7 +96,7 @@ pub unsafe extern "C" fn sem_clockwait(
     clock_id: clockid_t,
     abstime: *const timespec,
 ) -> c_int {
-    if let Ok(()) = unsafe { get(sem) }.wait(Some(&unsafe { *abstime }), clock_id) {}; // TODO handle error
+    if let Ok(()) = unsafe { get(sem) }.wait(Some(&unsafe { (*abstime).clone() }), clock_id) {}; // TODO handle error
 
     0
 }
@@ -104,7 +104,8 @@ pub unsafe extern "C" fn sem_clockwait(
 /// See <https://pubs.opengroup.org/onlinepubs/9799919799/functions/sem_timedwait.html>.
 #[unsafe(no_mangle)]
 pub unsafe extern "C" fn sem_timedwait(sem: *mut sem_t, abstime: *const timespec) -> c_int {
-    if let Ok(()) = unsafe { get(sem) }.wait(Some(&unsafe { *abstime }), CLOCK_REALTIME) {}; // TODO handle error
+    if let Ok(()) = unsafe { get(sem) }.wait(Some(&unsafe { (*abstime).clone() }), CLOCK_REALTIME) {
+    }; // TODO handle error
 
     0
 }

src/platform/redox/mod.rs

@@ -1367,7 +1367,7 @@ impl Pal for Sys {
         Self::clock_gettime(timer_st.clockid, Out::from_mut(&mut now))?;
 
         if timer_st.evp.sigev_notify == SIGEV_NONE {
-            if timespec::subtract(timer_st.next_wake_time.it_value, now).is_none() {
+            if timespec::subtract(timer_st.next_wake_time.it_value.clone(), now.clone()).is_none() {
                 // error here means the timer is disarmed
                 let _ = timer_update_wake_time(timer_st);
             }
@@ -1378,8 +1378,8 @@ impl Pal for Sys {
             itimerspec::default()
         } else {
             itimerspec {
-                it_interval: timer_st.next_wake_time.it_interval,
-                it_value: timespec::subtract(timer_st.next_wake_time.it_value, now)
+                it_interval: timer_st.next_wake_time.it_interval.clone(),
+                it_value: timespec::subtract(timer_st.next_wake_time.it_value.clone(), now)
                     .unwrap_or_default(),
             }
         });

src/platform/redox/timer.rs

@@ -86,7 +86,7 @@ pub(crate) fn timer_update_wake_time(timer_st: &mut timer_internal_t) -> Result<
     } else {
         let mut now = timespec::default();
         Sys::clock_gettime(timer_st.clockid, Out::from_mut(&mut now))?;
-        let next_time = match timespec::add(now, timer_st.next_wake_time.it_interval) {
+        let next_time = match timespec::add(now, timer_st.next_wake_time.it_interval.clone()) {
             Some(a) => a,
             None => timespec::default(),
         };