mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-04-24 06:02:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

posix: handle time_ms overrun after 49 days

Browse Source
This commit is contained in:
Matthias Ringwald 2019-08-04 19:52:27 +02:00
parent 98a6a0788e
commit b6fc147f78
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
platform/posix/btstack_run_loop_posix.c
View File

@ -43,19 +43,16 @@
* Created by Matthias Ringwald on 6/6/09. * Created by Matthias Ringwald on 6/6/09.
*/ */
#include "btstack_run_loop.h"
#include "btstack_run_loop_posix.h" #include "btstack_run_loop_posix.h"
#include "btstack_run_loop.h"
#include "btstack_util.h"
#include "btstack_linked_list.h" #include "btstack_linked_list.h"
#include "btstack_debug.h" #include "btstack_debug.h"
#ifdef _WIN32
#include "Winsock2.h"
#else
#include <sys/select.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/select.h>
#include <sys/time.h> #include <sys/time.h>
static void btstack_run_loop_posix_dump_timer(void); static void btstack_run_loop_posix_dump_timer(void);
@ -96,9 +93,9 @@ static void btstack_run_loop_posix_add_timer(btstack_timer_source_t *ts){
log_error( "btstack_run_loop_timer_add error: timer to add already in list!"); log_error( "btstack_run_loop_timer_add error: timer to add already in list!");
return; return;
} }
if (next->timeout > ts->timeout) { // exit if new timeout before list timeout
break; int32_t delta = btstack_time_delta(ts->timeout, next->timeout);
} if (delta < 0) break;
} }
ts->item.next = it->next; ts->item.next = it->next;
it->next = (btstack_linked_item_t *) ts; it->next = (btstack_linked_item_t *) ts;
@ -186,8 +183,9 @@ static void btstack_run_loop_posix_execute(void) {
if (timers) { if (timers) {
ts = (btstack_timer_source_t *) timers; ts = (btstack_timer_source_t *) timers;
timeout = &tv; timeout = &tv;
uint32_t list_timeout = ts->timeout;
now_ms = btstack_run_loop_posix_get_time_ms(); now_ms = btstack_run_loop_posix_get_time_ms();
int delta = ts->timeout - now_ms; int32_t delta = btstack_time_delta(list_timeout, now_ms);
if (delta < 0){ if (delta < 0){
delta = 0; delta = 0;
} }
@ -221,7 +219,8 @@ static void btstack_run_loop_posix_execute(void) {
now_ms = btstack_run_loop_posix_get_time_ms(); now_ms = btstack_run_loop_posix_get_time_ms();
while (timers) { while (timers) {
ts = (btstack_timer_source_t *) timers; ts = (btstack_timer_source_t *) timers;
if (ts->timeout > now_ms) break; int32_t delta = btstack_time_delta(ts->timeout, now_ms);
if (delta > 0) break;
log_debug("btstack_run_loop_posix_execute: process timer %p\n", ts); log_debug("btstack_run_loop_posix_execute: process timer %p\n", ts);
// remove timer before processing it to allow handler to re-register with run loop // remove timer before processing it to allow handler to re-register with run loop