summaryrefslogtreecommitdiff
path: root/src/lib/ecore_ipc
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-04-17 16:17:29 -0700
committerCedric BAIL <cedric@osg.samsung.com>2018-05-01 10:39:01 -0700
commit33fd77e9e43b0fa29cb484b72d910bdf0ecccbc8 (patch)
tree0ebd1c0615445af5e1321a85b6878087b4cb54a8 /src/lib/ecore_ipc
parent193149deb85004aeda452dd4d729f995f4f313f9 (diff)
ecore: move close_on_destructor to close_on_invalidate as that describe the behavior best.
Fix all use to correctly behave on invalidate.
Diffstat (limited to 'src/lib/ecore_ipc')
-rw-r--r--src/lib/ecore_ipc/ecore_ipc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index d4b11617ce..babf033a17 100644
--- a/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
@@ -745,21 +745,21 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *
745 goto error_dialer; 745 goto error_dialer;
746 } 746 }
747 747
748 efl_io_closer_close_on_destructor_set(svr->dialer.dialer, EINA_TRUE); 748 efl_io_closer_close_on_invalidate_set(svr->dialer.dialer, EINA_TRUE);
749 efl_event_callback_array_add(svr->dialer.dialer, _ecore_ipc_dialer_cbs(), svr); 749 efl_event_callback_array_add(svr->dialer.dialer, _ecore_ipc_dialer_cbs(), svr);
750 750
751 svr->dialer.input = efl_add(EFL_IO_QUEUE_CLASS, loop); 751 svr->dialer.input = efl_add(EFL_IO_QUEUE_CLASS, loop);
752 EINA_SAFETY_ON_NULL_GOTO(svr->dialer.input, error); 752 EINA_SAFETY_ON_NULL_GOTO(svr->dialer.input, error);
753 753
754 svr->dialer.send_copier = efl_add(EFL_IO_COPIER_CLASS, loop, 754 svr->dialer.send_copier = efl_add(EFL_IO_COPIER_CLASS, loop,
755 efl_io_closer_close_on_destructor_set(efl_added, EINA_FALSE), 755 efl_io_closer_close_on_invalidate_set(efl_added, EINA_FALSE),
756 efl_io_copier_source_set(efl_added, svr->dialer.input), 756 efl_io_copier_source_set(efl_added, svr->dialer.input),
757 efl_io_copier_destination_set(efl_added, svr->dialer.dialer), 757 efl_io_copier_destination_set(efl_added, svr->dialer.dialer),
758 efl_event_callback_array_add(efl_added, _ecore_ipc_dialer_copier_cbs(), svr)); 758 efl_event_callback_array_add(efl_added, _ecore_ipc_dialer_copier_cbs(), svr));
759 EINA_SAFETY_ON_NULL_GOTO(svr->dialer.send_copier, error); 759 EINA_SAFETY_ON_NULL_GOTO(svr->dialer.send_copier, error);
760 760
761 svr->dialer.recv_copier = efl_add(EFL_IO_COPIER_CLASS, loop, 761 svr->dialer.recv_copier = efl_add(EFL_IO_COPIER_CLASS, loop,
762 efl_io_closer_close_on_destructor_set(efl_added, EINA_FALSE), 762 efl_io_closer_close_on_invalidate_set(efl_added, EINA_FALSE),
763 efl_io_copier_source_set(efl_added, svr->dialer.dialer), 763 efl_io_copier_source_set(efl_added, svr->dialer.dialer),
764 efl_event_callback_array_add(efl_added, _ecore_ipc_dialer_copier_cbs(), svr), 764 efl_event_callback_array_add(efl_added, _ecore_ipc_dialer_copier_cbs(), svr),
765 efl_event_callback_add(efl_added, EFL_IO_COPIER_EVENT_DATA, _ecore_ipc_dialer_copier_data, svr)); 765 efl_event_callback_add(efl_added, EFL_IO_COPIER_EVENT_DATA, _ecore_ipc_dialer_copier_data, svr));
@@ -1343,14 +1343,14 @@ _ecore_ipc_server_client_add(void *data, const Efl_Event *event)
1343 EINA_SAFETY_ON_NULL_GOTO(cl->socket.input, error); 1343 EINA_SAFETY_ON_NULL_GOTO(cl->socket.input, error);
1344 1344
1345 cl->socket.send_copier = efl_add(EFL_IO_COPIER_CLASS, loop, 1345 cl->socket.send_copier = efl_add(EFL_IO_COPIER_CLASS, loop,
1346 efl_io_closer_close_on_destructor_set(efl_added, EINA_FALSE), 1346 efl_io_closer_close_on_invalidate_set(efl_added, EINA_FALSE),
1347 efl_io_copier_source_set(efl_added, cl->socket.input), 1347 efl_io_copier_source_set(efl_added, cl->socket.input),
1348 efl_io_copier_destination_set(efl_added, cl->socket.socket), 1348 efl_io_copier_destination_set(efl_added, cl->socket.socket),
1349 efl_event_callback_array_add(efl_added, _ecore_ipc_client_socket_copier_cbs(), cl)); 1349 efl_event_callback_array_add(efl_added, _ecore_ipc_client_socket_copier_cbs(), cl));
1350 EINA_SAFETY_ON_NULL_GOTO(cl->socket.send_copier, error); 1350 EINA_SAFETY_ON_NULL_GOTO(cl->socket.send_copier, error);
1351 1351
1352 cl->socket.recv_copier = efl_add(EFL_IO_COPIER_CLASS, loop, 1352 cl->socket.recv_copier = efl_add(EFL_IO_COPIER_CLASS, loop,
1353 efl_io_closer_close_on_destructor_set(efl_added, EINA_FALSE), 1353 efl_io_closer_close_on_invalidate_set(efl_added, EINA_FALSE),
1354 efl_io_copier_source_set(efl_added, cl->socket.socket), 1354 efl_io_copier_source_set(efl_added, cl->socket.socket),
1355 efl_event_callback_array_add(efl_added, _ecore_ipc_client_socket_copier_cbs(), cl), 1355 efl_event_callback_array_add(efl_added, _ecore_ipc_client_socket_copier_cbs(), cl),
1356 efl_event_callback_add(efl_added, EFL_IO_COPIER_EVENT_DATA, _ecore_ipc_client_socket_copier_data, cl)); 1356 efl_event_callback_add(efl_added, EFL_IO_COPIER_EVENT_DATA, _ecore_ipc_client_socket_copier_data, cl));