Fixed to be removed from g_main_loop when error occurs in wl_display.

 - This is a minimal measure to ensure that abort does not occur
  in twe_thread. but is not perfect.
 - disp_source will be removed from main_loop,
  but other problems may arise because it affects
  the remaining surf_source.

Change-Id: I04f2be6888cab077c3997bbd1bd38d92eda6b842
Signed-off-by: Joonbum Ko <joonbum.ko@samsung.com>

diff --git a/src/tpl_wayland_egl_thread.c b/src/tpl_wayland_egl_thread.c
index f5d8bc3..a5801ec 100755 (executable)
--- a/src/tpl_wayland_egl_thread.c
+++ b/src/tpl_wayland_egl_thread.c
@@ -635,6 +635,12 @@ _twe_thread_wl_disp_prepare(GSource *source, gint *time)
        if (disp_source->prepared)
                return FALSE;
 
+       /* If there is a last_error, there is no need to poll,
+        * so skip directly to dispatch.
+        * prepare -> dispatch */
+       if (disp_source->last_error)
+               return TRUE;
+
        while (wl_display_prepare_read_queue(disp_source->disp,
                                                                                 disp_source->ev_queue) != 0) {
                if (wl_display_dispatch_queue_pending(disp_source->disp,
@@ -660,6 +666,16 @@ _twe_thread_wl_disp_check(GSource *source)
        if (!disp_source->prepared)
                return ret;
 
+       /* If prepared, but last_error is set,
+        * cancel_read is executed and FALSE is returned.
+        * That can lead to G_SOURCE_REMOVE by calling disp_prepare again
+        * and skipping disp_check from prepare to disp_dispatch.
+        * check -> prepare -> dispatch -> G_SOURCE_REMOVE */
+       if (disp_source->prepared && disp_source->last_error) {
+               wl_display_cancel_read(disp_source->disp);
+               return ret;
+       }
+
        if (disp_source->gfd.revents & G_IO_IN) {
                if (wl_display_read_events(disp_source->disp) == -1)
                        _twe_display_print_err(disp_source, "read_event.");
@@ -679,6 +695,13 @@ _twe_thread_wl_disp_dispatch(GSource *source, GSourceFunc cb, gpointer data)
 {
        twe_wl_disp_source *disp_source = (twe_wl_disp_source *)source;
 
+       /* If there is last_error, G_SOURCE_REMOVE should be returned
+        * to remove the gsource from the main loop.
+        * This is because disp_source is not valid since last_error was set.*/
+       if (disp_source->last_error) {
+               return G_SOURCE_REMOVE;
+       }
+
        g_mutex_lock(&disp_source->wl_event_mutex);
        if (disp_source->gfd.revents & G_IO_IN) {
                if (wl_display_dispatch_queue_pending(disp_source->disp,