Skip to content

Commit 3cc87b1

Browse files
pfalconpfalcon
committed
unix/modtime: Switch ticks/sleep_ms/us() to utime_mphal.
1 parent 6a87084 commit 3cc87b1

File tree

1 file changed

+4
-36
lines changed

1 file changed

+4
-36
lines changed

‎unix/modtime.c‎

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,6 @@ STATIC mp_obj_t mod_time_time(void) {
7777
}
7878
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_time_obj, mod_time_time);
7979

80-
STATIC mp_obj_t mod_time_ticks_us(void) {
81-
struct timeval tv;
82-
gettimeofday(&tv, NULL);
83-
mp_uint_t us = tv.tv_sec * 1000000 + tv.tv_usec;
84-
return MP_OBJ_NEW_SMALL_INT(us & MP_SMALL_INT_POSITIVE_MASK);
85-
}
86-
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_ticks_us_obj, mod_time_ticks_us);
87-
88-
STATIC mp_obj_t mod_time_ticks_ms(void) {
89-
struct timeval tv;
90-
gettimeofday(&tv, NULL);
91-
mp_uint_t ms = tv.tv_sec * 1000 + tv.tv_usec / 1000;
92-
return MP_OBJ_NEW_SMALL_INT(ms & MP_SMALL_INT_POSITIVE_MASK);
93-
}
94-
STATIC MP_DEFINE_CONST_FUN_OBJ_0(mod_time_ticks_ms_obj, mod_time_ticks_ms);
95-
9680
// Note: this is deprecated since CPy3.3, but pystone still uses it.
9781
STATIC mp_obj_t mod_time_clock(void) {
9882
#if MICROPY_PY_BUILTINS_FLOAT
@@ -143,22 +127,6 @@ STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) {
143127
}
144128
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_obj, mod_time_sleep);
145129

146-
STATIC mp_obj_t mod_time_sleep_ms(mp_obj_t arg) {
147-
MP_THREAD_GIL_EXIT();
148-
usleep(mp_obj_get_int(arg) * 1000);
149-
MP_THREAD_GIL_ENTER();
150-
return mp_const_none;
151-
}
152-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_ms_obj, mod_time_sleep_ms);
153-
154-
STATIC mp_obj_t mod_time_sleep_us(mp_obj_t arg) {
155-
MP_THREAD_GIL_EXIT();
156-
usleep(mp_obj_get_int(arg));
157-
MP_THREAD_GIL_ENTER();
158-
return mp_const_none;
159-
}
160-
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_time_sleep_us_obj, mod_time_sleep_us);
161-
162130
STATIC mp_obj_t mod_time_strftime(size_t n_args, const mp_obj_t *args) {
163131
time_t t;
164132
if (n_args == 1) {
@@ -179,11 +147,11 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
179147
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
180148
{ MP_ROM_QSTR(MP_QSTR_clock), MP_ROM_PTR(&mod_time_clock_obj) },
181149
{ MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mod_time_sleep_obj) },
182-
{ MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mod_time_sleep_ms_obj) },
183-
{ MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mod_time_sleep_us_obj) },
150+
{ MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
151+
{ MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
184152
{ MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mod_time_time_obj) },
185-
{ MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mod_time_ticks_ms_obj) },
186-
{ MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mod_time_ticks_us_obj) },
153+
{ MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj) },
154+
{ MP_ROM_QSTR(MP_QSTR_ticks_us), MP_ROM_PTR(&mp_utime_ticks_us_obj) },
187155
{ MP_ROM_QSTR(MP_QSTR_ticks_diff), MP_ROM_PTR(&mp_utime_ticks_diff_obj) },
188156
{ MP_ROM_QSTR(MP_QSTR_strftime), MP_ROM_PTR(&mod_time_strftime_obj) },
189157
};

0 commit comments

Comments
 (0)