djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unix modtime: Adhere to MICROPY_ENABLE_FLOAT better.

Browse Source
This commit is contained in:
Paul Sokolovsky 2014-04-17 18:26:07 +03:00
parent b7e90ea078
commit de8292202e
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
unix/modtime.c
View File

@ -11,18 +11,28 @@
#include "runtime.h" #include "runtime.h"
STATIC mp_obj_t mod_time_time() { 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)); 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); 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. // Note: this is deprecated since CPy3.3, but pystone still uses it.
STATIC mp_obj_t mod_time_clock() { STATIC mp_obj_t mod_time_clock() {
// return mp_obj_new_int((machine_int_t)clock()); #if MICROPY_ENABLE_FLOAT
// POSIX requires CLOCKS_PER_SEC equals 1000000, so that's what we assume // 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 // float cannot represent full range of int32 precisely, so we pre-divide
// int to reduce resolution, and then actually do float division hoping // int to reduce resolution, and then actually do float division hoping
// to preserve integer part resolution. // to preserve integer part resolution.
return mp_obj_new_float((float)(clock() / 1000) / 1000.0); 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); STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);