cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=76d91121f850e77dda00de36af23664267a3f42b
commit 76d91121f850e77dda00de36af23664267a3f42b
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Tue Jan 9 15:51:44 2018 -0800
ecore: remove use of efl_main_loop_get from efl_net_dialer_udp_example.
---
src/examples/ecore/efl_net_dialer_udp_example.c | 84 ++++++++++++++-----------
1 file changed, 49 insertions(+), 35 deletions(-)
diff --git a/src/examples/ecore/efl_net_dialer_udp_example.c
b/src/examples/ecore/efl_net_dialer_udp_example.c
index 35336235aa..3b13a60ca7 100644
--- a/src/examples/ecore/efl_net_dialer_udp_example.c
+++ b/src/examples/ecore/efl_net_dialer_udp_example.c
@@ -1,12 +1,8 @@
-#define EFL_BETA_API_SUPPORT 1
-#define EFL_EO_API_SUPPORT 1
-#include <Ecore.h>
-#include <Ecore_Con.h>
+#include <Efl_Net.h>
#include <Ecore_Getopt.h>
#include <fcntl.h>
#include <ctype.h>
-static int retval = EXIT_SUCCESS;
static int needed_reads = 0;
static void
@@ -69,8 +65,7 @@ _can_read(void *data EINA_UNUSED, const Efl_Event *event)
if (err == EAGAIN) /* EAGAIN for spurious packets */
return;
fprintf(stderr, "ERROR: could not read: %s\n",
eina_error_msg_get(err));
- retval = EXIT_FAILURE;
- ecore_main_loop_quit();
+ efl_loop_quit(efl_loop_get(event->object),
eina_value_int_init(EXIT_FAILURE));
return;
}
@@ -78,10 +73,7 @@ _can_read(void *data EINA_UNUSED, const Efl_Event *event)
needed_reads--;
if (!needed_reads)
- {
- retval = EXIT_SUCCESS;
- ecore_main_loop_quit();
- }
+ efl_loop_quit(efl_loop_get(event->object), EINA_VALUE_EMPTY);
free(rw_slice.mem);
}
@@ -108,8 +100,7 @@ _can_write(void *data EINA_UNUSED, const Efl_Event *event)
if (err)
{
fprintf(stderr, "ERROR: could not write: %s\n",
eina_error_msg_get(err));
- retval = EXIT_FAILURE;
- ecore_main_loop_quit();
+ efl_loop_quit(efl_loop_get(event->object),
eina_value_int_init(EXIT_FAILURE));
return;
}
@@ -122,8 +113,7 @@ _can_write(void *data EINA_UNUSED, const Efl_Event *event)
if (err)
{
fprintf(stderr, "ERROR: could not write: %s\n",
eina_error_msg_get(err));
- retval = EXIT_FAILURE;
- ecore_main_loop_quit();
+ efl_loop_quit(efl_loop_get(event->object),
eina_value_int_init(EXIT_FAILURE));
return;
}
@@ -139,8 +129,7 @@ _can_write(void *data EINA_UNUSED, const Efl_Event *event)
else
{
fprintf(stderr, "INFO: we're done\n");
- retval = EXIT_SUCCESS;
- ecore_main_loop_quit();
+ efl_loop_quit(efl_loop_get(event->object), EINA_VALUE_EMPTY);
}
return;
}
@@ -161,7 +150,8 @@ _error(void *data EINA_UNUSED, const Efl_Event *event)
{
const Eina_Error *perr = event->info;
fprintf(stderr, "INFO: error: %d '%s'\n", *perr, eina_error_msg_get(*perr));
- retval = EXIT_FAILURE;
+
+ efl_loop_quit(efl_loop_get(event->object),
eina_value_int_init(EXIT_FAILURE));
}
EFL_CALLBACKS_ARRAY_DEFINE(dialer_cbs,
@@ -202,8 +192,39 @@ static const Ecore_Getopt options = {
}
};
-int
-main(int argc, char **argv)
+static Eo *dialer = NULL;
+
+EAPI_MAIN void
+efl_pause(void *data EINA_UNUSED,
+ const Efl_Event *ev EINA_UNUSED)
+{
+}
+
+EAPI_MAIN void
+efl_resume(void *data EINA_UNUSED,
+ const Efl_Event *ev EINA_UNUSED)
+{
+}
+
+EAPI_MAIN void
+efl_terminate(void *data EINA_UNUSED,
+ const Efl_Event *ev EINA_UNUSED)
+{
+ /* FIXME: For the moment the main loop doesn't get
+ properly destroyed on shutdown which disallow
+ relying on parent destroying their children */
+ if (dialer)
+ {
+ efl_del(dialer);
+ dialer = NULL;
+ }
+
+ fprintf(stderr, "INFO: main loop finished.\n");
+}
+
+EAPI_MAIN void
+efl_main(void *data EINA_UNUSED,
+ const Efl_Event *ev)
{
char *address = NULL;
char *bind_address = NULL;
@@ -238,29 +259,24 @@ main(int argc, char **argv)
ECORE_GETOPT_VALUE_NONE /* sentinel */
};
int args;
- Eo *dialer, *loop;
+ Eo *loop;
Eina_Error err;
- ecore_init();
- ecore_con_init();
-
- args = ecore_getopt_parse(&options, values, argc, argv);
+ args = ecore_getopt_parse(&options, values, 0, NULL);
if (args < 0)
{
fputs("ERROR: Could not parse command line options.\n", stderr);
- retval = EXIT_FAILURE;
goto end;
}
if (quit_option) goto end;
- loop = efl_main_loop_get();
+ loop = ev->object;
- args = ecore_getopt_parse_positional(&options, values, argc, argv, args);
+ args = ecore_getopt_parse_positional(&options, values, 0, NULL, args);
if (args < 0)
{
fputs("ERROR: Could not parse positional arguments.\n", stderr);
- retval = EXIT_FAILURE;
goto end;
}
@@ -289,9 +305,7 @@ main(int argc, char **argv)
if (do_read) needed_reads = cork ? 1 : 2;
- ecore_main_loop_begin();
-
- fprintf(stderr, "INFO: main loop finished.\n");
+ return ;
no_mainloop:
efl_del(dialer);
@@ -299,8 +313,8 @@ main(int argc, char **argv)
end:
EINA_LIST_FREE(mcast_groups, str)
free(str);
- ecore_con_shutdown();
- ecore_shutdown();
- return retval;
+ efl_loop_quit(efl_loop_get(ev->object), eina_value_int_init(EXIT_FAILURE));
}
+
+EFL_MAIN_EX();
--
