Fixed modules os,time

Author: danielinux

frosted/Makefile

@@ -119,6 +119,8 @@ ifeq ($(MICROPY_FORCE_32BIT),1)
 #CFLAGS_MOD += -DMICROPY_USE_READLINE=1
 #LIB_SRC_C_EXTRA += mp-readline/readline.c
 endif
+
+CFLAGS_MOD += -DMICROPY_PY_OS=1
 ifeq ($(MICROPY_PY_TERMIOS),1)
 CFLAGS_MOD += -DMICROPY_PY_TERMIOS=1
 SRC_MOD += modtermios.c

frosted/modos.c

@@ -32,6 +32,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <dirent.h>
+#include <fcntl.h>
+#include <unistd.h>
 #include "py/mpconfig.h"
 
 #include "py/nlr.h"
@@ -211,6 +213,16 @@ STATIC mp_obj_t mod_os_ilistdir(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_ilistdir_obj, 0, 1, mod_os_ilistdir);
 
+STATIC mp_obj_t os_getpid(void) {
+    return mp_obj_new_int(getpid());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_getpid_obj, os_getpid);
+
+STATIC mp_obj_t os_getppid(void) {
+    return mp_obj_new_int(getppid());
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_0(os_getppid_obj, os_getppid);
+
 STATIC mp_obj_t mod_os_errno(size_t n_args, const mp_obj_t *args) {
     if (n_args == 0) {
         return MP_OBJ_NEW_SMALL_INT(errno);
@@ -221,6 +233,23 @@ STATIC mp_obj_t mod_os_errno(size_t n_args, const mp_obj_t *args) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_os_errno_obj, 0, 1, mod_os_errno);
 
+STATIC mp_obj_t os_urandom(mp_obj_t num) {
+    int rngfd;
+    mp_int_t n = mp_obj_get_int(num);
+    vstr_t vstr;
+    vstr_init_len(&vstr, n);
+    rngfd = open("/dev/random", O_RDONLY);
+    if (rngfd < 0) {
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_BaseException, "no random device"));
+    }
+    if (read(rngfd, vstr.buf, n) != n) {
+        close(rngfd);
+        nlr_raise(mp_obj_new_exception_msg(&mp_type_BaseException, "Error retrieving random bytes"));
+    }
+    return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr);
+}
+STATIC MP_DEFINE_CONST_FUN_OBJ_1(os_urandom_obj, os_urandom);
+
 STATIC const mp_rom_map_elem_t mp_module_os_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_uos) },
     { MP_ROM_QSTR(MP_QSTR_errno), MP_ROM_PTR(&mod_os_errno_obj) },
@@ -233,17 +262,14 @@ STATIC const mp_rom_map_elem_t mp_module_os_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_getenv), MP_ROM_PTR(&mod_os_getenv_obj) },
     { MP_ROM_QSTR(MP_QSTR_mkdir), MP_ROM_PTR(&mod_os_mkdir_obj) },
     { MP_ROM_QSTR(MP_QSTR_ilistdir), MP_ROM_PTR(&mod_os_ilistdir_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getpid), MP_ROM_PTR(&os_getpid_obj) },
+    { MP_ROM_QSTR(MP_QSTR_getppid), MP_ROM_PTR(&os_getppid_obj) },
+    { MP_OBJ_NEW_QSTR(MP_QSTR_urandom), (mp_obj_t)&os_urandom_obj },
     #if MICROPY_FSUSERMOUNT
     { MP_ROM_QSTR(MP_QSTR_vfs_mount), MP_ROM_PTR(&fsuser_mount_obj) },
     { MP_ROM_QSTR(MP_QSTR_vfs_umount), MP_ROM_PTR(&fsuser_umount_obj) },
     { MP_ROM_QSTR(MP_QSTR_vfs_mkfs), MP_ROM_PTR(&fsuser_mkfs_obj) },
     #endif
-    #if MICROPY_VFS_FAT
-    { MP_ROM_QSTR(MP_QSTR_VfsFat), MP_ROM_PTR(&mp_fat_vfs_type) },
-    #endif
-    #if MICROPY_PY_OS_DUPTERM
-    { MP_ROM_QSTR(MP_QSTR_dupterm), MP_ROM_PTR(&mp_uos_dupterm_obj) },
-    #endif
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_module_os_globals, mp_module_os_globals_table);

frosted/modtime.c

@@ -25,8 +25,6 @@
  */
 
 #include "py/mpconfig.h"
