diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-02-02 00:57:06 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2014-02-02 01:34:11 +0200 |
| commit | a9459bc7233e92a6516c3fbc8a18a9d33966e244 (patch) | |
| tree | 1fb95e2e929053da60f43103bc5e6b296e2c09f7 | |
| parent | 513e6567b15adf2354f0b05f486d66ee0cbe2c94 (diff) | |
| download | micropython-a9459bc7233e92a6516c3fbc8a18a9d33966e244.tar.gz micropython-a9459bc7233e92a6516c3fbc8a18a9d33966e244.zip | |
unix: Add basic time module (with time() and clock() functions).
Both return int so far (single-precision float doesn't have enough
bits to represent int32 precisely).
| -rw-r--r-- | unix/Makefile | 4 | ||||
| -rw-r--r-- | unix/main.c | 4 | ||||
| -rw-r--r-- | unix/mpconfigport.mk | 3 | ||||
| -rw-r--r-- | unix/time.c | 25 |
4 files changed, 36 insertions, 0 deletions
diff --git a/unix/Makefile b/unix/Makefile index 00e7e94602..a1a6a7102c 100644 --- a/unix/Makefile +++ b/unix/Makefile @@ -14,6 +14,10 @@ include ../py/py.mk CFLAGS = -I. -I$(PY_SRC) -Wall -Werror -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) LDFLAGS = $(LDFLAGS_MOD) -lm +ifeq ($(MICROPY_MOD_TIME),1) +CFLAGS_MOD += -DMICROPY_MOD_TIME=1 +SRC_MOD += time.c +endif ifeq ($(MICROPY_MOD_FFI),1) CFLAGS_MOD += `pkg-config --cflags libffi` -DMICROPY_MOD_FFI=1 LDFLAGS_MOD += -ldl -lffi diff --git a/unix/main.c b/unix/main.c index 5ca8115368..cc942163f9 100644 --- a/unix/main.c +++ b/unix/main.c @@ -24,6 +24,7 @@ extern const mp_obj_fun_native_t mp_builtin_open_obj; void file_init(); void rawsocket_init(); +void time_init(); void ffi_init(); static void execute_from_lexer(mp_lexer_t *lex, mp_parse_input_kind_t input_kind, bool is_repl) { @@ -242,6 +243,9 @@ int main(int argc, char **argv) { file_init(); rawsocket_init(); +#if MICROPY_MOD_TIME + time_init(); +#endif #if MICROPY_MOD_FFI ffi_init(); #endif diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk index d220339397..6c7be237bc 100644 --- a/unix/mpconfigport.mk +++ b/unix/mpconfigport.mk @@ -1,4 +1,7 @@ # Enable/disable modules to be included in interpreter +# Subset of CPython time module +MICROPY_MOD_TIME = 1 + # ffi module requires libffi (libffi-dev Debian package) MICROPY_MOD_FFI = 0 diff --git a/unix/time.c b/unix/time.c new file mode 100644 index 0000000000..acea69178a --- /dev/null +++ b/unix/time.c @@ -0,0 +1,25 @@ +#include <string.h> +#include <time.h> + +#include "misc.h" +#include "mpconfig.h" +#include "qstr.h" +#include "obj.h" +#include "runtime.h" + +static mp_obj_t mod_time_time() { + return mp_obj_new_int((machine_int_t)time(NULL)); +} +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()); +} +static MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock); + +void time_init() { + mp_obj_t m = mp_obj_new_module(QSTR_FROM_STR_STATIC("time")); + rt_store_attr(m, QSTR_FROM_STR_STATIC("time"), (mp_obj_t)&mod_time_time_obj); + rt_store_attr(m, QSTR_FROM_STR_STATIC("clock"), (mp_obj_t)&mod_time_clock_obj); +} |