summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-03-17 13:16:53 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-03-17 15:15:25 -0400
commitd0e5564c18139399efc6a5009d7f6bfde4dc8265 (patch)
treed53e25b332dfd349c25f38a439a00cd1cd99fc93
parent9c4956082a308b45e4f244a02fc67634dcd14616 (diff)
downloadefl-d0e5564c18139399efc6a5009d7f6bfde4dc8265.tar.gz
efreet: CRI and fail after 10 attempts to connect to efreetd
if efreetd cannot be connected to, stop infinitely trying to spawn it since this generates crazy cpu load probably this path should also send some cache events so that watchers do not simply idle forever ref T5200
-rw-r--r--src/lib/efreet/efreet_cache.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/efreet/efreet_cache.c b/src/lib/efreet/efreet_cache.c
index a9d5bec428..3a85c120c2 100644
--- a/src/lib/efreet/efreet_cache.c
+++ b/src/lib/efreet/efreet_cache.c
@@ -133,12 +133,14 @@ _cb_server_add(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
}
static Ecore_Timer *reconnect_timer = NULL;
+static unsigned int reconnect_count = 0;
static Eina_Bool
_cb_server_reconnect(void *data EINA_UNUSED)
{
if (reconnect_timer) ecore_timer_del(reconnect_timer);
reconnect_timer = NULL;
+ reconnect_count++;
_ipc_launch();
if (ipc)
{
@@ -160,6 +162,13 @@ _cb_server_del(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
double t;
IPC_HEAD(Del);
ipc = NULL;
+ if (reconnect_count > 10)
+ {
+ reconnect_timer = NULL;
+ CRI("efreetd connection failed 10 times! check for stale socket files in %s/.ecore/efreetd",
+ efreet_runtime_dir_get());
+ return EINA_FALSE;
+ }
t = ecore_time_get();
if ((t - last_del) < 0.5)
{