antognolli pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ccdeae7ce498d21088e4b0849ceb2394148f9877
commit ccdeae7ce498d21088e4b0849ceb2394148f9877
Author: Rafael Antognolli <rafael.antogno...@intel.com>
Date: Mon Oct 28 14:07:25 2013 -0200
ecore/wayland: Use sync callback to report end of ecore_wl_init().
At the end of the ecore_wl_init() function, send a sync request to the
server, and add a callback listener to the "done" event. When this event
is received, we are sure that all the registry bind requests done so
far were processed already, and that the registry and globals are
available and can be used.
Now, on the functions that request interfaces or registry, we call
_ecore_wl_init_wait(), which will check if the callback was received
already (that means that all requests inside the init were processed).
If it was not yet, then we wait until receiving that callback, before
returning the requested data.
---
src/lib/ecore_wayland/Ecore_Wayland.h | 11 +++++++
src/lib/ecore_wayland/ecore_wl.c | 36 ++++++++++++++++++++--
.../engines/wayland/ecore_evas_wayland_egl.c | 2 --
.../engines/wayland/ecore_evas_wayland_shm.c | 2 --
4 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h
b/src/lib/ecore_wayland/Ecore_Wayland.h
index 4238c46..9ba7636 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -120,6 +120,8 @@ struct _Ecore_Wl_Display
struct wl_list outputs;
struct wl_list globals; /** @since 1.7.6 */
+ Eina_Bool init_done;
+
struct
{
struct xkb_context *context;
@@ -558,6 +560,15 @@ EAPI struct wl_list *ecore_wl_outputs_get(void);
/**
* Retrieves the Wayland Globals Interface list used for the current Wayland
connection.
*
+ * This call, if done after the ECORE_WL_EVENT_INTERFACES_BOUND event was
+ * received already, won't block the mainloop or trigger a dispatch. It will
+ * return the current globals immediately. However, if done before this event,
+ * it will probably block the mainloop waiting for the sync "done" event to be
+ * received (by using one or more wl_display_dispatch call), and then finally
+ * return the wl globals list.
+ *
+ * There's no need to call dispatch manually, since this call will do it if
necessary.
+ *
* @return The current wayland globals interface list
*
* @ingroup Ecore_Wl_Display_Group
diff --git a/src/lib/ecore_wayland/ecore_wl.c b/src/lib/ecore_wayland/ecore_wl.c
index 9e8fa46..451aa79 100644
--- a/src/lib/ecore_wayland/ecore_wl.c
+++ b/src/lib/ecore_wayland/ecore_wl.c
@@ -22,6 +22,7 @@ static void _ecore_wl_animator_callback(void *data, struct
wl_callback *callback
static Eina_Bool _ecore_wl_animator_window_add(const Eina_Hash *hash
EINA_UNUSED, const void *key EINA_UNUSED, void *data, void *fdata EINA_UNUSED);
static void _ecore_wl_signal_exit(void);
static void _ecore_wl_signal_exit_free(void *data EINA_UNUSED, void *event);
+static void _ecore_wl_init_callback(void *data, struct wl_callback *callback,
uint32_t serial EINA_UNUSED);
/* local variables */
static int _ecore_wl_init_count = 0;
@@ -40,6 +41,11 @@ static const struct wl_callback_listener
_ecore_wl_sync_listener =
_ecore_wl_sync_callback
};
+static const struct wl_callback_listener _ecore_wl_init_sync_listener =
+{
+ _ecore_wl_init_callback
+};
+
static const struct wl_callback_listener _ecore_wl_anim_listener =
{
_ecore_wl_animator_callback
@@ -66,9 +72,26 @@ EAPI int ECORE_WL_EVENT_SELECTION_DATA_READY = 0;
EAPI int ECORE_WL_EVENT_DATA_SOURCE_CANCELLED = 0;
EAPI int ECORE_WL_EVENT_INTERFACES_BOUND = 0;
+static void
+_ecore_wl_init_callback(void *data, struct wl_callback *callback, uint32_t
serial EINA_UNUSED)
+{
+ Ecore_Wl_Display *ewd = data;
+
+ wl_callback_destroy(callback);
+ ewd->init_done = EINA_TRUE;
+}
+
+static void
+_ecore_wl_init_wait(void)
+{
+ while (!_ecore_wl_disp->init_done)
+ wl_display_dispatch(_ecore_wl_disp->wl.display);
+}
+
EAPI int
ecore_wl_init(const char *name)
{
+ struct wl_callback *callback;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (++_ecore_wl_init_count != 1) return _ecore_wl_init_count;
@@ -181,6 +204,10 @@ ecore_wl_init(const char *name)
_ecore_wl_window_init();
_ecore_wl_events_init();
+ callback = wl_display_sync(_ecore_wl_disp->wl.display);
+ wl_callback_add_listener(callback, &_ecore_wl_init_sync_listener,
+ _ecore_wl_disp);
+
return _ecore_wl_init_count;
}
@@ -212,6 +239,9 @@ EAPI struct wl_shm *
ecore_wl_shm_get(void)
{
if (!_ecore_wl_disp) return NULL;
+
+ _ecore_wl_init_wait();
+
return _ecore_wl_disp->wl.shm;
}
@@ -228,6 +258,9 @@ ecore_wl_globals_get(void)
{
if ((!_ecore_wl_disp) || (!_ecore_wl_disp->wl.display))
return NULL;
+
+ _ecore_wl_init_wait();
+
return &(_ecore_wl_disp->globals);
}
@@ -249,8 +282,7 @@ ecore_wl_screen_size_get(int *w, int *h)
if ((!_ecore_wl_disp) || (!_ecore_wl_disp->wl.display)) return;
- if (!_ecore_wl_disp->output)
- ecore_wl_sync();
+ _ecore_wl_init_wait();
if (!_ecore_wl_disp->output) return;
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 9959c08..369d7ca 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -112,8 +112,6 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name,
unsigned int parent,
ERR("Failed to initialize Ecore_Wayland");
return NULL;
}
- else if (count >= 1)
- ecore_wl_display_iterate();
if (!(ee = calloc(1, sizeof(Ecore_Evas))))
{
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 1e77a67..6cf845e 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -111,8 +111,6 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name,
unsigned int parent,
ERR("Failed to initialize Ecore_Wayland");
return NULL;
}
- else if (count >= 1)
- ecore_wl_display_iterate();
if (!(ee = calloc(1, sizeof(Ecore_Evas))))
{
--