-#if MICROPY_PY_UTIME
-
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
@@ -39,90 +37,20 @@
 #include "py/mphal.h"
 #include "extmod/utime_mphal.h"
 
-#ifdef _WIN32
 static inline int msec_sleep_tv(struct timeval *tv) {
-    msec_sleep(tv->tv_sec * 1000.0 + tv->tv_usec / 1000.0);
+    usleep(tv->tv_sec * 1000000 + tv->tv_usec);
     return 0;
 }
-#define sleep_select(a,b,c,d,e) msec_sleep_tv((e))
-#else
-#define sleep_select select
-#endif
-
-// mingw32 defines CLOCKS_PER_SEC as ((clock_t)<somevalue>) but preprocessor does not handle casts
-#if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
-#define MP_REMOVE_BRACKETSA(x)
-#define MP_REMOVE_BRACKETSB(x) MP_REMOVE_BRACKETSA x
-#define MP_REMOVE_BRACKETSC(x) MP_REMOVE_BRACKETSB x
-#define MP_CLOCKS_PER_SEC MP_REMOVE_BRACKETSC(CLOCKS_PER_SEC)
-#else
-#define MP_CLOCKS_PER_SEC CLOCKS_PER_SEC
-#endif
-
-#if defined(MP_CLOCKS_PER_SEC)
-#define CLOCK_DIV (MP_CLOCKS_PER_SEC / 1000.0F)
-#else
-#error Unsupported clock() implementation
-#endif
 
 STATIC mp_obj_t mod_time_time(void) {
-#if MICROPY_PY_BUILTINS_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((mp_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(void) {
-#if MICROPY_PY_BUILTINS_FLOAT
-    // 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) / CLOCK_DIV);
-#else
-    return mp_obj_new_int((mp_int_t)clock());
-#endif
-}
-STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_clock_obj, mod_time_clock);
-
 STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) {
-#if MICROPY_PY_BUILTINS_FLOAT
-    struct timeval tv;
-    mp_float_t val = mp_obj_get_float(arg);
-    double ipart;
-    tv.tv_usec = round(modf(val, &ipart) * 1000000);
-    tv.tv_sec = ipart;
-    int res;
-    while (1) {
-        MP_THREAD_GIL_EXIT();
-        res = sleep_select(0, NULL, NULL, NULL, &tv);
-        MP_THREAD_GIL_ENTER();
-        #if MICROPY_SELECT_REMAINING_TIME
-        // TODO: This assumes Linux behavior of modifying tv to the remaining
-        // time.
-        if (res != -1 || errno != EINTR) {
-            break;
-        }
-        if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL) {
-            return mp_const_none;
-        }
-        //printf("select: EINTR: %ld:%ld\n", tv.tv_sec, tv.tv_usec);
-        #else
-        break;
-        #endif
-    }
-    RAISE_ERRNO(res, errno);
-#else
-    // TODO: Handle EINTR
     MP_THREAD_GIL_EXIT();
     sleep(mp_obj_get_int(arg));
     MP_THREAD_GIL_ENTER();
-#endif
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_obj, mod_time_sleep);
@@ -145,16 +73,8 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_time_strftime_obj, 1, 2, mod_time
 
 STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
-    { MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&mod_time_clock_obj) },
     { MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mod_time_sleep_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
-    { MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mod_time_time_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_cpu), MP_ROM_PTR(&mp_utime_ticks_cpu_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_add), MP_ROM_PTR(&mp_utime_ticks_add_obj) },
-    { MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
     { MP_ROM_QSTR(MP_QSTR_strftime), MP_ROM_PTR(&mod_time_strftime_obj) },
 };
 
@@ -165,4 +85,3 @@ const mp_obj_module_t mp_module_time = {
     .globals = (mp_obj_dict_t*)&mp_module_time_globals,
 };
 
-#endif // MICROPY_PY_UTIME

frosted/mpconfigport.h

@@ -82,7 +82,7 @@
 #define MICROPY_PY_SYS_MAXSIZE      (0)
 #define MICROPY_PY_SYS_STDFILES     (0)
 #define MICROPY_PY_CMATH            (0)
-#define MICROPY_PY_UTIME            (0)
+#define MICROPY_PY_UTIME            (1)
 #define MICROPY_PY_UERRNO           (1)
 #define MICROPY_PY_UCTYPES          (1)
 #define MICROPY_PY_UZLIB            (0)

frosted/scripts/os.py

@@ -0,0 +1 @@
+from uos import *

frosted/scripts/time.py

@@ -0,0 +1 @@
+from utime import *