diff options
author | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2016-12-19 12:57:09 -0200 |
---|---|---|
committer | Gustavo Sverzut Barbieri <barbieri@profusion.mobi> | 2016-12-19 13:03:33 -0200 |
commit | a7657e821f81eab59a719c81d3994194492476a6 (patch) | |
tree | 7e0a48ab43b60925301e5f7f86c75b6030e6c689 | |
parent | fe668ef52c74f52c45d1c0af6a1df791ab412e35 (diff) | |
download | efl-a7657e821f81eab59a719c81d3994194492476a6.tar.gz |
ecore_con/ecore_ipc: flush should wait for connection.
Some applications will create the handle, immediately send data, flush
and delete it, expecting the data to be sent to remote peer.
This is a bad behavior as the application would become unresponsive
until the connection is established, data can be written (since
depends on server consuming it), then allow it to be closed.
A proper behavior here would be to chain based on events, with the
usage of a copier would be simply wait for "done" event.
However the legacy API allowed this and terminology depends on this
awkward "feature", thus be bug-compatible.
This fixes T5015.
-rw-r--r-- | src/lib/ecore_con/ecore_con_legacy.c | 4 | ||||
-rw-r--r-- | src/lib/ecore_ipc/ecore_ipc.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/ecore_con/ecore_con_legacy.c b/src/lib/ecore_con/ecore_con_legacy.c index e99b4a90bd..684c25da58 100644 --- a/src/lib/ecore_con/ecore_con_legacy.c +++ b/src/lib/ecore_con/ecore_con_legacy.c @@ -2262,6 +2262,10 @@ ecore_con_server_flush(Ecore_Con_Server *svr) if (!svr->dialer) return; + while (!efl_io_closer_closed_get(svr->dialer) && + !efl_net_dialer_connected_get(svr->dialer)) + ecore_main_loop_iterate(); + efl_io_buffered_stream_flush(svr->dialer, EINA_FALSE, EINA_TRUE); inner_dialer = efl_io_buffered_stream_inner_io_get(svr->dialer); diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c index 40a1e1e8a7..ec83de76f5 100644 --- a/src/lib/ecore_ipc/ecore_ipc.c +++ b/src/lib/ecore_ipc/ecore_ipc.c @@ -1182,6 +1182,9 @@ ecore_ipc_server_flush(Ecore_Ipc_Server *svr) } if (svr->dialer.input) { + while (!efl_io_closer_closed_get(svr->dialer.dialer) && + !efl_net_dialer_connected_get(svr->dialer.dialer)) + ecore_main_loop_iterate(); while (efl_io_queue_usage_get(svr->dialer.input) > 0) efl_io_copier_flush(svr->dialer.send_copier, EINA_TRUE, EINA_TRUE); return; |