From de8292202edef4adf591c1d2562c509638b6c820 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pfalcon@users.sourceforge.net>
Date: Thu, 17 Apr 2014 18:26:07 +0300
Subject: [PATCH] unix modtime: Adhere to MICROPY_ENABLE_FLOAT better.
---
unix/modtime.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/unix/modtime.c b/unix/modtime.c
index 032528947..daf72ff88 100644
--- a/unix/modtime.c
+++ b/unix/modtime.c
@@ -11,18 +11,28 @@
#include "runtime.h"
STATIC mp_obj_t mod_time_time() {
+#if MICROPY_ENABLE_FLOAT
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ mp_float_t val = tv.tv_sec + (mp_float_t)tv.tv_usec / 1000000;
+ return mp_obj_new_float(val);
+#else
return mp_obj_new_int((machine_int_t)time(NULL));
+#endif
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_time_obj, mod_time_time);
// Note: this is deprecated since CPy3.3, but pystone still uses it.
STATIC mp_obj_t mod_time_clock() {
-// return mp_obj_new_int((machine_int_t)clock());
- // POSIX requires CLOCKS_PER_SEC equals 1000000, so that's what we assume
+#if MICROPY_ENABLE_FLOAT
+ // POSIX requires CLOCKS_PER_SEC equals 1000000, so that's what we assume.
// float cannot represent full range of int32 precisely, so we pre-divide
// int to reduce resolution, and then actually do float division hoping
// to preserve integer part resolution.
return mp_obj_new_float((float)(clock() / 1000) / 1000.0);
+#else
+ return mp_obj_new_int((machine_int_t)clock());
+#endif
}
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);
--
GitLab