enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

bluez5 - fix infinite loop where ping cvauses device eval which loops

This commit is contained in:
Carsten Haitzler 2020-10-15 17:53:30 +01:00
parent 9efbba0330
commit 5f925b1668
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/bluez5/bz.h
View File

@ -22,6 +22,7 @@ struct _Obj {
Eina_Bool add_called : 1;
Eina_Bool ping_ok : 1;
Eina_Bool ping_busy : 1;
Eina_Bool ping_block : 1;
Ecore_Timer *ping_timer;
//// public data to read
const char *path;

6
src/modules/bluez5/bz_obj.c
View File

@ -658,6 +658,7 @@ ping_schedule(Obj *o)
double timeout = ping_powersave_timeout_get() + 1.0;
if (o->ping_timer) ecore_timer_del(o->ping_timer);
printf("@@@ new ping in %1.3f\n", timeout);
o->ping_timer = ecore_timer_add(timeout, cb_ping_timer, o);
}
@ -667,6 +668,8 @@ cb_ping_timer(void *data)
Obj *o = data;
printf("@@@ ping timer %s\n", o->address);
o->ping_timer = NULL;
o->ping_block = EINA_TRUE;
if (o->ping_busy)
{
o->ping_busy = EINA_FALSE;
@ -677,6 +680,7 @@ cb_ping_timer(void *data)
if (o->fn_change) o->fn_change(o);
}
}
o->ping_block = EINA_FALSE;
ping_do(o);
ping_schedule(o);
return EINA_TRUE;
@ -685,7 +689,7 @@ cb_ping_timer(void *data)
void
bz_obj_ping_begin(Obj *o)
{
if (o->ping_timer) return;
if ((o->ping_timer) || (o->ping_block)) return;
if (o->ping_busy)
{
o->ping_busy = EINA_FALSE;