enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Reverting 80476 and 80479. This solution is flawed and causes some weird 

collateral damages that need further investigation. All programs running with
wayland engines are consuming 100% CPU.

ecore-wayland: Fix monitoring ECORE_FD_WRITE defaultly on
   wayland display fd lead to 100% cpu usage

  In ecore_wl_init(), adding wayland display fd with ECORE_FD_WRITE
  flag make CPU usage 100%. The proper way to monitor the ECORE_FD_WRITE
  is when the wl_display_flush() return value < 0 and errno == EAGAIN.
  And if wl_display_flush() return, we remove ECORE_FD_WRITE flag from
  the display fd.

  Patch by: Alex Wu <zhiwen.wu@linux.intel.com>


SVN revision: 80981
This commit is contained in:
Alex Wu 2012-12-14 19:00:53 +00:00 committed by Eduardo de Barros Lima
parent 18b1a05ea1
commit a3f102f742
1 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/lib/ecore_wayland/ecore_wl.c
View File

@ -7,7 +7,6 @@
/* local function prototypes */
static Eina_Bool _ecore_wl_shutdown(Eina_Bool close);
static Eina_Bool _ecore_wl_cb_idle_enterer(void *data);
static Eina_Bool _ecore_wl_cb_handle_data(void *data, Ecore_Fd_Handler *hdl);
static void _ecore_wl_cb_handle_global(void *data, struct wl_registry *registry, unsigned int id, const char *interface, unsigned int version EINA_UNUSED);
static Eina_Bool _ecore_wl_xkb_init(Ecore_Wl_Display *ewd);
@ -139,11 +138,10 @@ ecore_wl_init(const char *name)
_ecore_wl_disp->fd_hdl =
ecore_main_fd_handler_add(_ecore_wl_disp->fd,
ECORE_FD_READ,
ECORE_FD_READ | ECORE_FD_WRITE,
_ecore_wl_cb_handle_data, _ecore_wl_disp,
NULL, NULL);
ecore_idle_enterer_add(_ecore_wl_cb_idle_enterer, _ecore_wl_disp);
wl_list_init(&_ecore_wl_disp->inputs);
wl_list_init(&_ecore_wl_disp->outputs);
@ -398,32 +396,10 @@ _ecore_wl_shutdown(Eina_Bool close)
return _ecore_wl_init_count;
}
static Eina_Bool
_ecore_wl_cb_idle_enterer(void *data)
{
Ecore_Wl_Display *ewd;
int ret;
if (!(ewd = data)) return ECORE_CALLBACK_RENEW;
ret = wl_display_flush(ewd->wl.display);
if (ret < 0 && errno == EAGAIN)
{
ecore_main_fd_handler_active_set(ewd->fd_hdl, ECORE_FD_READ | ECORE_FD_WRITE);
}
else if (ret < 0)
{
/* FIXME: need do error processing? */
}
return ECORE_CALLBACK_RENEW;
}
static Eina_Bool
_ecore_wl_cb_handle_data(void *data, Ecore_Fd_Handler *hdl)
{
Ecore_Wl_Display *ewd;
int ret;
/* LOGFN(__FILE__, __LINE__, __FUNCTION__); */
@ -436,15 +412,7 @@ _ecore_wl_cb_handle_data(void *data, Ecore_Fd_Handler *hdl)
if (ecore_main_fd_handler_active_get(hdl, ECORE_FD_READ))
wl_display_dispatch(ewd->wl.display);
else if (ecore_main_fd_handler_active_get(hdl, ECORE_FD_WRITE))
{
ret = wl_display_flush(ewd->wl.display);
if (ret == 0)
ecore_main_fd_handler_active_set(hdl, ECORE_FD_READ);
else if (ret == -1 && errno != EAGAIN)
{
/* FIXME: need do error processing? */
}
}
wl_display_flush(ewd->wl.display);
return ECORE_CALLBACK_RENEW;
}