Delete unportable parts and add rule for clockid_t

Author: lucic71

rules/time/src.c

@@ -41,3 +41,7 @@ int f8(struct timeval *tv, void *tz) {
 #else
 #error "Unsupported platform for gettimeofday"
 #endif
+
+clockid_t f9() {
+  return CLOCK_REALTIME;
+}

rules/time/tgt_refcount.rs

@@ -32,8 +32,8 @@ fn f1(a0: Ptr<::libc::time_t>) -> ::libc::time_t {
     }
 }
 
-fn f2(a0: ::libc::clockid_t, a1: Ptr<Timespec>) -> i32 {
-    match nix::time::clock_gettime(nix::time::ClockId::from_raw(a0)) {
+fn f2(a0: nix::time::ClockId, a1: Ptr<Timespec>) -> i32 {
+    match nix::time::clock_gettime(a0) {
         Ok(__ts) => {
             a1.with_mut(|__t| {
                 *__t.tv_sec.borrow_mut() = __ts.tv_sec() as i64;
@@ -146,3 +146,7 @@ fn f8(a0: Ptr<Timeval>, a1: AnyPtr) -> i32 {
         }
     }
 }
+
+unsafe fn f9() -> nix::time::ClockId {
+    nix::time::ClockId::CLOCK_REALTIME
+}

rules/time/tgt_unsafe.rs

@@ -51,3 +51,7 @@ unsafe fn f8(a0: *mut libc::timeval, a1: *mut libc::timezone) -> i32 {
 unsafe fn f8(a0: *mut libc::timeval, a1: *mut libc::c_void) -> i32 {
     libc::gettimeofday(a0, a1)
 }
+
+unsafe fn f9() -> libc::clockid_t {
+    libc::CLOCK_REALTIME
+}

tests/unit/out/refcount/sys_time.rs

@@ -47,7 +47,7 @@ pub fn test_time_0() {
 pub fn test_clock_gettime_1() {
     let ts: Value<libcc2rs::Timespec> = Rc::new(RefCell::new(Default::default()));
     assert!(
-        (((match nix::time::clock_gettime(nix::time::ClockId::from_raw(0)) {
+        (((match nix::time::clock_gettime(nix::time::ClockId::CLOCK_REALTIME) {
             Ok(__ts) => {
                 (ts.as_pointer()).with_mut(|__t| {
                     *__t.tv_sec.borrow_mut() = __ts.tv_sec() as i64;
@@ -283,137 +283,6 @@ pub fn test_strftime_4() {
             != 0)
     );
 }
-pub fn test_gettimeofday_5() {
-    let tv: Value<libcc2rs::Timeval> = Rc::new(RefCell::new(Default::default()));
-    assert!(
-        (((match nix::time::clock_gettime(nix::time::ClockId::CLOCK_REALTIME) {
-            Ok(__ts) => {
-                (tv.as_pointer()).with_mut(|__tv| {
-                    *__tv.tv_sec.borrow_mut() = __ts.tv_sec() as i64;
-                    *__tv.tv_usec.borrow_mut() = (__ts.tv_nsec() / 1000) as i64;
-                });
-                0
-            }
-            Err(__e) => {
-                libcc2rs::cpp2rust_errno().write(__e as i32);
-                -1
-            }
-        } == 0) as i32)
-            != 0)
-    );
-    assert!(((((*(*tv.borrow()).tv_sec.borrow()) > 1500000000_i64) as i32) != 0));
-    assert!(
-        (((((((*(*tv.borrow()).tv_usec.borrow()) >= 0_i64) as i32) != 0)
-            && ((((*(*tv.borrow()).tv_usec.borrow()) < 1000000_i64) as i32) != 0))
-            as i32)
-            != 0)
-    );
-}
-pub fn test_utimes_6() {
-    let path: Value<Ptr<u8>> = Rc::new(RefCell::new(Ptr::from_string_literal(
-        b"/tmp/cpp2rust_utimes_test.tmp",
-    )));
-    let fp: Value<Ptr<::std::fs::File>> = Rc::new(RefCell::new(
-        match Ptr::from_string_literal(b"wb").to_rust_string() {
-            v if v == "rb" => std::fs::OpenOptions::new()
-                .read(true)
-                .open((*path.borrow()).to_rust_string())
-                .ok()
-                .map_or(Ptr::null(), |f| Ptr::alloc(f)),
-            v if v == "wb" => std::fs::OpenOptions::new()
-                .write(true)
-                .create(true)
-                .truncate(true)
-                .open((*path.borrow()).to_rust_string())
-                .ok()
-                .map_or(Ptr::null(), |f| Ptr::alloc(f)),
-            _ => panic!("unsupported mode"),
-        },
-    ));
-    assert!((((!((*fp.borrow()).is_null())) as i32) != 0));
-    assert!(
-        ((({
-            (*fp.borrow()).delete();
-            0
-        } == 0) as i32)
-            != 0)
-    );
-    let times: Value<Box<[libcc2rs::Timeval]>> = Rc::new(RefCell::new(
-        (0..2)
-            .map(|_| Default::default())
-            .collect::<Box<[libcc2rs::Timeval]>>(),
-    ));
-    (*(*times.borrow())[(0) as usize].tv_sec.borrow_mut()) = 1000000000_i64;
-    (*(*times.borrow())[(0) as usize].tv_usec.borrow_mut()) = 0_i64;
-    (*(*times.borrow())[(1) as usize].tv_sec.borrow_mut()) = 1000000001_i64;
-    (*(*times.borrow())[(1) as usize].tv_usec.borrow_mut()) = 0_i64;
-    assert!(
-        ((({
-            let __times = (times.as_pointer() as Ptr<libcc2rs::Timeval>);
-            let __at = __times.with(|__tv| {
-                nix::sys::time::TimeVal::new(
-                    *__tv.tv_sec.borrow() as ::libc::time_t,
-                    *__tv.tv_usec.borrow() as ::libc::suseconds_t,
-                )
-            });
-            let __mt = __times.offset(1).with(|__tv| {
-                nix::sys::time::TimeVal::new(
-                    *__tv.tv_sec.borrow() as ::libc::time_t,
-                    *__tv.tv_usec.borrow() as ::libc::suseconds_t,
-                )
-            });
-            match nix::sys::stat::utimes((*path.borrow()).to_rust_string().as_str(), &__at, &__mt) {
-                Ok(()) => 0,
-                Err(__e) => {
-                    libcc2rs::cpp2rust_errno().write(__e as i32);
-                    -1
-                }
-            }
-        } == 0) as i32)
-            != 0)
-    );
-    assert!(
-        ((({
-            let __times = (times.as_pointer() as Ptr<libcc2rs::Timeval>);
-            let __at = __times.with(|__tv| {
-                nix::sys::time::TimeVal::new(
-                    *__tv.tv_sec.borrow() as ::libc::time_t,
-                    *__tv.tv_usec.borrow() as ::libc::suseconds_t,
-                )
-            });
-            let __mt = __times.offset(1).with(|__tv| {
-                nix::sys::time::TimeVal::new(
-                    *__tv.tv_sec.borrow() as ::libc::time_t,
-                    *__tv.tv_usec.borrow() as ::libc::suseconds_t,
-                )
-            });
-            match nix::sys::stat::utimes(
-                Ptr::from_string_literal(b"/tmp/cpp2rust_utimes_test_missing.tmp")
-                    .to_rust_string()
-                    .as_str(),
-                &__at,
-                &__mt,
-            ) {
-                Ok(()) => 0,
-                Err(__e) => {
-                    libcc2rs::cpp2rust_errno().write(__e as i32);
-                    -1
-                }
-            }
-        } == -1_i32) as i32)
-            != 0)
-    );
-    assert!(
-        (((match nix::unistd::unlink((*path.borrow()).to_rust_string().as_str()) {
-            Ok(()) => 0,
-            Err(__e) => {
-                libcc2rs::cpp2rust_errno().write(__e as i32);
-                -1
-            }
-        } == 0) as i32)
-            != 0)
-    );
-}
 pub fn main() {
     std::process::exit(main_0());
 }
@@ -422,7 +291,5 @@ fn main_0() -> i32 {
     ({ test_clock_gettime_1() });
     ({ test_gmtime_r_3() });
     ({ test_strftime_4() });
-    ({ test_gettimeofday_5() });
-    ({ test_utimes_6() });
     return 0;
 }

tests/unit/out/unsafe/sys_time.rs

@@ -16,7 +16,11 @@ pub unsafe fn test_time_0() {
 }
 pub unsafe fn test_clock_gettime_1() {
     let mut ts: ::libc::timespec = unsafe { std::mem::zeroed() };
-    assert!(((((libc::clock_gettime(0, (&mut ts as *mut ::libc::timespec))) == (0)) as i32) != 0));
+    assert!(
+        ((((libc::clock_gettime(libc::CLOCK_REALTIME, (&mut ts as *mut ::libc::timespec))) == (0))
+            as i32)
+            != 0)
+    );
     assert!(((((ts.tv_sec) > (1500000000_i64)) as i32) != 0));
     assert!(
         (((((((ts.tv_nsec) >= (0_i64)) as i32) != 0)
@@ -139,43 +143,6 @@ pub unsafe fn test_strftime_4() {
             != 0)
     );
 }
-pub unsafe fn test_gettimeofday_5() {
-    let mut tv: ::libc::timeval = unsafe { std::mem::zeroed() };
-    assert!(
-        ((((libc::gettimeofday(
-            (&mut tv as *mut ::libc::timeval),
-            (0 as *mut ::libc::c_void) as *mut libc::timezone
-        )) == (0)) as i32)
-            != 0)
-    );
-    assert!(((((tv.tv_sec) > (1500000000_i64)) as i32) != 0));
-    assert!(
-        (((((((tv.tv_usec) >= (0_i64)) as i32) != 0)
-            && ((((tv.tv_usec) < (1000000_i64)) as i32) != 0)) as i32)
-            != 0)
-    );
-}
-pub unsafe fn test_utimes_6() {
-    let mut path: *const libc::c_char =
-        (c"/tmp/cpp2rust_utimes_test.tmp".as_ptr().cast_mut()).cast_const();
-    let mut fp: *mut ::libc::FILE = libc::fopen(path, (c"wb".as_ptr().cast_mut()).cast_const());
-    assert!((((!((fp).is_null())) as i32) != 0));
-    assert!(((((libc::fclose(fp)) == (0)) as i32) != 0));
-    let mut times: [::libc::timeval; 2] = [unsafe { std::mem::zeroed() }; 2];
-    times[(0) as usize].tv_sec = 1000000000_i64;
-    times[(0) as usize].tv_usec = 0_i64;
-    times[(1) as usize].tv_sec = 1000000001_i64;
-    times[(1) as usize].tv_usec = 0_i64;
-    assert!(((((libc::utimes(path, (times.as_mut_ptr()).cast_const())) == (0)) as i32) != 0));
-    assert!(
-        ((((libc::utimes(
-            (c"/tmp/cpp2rust_utimes_test_missing.tmp".as_ptr().cast_mut()).cast_const(),
-            (times.as_mut_ptr()).cast_const()
-        )) == (-1_i32)) as i32)
-            != 0)
-    );
-    assert!(((((libc::unlink(path)) == (0)) as i32) != 0));
-}
 pub fn main() {
     unsafe {
         std::process::exit(main_0() as i32);
@@ -186,7 +153,5 @@ unsafe fn main_0() -> i32 {
     (unsafe { test_clock_gettime_1() });
     (unsafe { test_gmtime_r_3() });
     (unsafe { test_strftime_4() });
-    (unsafe { test_gettimeofday_5() });
-    (unsafe { test_utimes_6() });
     return 0;
 }

tests/unit/sys_time.c

@@ -58,34 +58,10 @@ static void test_strftime(void) {
   assert(strftime(small, sizeof(small), "%Y-%m-%d", &tm) == 0);
 }
 
-static void test_gettimeofday(void) {
-  struct timeval tv;
-  assert(gettimeofday(&tv, NULL) == 0);
-  assert(tv.tv_sec > 1500000000);
-  assert(tv.tv_usec >= 0 && tv.tv_usec < 1000000);
-}
-
-static void test_utimes(void) {
-  const char *path = "/tmp/cpp2rust_utimes_test.tmp";
-  FILE *fp = fopen(path, "wb");
-  assert(fp != NULL);
-  assert(fclose(fp) == 0);
-  struct timeval times[2];
-  times[0].tv_sec = 1000000000;
-  times[0].tv_usec = 0;
-  times[1].tv_sec = 1000000001;
-  times[1].tv_usec = 0;
-  assert(utimes(path, times) == 0);
-  assert(utimes("/tmp/cpp2rust_utimes_test_missing.tmp", times) == -1);
-  assert(unlink(path) == 0);
-}
-
 int main(void) {
   test_time();
   test_clock_gettime();
   test_gmtime_r();
   test_strftime();
-  test_gettimeofday();
-  test_utimes();
   return 0;
 }