claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Timer: Make sure timer_on_auto() to use timer_advance_u64() instead of timer_set_delay_u64() if it's called inside a callback.

Browse Source
This commit is contained in:
OBattler
2024-05-04 18:48:44 +02:00
parent bd55fdb96b
commit ccc788ff98
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/timer.h
View File

@@ -43,7 +43,7 @@ typedef struct pc_timer_t {
ts_t ts; ts_t ts;
#endif #endif
int flags; /* The flags are defined above. */ int flags; /* The flags are defined above. */
int pad; int in_callback;
double period; /* This is used for large period timers to count double period; /* This is used for large period timers to count
the microseconds and split the period. */ the microseconds and split the period. */

27
src/timer.c
View File

@@ -94,6 +94,7 @@ timer_disable(pc_timer_t *timer)
fatal("timer_disable - !timer->next\n"); fatal("timer_disable - !timer->next\n");
timer->flags &= ~TIMER_ENABLED; timer->flags &= ~TIMER_ENABLED;
timer->in_callback = 0;
if (timer->prev) if (timer->prev)
timer->prev->next = timer->next; timer->prev->next = timer->next;
@@ -127,11 +128,15 @@ timer_process(void)
if (timer->flags & TIMER_SPLIT) if (timer->flags & TIMER_SPLIT)
timer_advance_ex(timer, 0); /* We're splitting a > 1 s period into timer_advance_ex(timer, 0); /* We're splitting a > 1 s period into
multiple <= 1 s periods. */ multiple <= 1 s periods. */
else if (timer->callback != NULL) /* Make sure it's not NULL, so that we can else if (timer->callback != NULL) {
have a NULL callback when no operation /* Make sure it's not NULL, so that we can
is needed. */ have a NULL callback when no operation
is needed. */
timer->in_callback = 1;
timer->callback(timer->priv); timer->callback(timer->priv);
timer->in_callback = 0;
}
} }
timer_target = timer_head->ts.ts32.integer; timer_target = timer_head->ts.ts32.integer;
@@ -171,10 +176,11 @@ timer_add(pc_timer_t *timer, void (*callback)(void *priv), void *priv, int start
{ {
memset(timer, 0, sizeof(pc_timer_t)); memset(timer, 0, sizeof(pc_timer_t));
timer->callback = callback; timer->callback = callback;
timer->priv = priv; timer->in_callback = 0;
timer->flags = 0; timer->priv = priv;
timer->prev = timer->next = NULL; timer->flags = 0;
timer->prev = timer->next = NULL;
if (start_timer) if (start_timer)
timer_set_delay_u64(timer, 0); timer_set_delay_u64(timer, 0);
} }
@@ -189,6 +195,7 @@ timer_stop(pc_timer_t *timer)
timer->period = 0.0; timer->period = 0.0;
timer_disable(timer); timer_disable(timer);
timer->flags &= ~TIMER_SPLIT; timer->flags &= ~TIMER_SPLIT;
timer->in_callback = 0;
} }
static void static void
@@ -240,7 +247,9 @@ timer_on_auto(pc_timer_t *timer, double period)
return; return;
if (period > 0.0) if (period > 0.0)
timer_on(timer, period, timer->period <= 0.0); /* If the timer is in the callback, signal that, so that timer_advance_u64()
is used instead of timer_set_delay_u64(). */
timer_on(timer, period, (timer->period <= 0.0) && !timer->in_callback);
else else
timer_stop(timer); timer_stop(timer);
} }