From 3d1a66f270bd0edd36469a7389efddcacd313bf1 Mon Sep 17 00:00:00 2001
From: Moses Miller <Majora320@gmail.com>
Date: Fri, 11 May 2018 16:26:56 -0700
Subject: [PATCH] Add CLOCKS_PER_SEC
---
src/time/src/constants.rs | 2 ++
src/time/src/lib.rs | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/time/src/constants.rs b/src/time/src/constants.rs
index 1836c7cec..fe6eae8e3 100644
--- a/src/time/src/constants.rs
+++ b/src/time/src/constants.rs
@@ -47,3 +47,5 @@ pub(crate) const CLOCK_REALTIME: clockid_t = 0;
pub(crate) const CLOCK_MONOTONIC: clockid_t = 1;
pub(crate) const CLOCK_PROCESS_CPUTIME_ID: clockid_t = 2;
pub(crate) const CLOCK_THREAD_CPUTIME_ID: clockid_t = 3;
+
+pub(crate) const CLOCKS_PER_SEC: time_t = 1_000_000;
\ No newline at end of file
diff --git a/src/time/src/lib.rs b/src/time/src/lib.rs
index 58d862ff3..e93f4c752 100644
--- a/src/time/src/lib.rs
+++ b/src/time/src/lib.rs
@@ -104,13 +104,13 @@ pub extern "C" fn clock() -> clock_t {
return -1;
}
- if ts.tv_sec > time_t::max_value() / 1_000_000
- || ts.tv_nsec / 1000 > time_t::max_value() - 1_000_000 * ts.tv_sec
+ if ts.tv_sec > time_t::max_value() / CLOCKS_PER_SEC
+ || ts.tv_nsec / 1000 > time_t::max_value() - CLOCKS_PER_SEC * ts.tv_sec
{
return -1;
}
- return ts.tv_sec * 1_000_000 + ts.tv_nsec / 1000;
+ return ts.tv_sec * CLOCKS_PER_SEC + ts.tv_nsec / 1000;
}
#[no_mangle]
--
GitLab