diff --git a/unix/modtime.c b/unix/modtime.c index e90826f14a59ca281c0a7bedb20795def659011e..85d1f55327ded7f2018475d2b1bf79fcf8ac35b7 100644 --- a/unix/modtime.c +++ b/unix/modtime.c @@ -152,6 +152,7 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = { { 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) }, diff --git a/windows/windows_mphal.c b/windows/windows_mphal.c index 1b2ed314ab7f234e0a8b0638b3abade03e5a41b8..3ad6939059d9f5cfc1f77ccee0ccc4224281347f 100644 --- a/windows/windows_mphal.c +++ b/windows/windows_mphal.c @@ -217,3 +217,13 @@ mp_uint_t mp_hal_ticks_us(void) { gettimeofday(&tv, NULL); return tv.tv_sec * 1000000 + tv.tv_usec; } + +mp_uint_t mp_hal_ticks_cpu(void) { + LARGE_INTEGER value; + QueryPerformanceCounter(&value); +#ifdef _WIN64 + return value.QuadPart; +#else + return value.LowPart; +#endif +} diff --git a/windows/windows_mphal.h b/windows/windows_mphal.h index a17f170214a59d2c5512b6561e80d2a195d393b5..854e14a7a8a3ea90b1b96d1f2734daf555b6e184 100644 --- a/windows/windows_mphal.h +++ b/windows/windows_mphal.h @@ -32,5 +32,5 @@ void mp_hal_move_cursor_back(unsigned int pos); void mp_hal_erase_line_from_cursor(unsigned int n_chars_to_erase); -// TODO: Implement. -#define mp_hal_ticks_cpu() 0 +#undef mp_hal_ticks_cpu +mp_uint_t mp_hal_ticks_cpu(void);