diff options
| author | Damien George <damien.p.george@gmail.com> | 2015-01-07 23:38:50 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2015-01-07 23:38:50 +0000 |
| commit | 3b51b3e90f1d513031ad2c6b6a2a0d5d391f753d (patch) | |
| tree | 6903d1a13bdc49860c325e531e81582beb6063bf /stmhal/timer.c | |
| parent | 7a0636e80aea2ce1af03c890e024dabcdffcdf78 (diff) | |
| download | micropython-3b51b3e90f1d513031ad2c6b6a2a0d5d391f753d.tar.gz micropython-3b51b3e90f1d513031ad2c6b6a2a0d5d391f753d.zip | |
stmhal: Collect all root pointers together in 1 place.
A GC in stmhal port now only scans true root pointers, not entire BSS.
This reduces base GC time from 1700ms to 900ms.
Diffstat (limited to 'stmhal/timer.c')
| -rw-r--r-- | stmhal/timer.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/stmhal/timer.c b/stmhal/timer.c index 7adb98c826..87239a5b8f 100644 --- a/stmhal/timer.c +++ b/stmhal/timer.c @@ -145,9 +145,7 @@ TIM_HandleTypeDef TIM6_Handle; // Used to divide down TIM3 and periodically call the flash storage IRQ STATIC uint32_t tim3_counter = 0; -// Used to do callbacks to Python code on interrupt -STATIC pyb_timer_obj_t *pyb_timer_obj_all[14]; -#define PYB_TIMER_OBJ_ALL_NUM MP_ARRAY_SIZE(pyb_timer_obj_all) +#define PYB_TIMER_OBJ_ALL_NUM MP_ARRAY_SIZE(MP_STATE_PORT(pyb_timer_obj_all)) STATIC uint32_t timer_get_source_freq(uint32_t tim_id); STATIC mp_obj_t pyb_timer_deinit(mp_obj_t self_in); @@ -157,14 +155,14 @@ STATIC mp_obj_t pyb_timer_channel_callback(mp_obj_t self_in, mp_obj_t callback); void timer_init0(void) { tim3_counter = 0; for (uint i = 0; i < PYB_TIMER_OBJ_ALL_NUM; i++) { - pyb_timer_obj_all[i] = NULL; + MP_STATE_PORT(pyb_timer_obj_all)[i] = NULL; } } // unregister all interrupt sources void timer_deinit(void) { for (uint i = 0; i < PYB_TIMER_OBJ_ALL_NUM; i++) { - pyb_timer_obj_t *tim = pyb_timer_obj_all[i]; + pyb_timer_obj_t *tim = MP_STATE_PORT(pyb_timer_obj_all)[i]; if (tim != NULL) { pyb_timer_deinit(tim); } @@ -659,7 +657,7 @@ STATIC mp_obj_t pyb_timer_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t // set the global variable for interrupt callbacks if (tim->tim_id - 1 < PYB_TIMER_OBJ_ALL_NUM) { - pyb_timer_obj_all[tim->tim_id - 1] = tim; + MP_STATE_PORT(pyb_timer_obj_all)[tim->tim_id - 1] = tim; } return (mp_obj_t)tim; @@ -1253,7 +1251,7 @@ STATIC void timer_handle_irq_channel(pyb_timer_obj_t *tim, uint8_t channel, mp_o void timer_irq_handler(uint tim_id) { if (tim_id - 1 < PYB_TIMER_OBJ_ALL_NUM) { // get the timer object - pyb_timer_obj_t *tim = pyb_timer_obj_all[tim_id - 1]; + pyb_timer_obj_t *tim = MP_STATE_PORT(pyb_timer_obj_all)[tim_id - 1]; if (tim == NULL) { // Timer object has not been set, so we can't do anything. |