summaryrefslogtreecommitdiff
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
commit8813cd33dded80a1d573eb034483b4ae6aa0888f (patch)
tree26f31028e98bdd4a9ec9755ed02a8e8bb0b924e0
parent9fc9db95edad4f51a6e1d1672acefb1876668003 (diff)
ecore: move close_on_destructor to close_on_invalidate as that describe the behavior best.
Fix all use to correctly behave on invalidate.
-rw-r--r--unsorted/ecore/efl_net_server_example.c6
-rw-r--r--unsorted/ecore/efl_net_server_simple_example.c2
-rw-r--r--unsorted/ecore/efl_net_socket_ssl_server_example.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/unsorted/ecore/efl_net_server_example.c b/unsorted/ecore/efl_net_server_example.c
index 694ce764..29a4b965 100644
--- a/unsorted/ecore/efl_net_server_example.c
+++ b/unsorted/ecore/efl_net_server_example.c
@@ -321,7 +321,7 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event)
321 efl_io_copier_destination_set(efl_added, client), 321 efl_io_copier_destination_set(efl_added, client),
322 efl_io_copier_timeout_inactivity_set(efl_added, timeout), 322 efl_io_copier_timeout_inactivity_set(efl_added, timeout),
323 efl_event_callback_array_add(efl_added, echo_copier_cbs(), client), 323 efl_event_callback_array_add(efl_added, echo_copier_cbs(), client),
324 efl_io_closer_close_on_destructor_set(efl_added, EINA_TRUE) /* we want to auto-close as we have a single copier */ 324 efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE) /* we want to auto-close as we have a single copier */
325 ); 325 );
326 326
327 fprintf(stderr, "INFO: using an echo copier=%p for client %s\n", 327 fprintf(stderr, "INFO: using an echo copier=%p for client %s\n",
@@ -362,7 +362,7 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event)
362 efl_io_copier_destination_set(efl_added, client), 362 efl_io_copier_destination_set(efl_added, client),
363 efl_io_copier_timeout_inactivity_set(efl_added, timeout), 363 efl_io_copier_timeout_inactivity_set(efl_added, timeout),
364 efl_event_callback_array_add(efl_added, send_copier_cbs(), d), 364 efl_event_callback_array_add(efl_added, send_copier_cbs(), d),
365 efl_io_closer_close_on_destructor_set(efl_added, EINA_FALSE) /* we must wait both copiers to finish before we close! */ 365 efl_io_closer_close_on_invalidate_set(efl_added, EINA_FALSE) /* we must wait both copiers to finish before we close! */
366 ); 366 );
367 367
368 fprintf(stderr, "INFO: using sender buffer %p with copier %p for client %s\n", 368 fprintf(stderr, "INFO: using sender buffer %p with copier %p for client %s\n",
@@ -379,7 +379,7 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event)
379 efl_io_copier_destination_set(efl_added, recv_buffer), 379 efl_io_copier_destination_set(efl_added, recv_buffer),
380 efl_io_copier_timeout_inactivity_set(efl_added, 0.0), /* we'll only set an inactivity timeout once the sender is done */ 380 efl_io_copier_timeout_inactivity_set(efl_added, 0.0), /* we'll only set an inactivity timeout once the sender is done */
381 efl_event_callback_array_add(efl_added, recv_copier_cbs(), d), 381 efl_event_callback_array_add(efl_added, recv_copier_cbs(), d),
382 efl_io_closer_close_on_destructor_set(efl_added, EINA_FALSE) /* we must wait both copiers to finish before we close! */ 382 efl_io_closer_close_on_invalidate_set(efl_added, EINA_FALSE) /* we must wait both copiers to finish before we close! */
383 ); 383 );
384 384
385 fprintf(stderr, "INFO: using receiver buffer %p with copier %p for client %s\n", 385 fprintf(stderr, "INFO: using receiver buffer %p with copier %p for client %s\n",
diff --git a/unsorted/ecore/efl_net_server_simple_example.c b/unsorted/ecore/efl_net_server_simple_example.c
index 485dc814..beb314b2 100644
--- a/unsorted/ecore/efl_net_server_simple_example.c
+++ b/unsorted/ecore/efl_net_server_simple_example.c
@@ -176,7 +176,7 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event)
176 efl_io_copier_source_set(efl_added, client), 176 efl_io_copier_source_set(efl_added, client),
177 efl_io_copier_destination_set(efl_added, client), 177 efl_io_copier_destination_set(efl_added, client),
178 efl_event_callback_array_add(efl_added, echo_copier_cbs(), client), 178 efl_event_callback_array_add(efl_added, echo_copier_cbs(), client),
179 efl_io_closer_close_on_destructor_set(efl_added, EINA_TRUE) /* we want to auto-close as we have a single copier */ 179 efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE) /* we want to auto-close as we have a single copier */
180 ); 180 );
181 181
182 fprintf(stderr, "INFO: using an echo copier=%p for client %s\n", 182 fprintf(stderr, "INFO: using an echo copier=%p for client %s\n",
diff --git a/unsorted/ecore/efl_net_socket_ssl_server_example.c b/unsorted/ecore/efl_net_socket_ssl_server_example.c
index 77d435e1..4b9171e4 100644
--- a/unsorted/ecore/efl_net_socket_ssl_server_example.c
+++ b/unsorted/ecore/efl_net_socket_ssl_server_example.c
@@ -128,7 +128,7 @@ _server_client_add(void *data EINA_UNUSED, const Efl_Event *event)
128 efl_io_copier_destination_set(efl_added, ssl), 128 efl_io_copier_destination_set(efl_added, ssl),
129 efl_io_copier_timeout_inactivity_set(efl_added, timeout), 129 efl_io_copier_timeout_inactivity_set(efl_added, timeout),
130 efl_event_callback_array_add(efl_added, echo_copier_cbs(), ssl), 130 efl_event_callback_array_add(efl_added, echo_copier_cbs(), ssl),
131 efl_io_closer_close_on_destructor_set(efl_added, EINA_TRUE) /* we want to auto-close as we have a single copier */ 131 efl_io_closer_close_on_invalidate_set(efl_added, EINA_TRUE) /* we want to auto-close as we have a single copier */
132 ); 132 );
133 133
134 fprintf(stderr, "INFO: using an echo copier=%p for ssl %s\n", 134 fprintf(stderr, "INFO: using an echo copier=%p for ssl %s\n",