aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-07 22:41:20 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2017-11-07 22:42:49 +0900
commitede0587887704fc166e1631304f660e703e3489b (patch)
treeb992865f903868e8c4d5c6996a0517a852ceea5d
parentcxx: Fix slider example (diff)
downloadefl-ede0587887704fc166e1631304f660e703e3489b.tar.gz
efl net - handle proxy helper fails better and abort proxy lookups
if proxy fails are too many then give up on queued lookups as they likely will continue. i noticed a process continually spawning efl net proxy helper because one queued lookup failed and could be looked up so it kept trying again and again. @fix
-rw-r--r--src/lib/ecore_con/ecore_con_proxy_helper.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/src/lib/ecore_con/ecore_con_proxy_helper.c b/src/lib/ecore_con/ecore_con_proxy_helper.c
index ff0253f055..c313b4d4f7 100644
--- a/src/lib/ecore_con/ecore_con_proxy_helper.c
+++ b/src/lib/ecore_con/ecore_con_proxy_helper.c
@@ -25,6 +25,7 @@ typedef struct {
char **proxies;
int id;
int busy;
+ int fails;
} Efl_Net_Proxy_Helper_Req;
typedef struct {
@@ -205,6 +206,7 @@ static Eina_Bool
_efl_net_proxy_helper_cb_exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *info)
{
Ecore_Exe_Event_Del *event = info;
+ int min_fails = 0;
if (!_efl_net_proxy_helper_exe) return EINA_TRUE;
if (event->exe == _efl_net_proxy_helper_exe)
@@ -222,10 +224,22 @@ _efl_net_proxy_helper_cb_exe_del(void *data EINA_UNUSED, int type EINA_UNUSED, v
{
if ((t - last_respawn) > 5.0) respawn = EINA_TRUE;
}
+ if (respawn)
+ {
+ Eina_List *l;
+ Efl_Net_Proxy_Helper_Req *req;
+
+ EINA_LIST_FOREACH(_efl_net_proxy_helper_queue, l, req)
+ {
+ req->fails++;
+ if (req->fails > min_fails) min_fails = req->fails;
+ }
+ }
locks--;
}
eina_spinlock_release(&_efl_net_proxy_helper_queue_lock);
- if (respawn)
+ if (min_fails >= 5) _efl_net_proxy_helper_cancel();
+ else if (respawn)
{
last_respawn = t;
_efl_net_proxy_helper_spawn();