diff options
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/main.c | 5 | ||||
| -rw-r--r-- | unix/modsocket.c | 49 | ||||
| -rw-r--r-- | unix/modtime.c | 43 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 6 | ||||
| -rw-r--r-- | unix/qstrdefsport.h | 49 |
5 files changed, 104 insertions, 48 deletions
diff --git a/unix/main.c b/unix/main.c index b9b8fe0b9f..fd3419a1c7 100644 --- a/unix/main.c +++ b/unix/main.c @@ -250,6 +250,7 @@ int usage(char **argv) { mp_obj_t mem_info(void) { printf("mem: total=%d, current=%d, peak=%d\n", m_get_total_bytes_allocated(), m_get_current_bytes_allocated(), m_get_peak_bytes_allocated()); + gc_dump_info(); return mp_const_none; } @@ -356,10 +357,6 @@ int main(int argc, char **argv) { mp_store_name(qstr_from_str("gc"), (mp_obj_t)&pyb_gc_obj); #endif - microsocket_init(); -#if MICROPY_MOD_TIME - time_init(); -#endif #if MICROPY_MOD_FFI ffi_init(); #endif diff --git a/unix/modsocket.c b/unix/modsocket.c index 8f47a8b157..7b1aaa975d 100644 --- a/unix/modsocket.c +++ b/unix/modsocket.c @@ -322,12 +322,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_socket_getaddrinfo_obj, 2, 6, mod extern mp_obj_type_t sockaddr_in_type; -#define C(name) { #name, name } +STATIC const mp_map_elem_t mp_module_socket_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_microsocket) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_socket), (mp_obj_t)µsocket_type }, + { MP_OBJ_NEW_QSTR(MP_QSTR_getaddrinfo), (mp_obj_t)&mod_socket_getaddrinfo_obj }, +#if MICROPY_SOCKET_EXTRA + { MP_OBJ_NEW_QSTR(MP_QSTR_sockaddr_in), (mp_obj_t)&sockaddr_in_type }, + { MP_OBJ_NEW_QSTR(MP_QSTR_htons), (mp_obj_t)&mod_socket_htons_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_inet_aton), (mp_obj_t)&mod_socket_inet_aton_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_gethostbyname), (mp_obj_t)&mod_socket_gethostbyname_obj }, +#endif -STATIC const struct sym_entry { - const char *sym; - int val; -} constants[] = { +#define C(name) { MP_OBJ_NEW_QSTR(MP_QSTR_ ## name), MP_OBJ_NEW_SMALL_INT(name) } C(AF_UNIX), C(AF_INET), C(AF_INET6), @@ -344,23 +350,22 @@ STATIC const struct sym_entry { C(SO_KEEPALIVE), C(SO_LINGER), C(SO_REUSEADDR), - - {NULL} +#undef C }; -#undef C +STATIC const mp_obj_dict_t mp_module_socket_globals = { + .base = {&mp_type_dict}, + .map = { + .all_keys_are_qstrs = 1, + .table_is_fixed_array = 1, + .used = sizeof(mp_module_socket_globals_table) / sizeof(mp_map_elem_t), + .alloc = sizeof(mp_module_socket_globals_table) / sizeof(mp_map_elem_t), + .table = (mp_map_elem_t*)mp_module_socket_globals_table, + }, +}; -void microsocket_init() { - mp_obj_t m = mp_obj_new_module(MP_QSTR_microsocket); - mp_store_attr(m, MP_QSTR_socket, (mp_obj_t)µsocket_type); -#if MICROPY_SOCKET_EXTRA - mp_store_attr(m, MP_QSTR_sockaddr_in, (mp_obj_t)&sockaddr_in_type); - mp_store_attr(m, MP_QSTR_htons, (mp_obj_t)&mod_socket_htons_obj); - mp_store_attr(m, MP_QSTR_inet_aton, (mp_obj_t)&mod_socket_inet_aton_obj); - mp_store_attr(m, MP_QSTR_gethostbyname, (mp_obj_t)&mod_socket_gethostbyname_obj); -#endif - mp_store_attr(m, MP_QSTR_getaddrinfo, (mp_obj_t)&mod_socket_getaddrinfo_obj); - for (const struct sym_entry *p = constants; p->sym != NULL; p++) { - mp_store_attr(m, QSTR_FROM_STR_STATIC(p->sym), MP_OBJ_NEW_SMALL_INT((machine_int_t)p->val)); - } -} +const mp_obj_module_t mp_module_socket = { + .base = { &mp_type_module }, + .name = MP_QSTR_microsocket, + .globals = (mp_obj_dict_t*)&mp_module_socket_globals, +}; diff --git a/unix/modtime.c b/unix/modtime.c index 032528947c..a0d7cd0462 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); @@ -41,9 +51,26 @@ STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) { } STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_obj, mod_time_sleep); -void time_init() { - mp_obj_t m = mp_obj_new_module(QSTR_FROM_STR_STATIC("time")); - mp_store_attr(m, QSTR_FROM_STR_STATIC("time"), (mp_obj_t)&mod_time_time_obj); - mp_store_attr(m, QSTR_FROM_STR_STATIC("clock"), (mp_obj_t)&mod_time_clock_obj); - mp_store_attr(m, QSTR_FROM_STR_STATIC("sleep"), (mp_obj_t)&mod_time_sleep_obj); -} +STATIC const mp_map_elem_t mp_module_time_globals_table[] = { + { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_time) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_clock), (mp_obj_t)&mod_time_clock_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_sleep), (mp_obj_t)&mod_time_sleep_obj }, + { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mod_time_time_obj }, +}; + +STATIC const mp_obj_dict_t mp_module_time_globals = { + .base = {&mp_type_dict}, + .map = { + .all_keys_are_qstrs = 1, + .table_is_fixed_array = 1, + .used = sizeof(mp_module_time_globals_table) / sizeof(mp_map_elem_t), + .alloc = sizeof(mp_module_time_globals_table) / sizeof(mp_map_elem_t), + .table = (mp_map_elem_t*)mp_module_time_globals_table, + }, +}; + +const mp_obj_module_t mp_module_time = { + .base = { &mp_type_module }, + .name = MP_QSTR_time, + .globals = (mp_obj_dict_t*)&mp_module_time_globals, +}; diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index cf6e6fae26..21d11ebeaf 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -17,6 +17,12 @@ #define MICROPY_MOD_SYS_STDFILES (1) #define MICROPY_ENABLE_MOD_CMATH (1) +extern const struct _mp_obj_module_t mp_module_time; +extern const struct _mp_obj_module_t mp_module_socket; +#define MICROPY_EXTRA_BUILTIN_MODULES \ + { MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&mp_module_time }, \ + { MP_OBJ_NEW_QSTR(MP_QSTR_microsocket), (mp_obj_t)&mp_module_socket }, \ + // type definitions for the specific machine #ifdef __LP64__ diff --git a/unix/qstrdefsport.h b/unix/qstrdefsport.h index 42f20d2657..4de00aa11c 100644 --- a/unix/qstrdefsport.h +++ b/unix/qstrdefsport.h @@ -2,26 +2,12 @@ Q(Test) -Q(rawsocket) -Q(socket) -Q(sockaddr_in) -Q(htons) -Q(inet_aton) -Q(gethostbyname) -Q(getaddrinfo) -Q(microsocket) Q(fileno) Q(read) Q(readall) Q(readline) Q(write) Q(makefile) -Q(connect) -Q(bind) -Q(listen) -Q(accept) -Q(recv) -Q(setsockopt) Q(FileIO) Q(ffimod) @@ -30,3 +16,38 @@ Q(fficallback) Q(ffivar) Q(func) Q(var) + +Q(time) +Q(clock) +Q(sleep) + +Q(socket) +Q(sockaddr_in) +Q(htons) +Q(inet_aton) +Q(gethostbyname) +Q(getaddrinfo) +Q(microsocket) +Q(connect) +Q(bind) +Q(listen) +Q(accept) +Q(recv) +Q(setsockopt) + +Q(AF_UNIX) +Q(AF_INET) +Q(AF_INET6) +Q(SOCK_STREAM) +Q(SOCK_DGRAM) +Q(SOCK_RAW) + +Q(MSG_DONTROUTE) +Q(MSG_DONTWAIT) + +Q(SOL_SOCKET) +Q(SO_BROADCAST) +Q(SO_ERROR) +Q(SO_KEEPALIVE) +Q(SO_LINGER) +Q(SO_REUSEADDR) |