discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=1b7b765ee44a1485bc9e270c47a6729f0e388a24
commit 1b7b765ee44a1485bc9e270c47a6729f0e388a24 Author: Mike Blumenkrantz <[email protected]> Date: Wed Feb 5 20:52:55 2014 -0500 bugfix: race condition when deleting clients and their e_exec this occurred occasionally when a client was the last one on a phony exe --- src/bin/e_exec.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/bin/e_exec.c b/src/bin/e_exec.c index 938c6bd..f9b1141 100644 --- a/src/bin/e_exec.c +++ b/src/bin/e_exec.c @@ -51,6 +51,7 @@ static E_Exec_Instance *_e_exec_cb_exec(void *data, Efreet_Desktop *desktop, cha static Eina_Bool _e_exec_cb_expire_timer(void *data); static Eina_Bool _e_exec_cb_exit(void *data, int type, void *event); static void _e_exec_cb_exec_new_free(void *data, void *event); +static void _e_exec_cb_exec_new_client_free(void *data, void *ev); static void _e_exec_cb_exec_del_free(void *data, void *event); static void _e_exe_instance_watchers_call(E_Exec_Instance *inst, E_Exec_Watch_Type type); static Eina_Bool _e_exec_startup_id_pid_find(const Eina_Hash *hash __UNUSED__, const void *key __UNUSED__, void *value, void *data); @@ -360,10 +361,11 @@ e_exec_instance_found(E_Exec_Instance *inst) EAPI void e_exec_instance_client_add(E_Exec_Instance *inst, E_Client *ec) { + e_object_ref(E_OBJECT(ec)); inst->clients = eina_list_append(inst->clients, ec); ec->exe_inst = inst; inst->ref++; - ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_free, inst); + ecore_event_add(E_EVENT_EXEC_NEW_CLIENT, inst, _e_exec_cb_exec_new_client_free, ec); } EAPI void @@ -663,6 +665,7 @@ _e_exec_instance_free(E_Exec_Instance *inst) if (!inst->deleted) { inst->deleted = 1; + E_LIST_FOREACH(inst->clients, e_object_ref); ecore_event_add(E_EVENT_EXEC_DEL, inst, _e_exec_cb_exec_del_free, inst); return; } @@ -671,7 +674,10 @@ _e_exec_instance_free(E_Exec_Instance *inst) inst->desktop); if (inst->expire_timer) ecore_timer_del(inst->expire_timer); EINA_LIST_FREE(inst->clients, ec) - ec->exe_inst = NULL; + { + ec->exe_inst = NULL; + e_object_unref(E_OBJECT(ec)); + } if (inst->desktop) efreet_desktop_free(inst->desktop); if (inst->exe) ecore_exe_data_set(inst->exe, NULL); free(inst); @@ -687,6 +693,16 @@ _e_exec_instance_free(E_Exec_Instance *inst) */ static void +_e_exec_cb_exec_new_client_free(void *data, void *ev) +{ + E_Exec_Instance *inst = ev; + + inst->ref--; + _e_exec_instance_free(inst); + e_object_unref(data); +} + +static void _e_exec_cb_exec_new_free(void *data, void *ev EINA_UNUSED) { E_Exec_Instance *inst = data; --
