summaryrefslogtreecommitdiffstatshomepage
path: root/unix/time.c
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-02-02 08:56:20 +0200
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2014-02-02 08:58:16 +0200
commit6964422cf426164b39abdc66f260be4f582309e0 (patch)
treeae077b27e7646de20d74e3915c706b91cf056ed6 /unix/time.c
parent87e85b7dc7753bde510ec37db321574a1cc0cc47 (diff)
downloadmicropython-6964422cf426164b39abdc66f260be4f582309e0.tar.gz
micropython-6964422cf426164b39abdc66f260be4f582309e0.zip
unix time.clock(): Actually return float value.
Diffstat (limited to 'unix/time.c')
-rw-r--r--unix/time.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/unix/time.c b/unix/time.c
index acea69178a..9d8cf497c4 100644
--- a/unix/time.c
+++ b/unix/time.c
@@ -14,7 +14,12 @@ 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());
+// return mp_obj_new_int((machine_int_t)clock());
+ // 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);
}
static MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);