summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2016-03-10 13:56:24 -0600
committerChris Michael <cpmichael@osg.samsung.com>2016-03-10 15:55:04 -0500
commit9646f8e9ecf9a148f0811a7d01398d97bf50d168 (patch)
treeab4b1a5fe0e51f0aac08afce5f30948ec638d3c1
parent358a20449142259607718c49e1cf0c99dfe9c8cd (diff)
ecore_wl2: Don't treat EINVAL as a recoverable condition
EINVAL is bad, we can't go on. If we treat it like it's not a fatal error we'll end up spinning on the fd and constantly retrying sends on the dead wayland connection. @fix
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_display.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ecore_wl2/ecore_wl2_display.c b/src/lib/ecore_wl2/ecore_wl2_display.c
index 6df06ec257..6569a43d25 100644
--- a/src/lib/ecore_wl2/ecore_wl2_display.c
+++ b/src/lib/ecore_wl2/ecore_wl2_display.c
@@ -235,7 +235,7 @@ _cb_connect_data(void *data, Ecore_Fd_Handler *hdl)
235 if (ecore_main_fd_handler_active_get(hdl, ECORE_FD_READ)) 235 if (ecore_main_fd_handler_active_get(hdl, ECORE_FD_READ))
236 { 236 {
237 ret = wl_display_dispatch(ewd->wl.display); 237 ret = wl_display_dispatch(ewd->wl.display);
238 if ((ret < 0) && ((errno != EAGAIN) && (errno != EINVAL))) 238 if ((ret < 0) && (errno != EAGAIN))
239 { 239 {
240 ERR("Received Fatal Error on Wayland Display"); 240 ERR("Received Fatal Error on Wayland Display");
241 241
@@ -252,7 +252,7 @@ _cb_connect_data(void *data, Ecore_Fd_Handler *hdl)
252 if (ret == 0) 252 if (ret == 0)
253 ecore_main_fd_handler_active_set(hdl, ECORE_FD_READ); 253 ecore_main_fd_handler_active_set(hdl, ECORE_FD_READ);
254 254
255 if ((ret < 0) && ((errno != EAGAIN) && (errno != EINVAL))) 255 if ((ret < 0) && (errno != EAGAIN))
256 { 256 {
257 ERR("Received Fatal Error on Wayland Display"); 257 ERR("Received Fatal Error on Wayland Display");
258 258
@@ -303,7 +303,7 @@ _cb_connect_idle(void *data)
303 return ECORE_CALLBACK_RENEW; 303 return ECORE_CALLBACK_RENEW;
304 304
305err: 305err:
306 if ((ret < 0) && ((errno != EAGAIN) && (errno != EINVAL))) 306 if ((ret < 0) && (errno != EAGAIN))
307 { 307 {
308 ERR("Wayland Socket Error: %s", strerror(errno)); 308 ERR("Wayland Socket Error: %s", strerror(errno));
309 309