summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-10-06 10:19:25 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-10-06 12:24:59 +0900
commit7f6f2822105e3174dd688771131392595babf4e5 (patch)
treeee8ad6ee40180b35e92d8ee0745ed84d3ad01f3f /src
parent690319b2f3238b0d9889ecefc4dbd46f70d66d4c (diff)
Efl.Loop.User: Use prefix to rename efl_loop_user_loop_get
efl_loop_user_loop_get is idiotic. efl_loop_get should be good enough.
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore/efl_io_copier.c4
-rw-r--r--src/lib/ecore/efl_loop_user.eo3
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_tcp.c4
-rw-r--r--src/lib/ecore_con/efl_net_dialer_websocket.c4
-rw-r--r--src/lib/eio/efl_io_manager.c18
6 files changed, 19 insertions, 18 deletions
diff --git a/src/lib/ecore/efl_io_copier.c b/src/lib/ecore/efl_io_copier.c
index 1f571c8d2c..54dcc3f18a 100644
--- a/src/lib/ecore/efl_io_copier.c
+++ b/src/lib/ecore/efl_io_copier.c
@@ -102,7 +102,7 @@ _efl_io_copier_job_schedule(Eo *o, Efl_Io_Copier_Data *pd)
102{ 102{
103 if (pd->job) return; 103 if (pd->job) return;
104 104
105 efl_future_use(&pd->job, efl_loop_job(efl_loop_user_loop_get(o), o)); 105 efl_future_use(&pd->job, efl_loop_job(efl_loop_get(o), o));
106 efl_future_then(pd->job, _efl_io_copier_job, NULL, NULL, o); 106 efl_future_then(pd->job, _efl_io_copier_job, NULL, NULL, o);
107 efl_future_link(o, pd->job); 107 efl_future_link(o, pd->job);
108} 108}
@@ -664,7 +664,7 @@ _efl_io_copier_efl_object_finalize(Eo *o, Efl_Io_Copier_Data *pd)
664 if (pd->read_chunk_size == 0) 664 if (pd->read_chunk_size == 0)
665 efl_io_copier_read_chunk_size_set(o, DEF_READ_CHUNK_SIZE); 665 efl_io_copier_read_chunk_size_set(o, DEF_READ_CHUNK_SIZE);
666 666
667 if (!efl_loop_user_loop_get(o)) 667 if (!efl_loop_get(o))
668 { 668 {
669 ERR("Set a loop provider as parent of this copier!"); 669 ERR("Set a loop provider as parent of this copier!");
670 return NULL; 670 return NULL;
diff --git a/src/lib/ecore/efl_loop_user.eo b/src/lib/ecore/efl_loop_user.eo
index c689f49bc0..ec790de021 100644
--- a/src/lib/ecore/efl_loop_user.eo
+++ b/src/lib/ecore/efl_loop_user.eo
@@ -3,6 +3,7 @@ class Efl.Loop_User (Efl.Object)
3 [[An Efl.Loop_User is a class that require one of the parent to provide 3 [[An Efl.Loop_User is a class that require one of the parent to provide
4 an Efl.Loop interface when doing provider_find. It will enforce this by 4 an Efl.Loop interface when doing provider_find. It will enforce this by
5 only allowing parent that provide such interface or NULL.]] 5 only allowing parent that provide such interface or NULL.]]
6 eo_prefix: efl_loop;
6 methods { 7 methods {
7 loop_get { 8 loop_get {
8 return: Efl.Loop; 9 return: Efl.Loop;
@@ -11,4 +12,4 @@ class Efl.Loop_User (Efl.Object)
11 implements { 12 implements {
12 Efl.Object.parent.set; 13 Efl.Object.parent.set;
13 } 14 }
14} \ No newline at end of file 15}
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index 9e16d8ad40..ea7037120c 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -1249,7 +1249,7 @@ _efl_net_dialer_http_curl_start(Eo *o, Efl_Net_Dialer_Http_Data *pd)
1249 // TODO: move this to be per-loop once multiple mainloops are supported 1249 // TODO: move this to be per-loop once multiple mainloops are supported
1250 // this would need to attach something to the loop 1250 // this would need to attach something to the loop
1251 cm = &_cm_global; 1251 cm = &_cm_global;
1252 if (!cm->loop) cm->loop = efl_loop_user_loop_get(o); 1252 if (!cm->loop) cm->loop = efl_loop_get(o);
1253 if (!_efl_net_dialer_http_curlm_add(cm, o, pd->easy)) 1253 if (!_efl_net_dialer_http_curlm_add(cm, o, pd->easy))
1254 { 1254 {
1255 ERR("dialer=%p could not add curl easy handle to multi manager", o); 1255 ERR("dialer=%p could not add curl easy handle to multi manager", o);
@@ -1671,7 +1671,7 @@ _efl_net_dialer_http_efl_io_closer_close(Eo *o, Efl_Net_Dialer_Http_Data *pd)
1671 { 1671 {
1672 if (!pd->pending_close) 1672 if (!pd->pending_close)
1673 { 1673 {
1674 efl_future_use(&pd->pending_close, efl_loop_job(efl_loop_user_loop_get(o), o)); 1674 efl_future_use(&pd->pending_close, efl_loop_job(efl_loop_get(o), o));
1675 efl_future_then(pd->pending_close, _efl_net_dialer_http_pending_close, NULL, NULL, o); 1675 efl_future_then(pd->pending_close, _efl_net_dialer_http_pending_close, NULL, NULL, o);
1676 DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close); 1676 DBG("dialer=%p closed from CURL callback, schedule close job=%p", o, pd->pending_close);
1677 } 1677 }
diff --git a/src/lib/ecore_con/efl_net_dialer_tcp.c b/src/lib/ecore_con/efl_net_dialer_tcp.c
index b490aaa36f..ad1159a638 100644
--- a/src/lib/ecore_con/efl_net_dialer_tcp.c
+++ b/src/lib/ecore_con/efl_net_dialer_tcp.c
@@ -168,7 +168,7 @@ _efl_net_dialer_tcp_efl_net_dialer_dial(Eo *o, Efl_Net_Dialer_Tcp_Data *pd EINA_
168 efl_future_cancel(pd->connect.timeout); 168 efl_future_cancel(pd->connect.timeout);
169 if (pd->timeout_dial > 0.0) 169 if (pd->timeout_dial > 0.0)
170 { 170 {
171 efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_user_loop_get(o), pd->timeout_dial, o)); 171 efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial, o));
172 efl_future_then(pd->connect.timeout, _efl_net_dialer_tcp_connect_timeout, NULL, NULL, o); 172 efl_future_then(pd->connect.timeout, _efl_net_dialer_tcp_connect_timeout, NULL, NULL, o);
173 efl_future_link(o, pd->connect.timeout); 173 efl_future_link(o, pd->connect.timeout);
174 } 174 }
@@ -209,7 +209,7 @@ _efl_net_dialer_tcp_efl_net_dialer_timeout_dial_set(Eo *o EINA_UNUSED, Efl_Net_D
209 209
210 if ((pd->timeout_dial > 0.0) && (pd->connect.thread)) 210 if ((pd->timeout_dial > 0.0) && (pd->connect.thread))
211 { 211 {
212 efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_user_loop_get(o), pd->timeout_dial, o)); 212 efl_future_use(&pd->connect.timeout, efl_loop_timeout(efl_loop_get(o), pd->timeout_dial, o));
213 efl_future_then(pd->connect.timeout, _efl_net_dialer_tcp_connect_timeout, NULL, NULL, o); 213 efl_future_then(pd->connect.timeout, _efl_net_dialer_tcp_connect_timeout, NULL, NULL, o);
214 } 214 }
215} 215}
diff --git a/src/lib/ecore_con/efl_net_dialer_websocket.c b/src/lib/ecore_con/efl_net_dialer_websocket.c
index 52c066103f..b0a9dc4fe3 100644
--- a/src/lib/ecore_con/efl_net_dialer_websocket.c
+++ b/src/lib/ecore_con/efl_net_dialer_websocket.c
@@ -761,7 +761,7 @@ _efl_net_dialer_websocket_job_schedule(Eo *o, Efl_Net_Dialer_Websocket_Data *pd)
761 761
762 if (pd->job) return; 762 if (pd->job) return;
763 763
764 loop = efl_loop_user_loop_get(o); 764 loop = efl_loop_get(o);
765 if (!loop) return; 765 if (!loop) return;
766 efl_future_use(&pd->job, efl_loop_job(loop, o)); 766 efl_future_use(&pd->job, efl_loop_job(loop, o));
767 efl_future_then(pd->job, _efl_net_dialer_websocket_job, NULL, NULL, o); 767 efl_future_then(pd->job, _efl_net_dialer_websocket_job, NULL, NULL, o);
@@ -1499,7 +1499,7 @@ _efl_net_dialer_websocket_close_request(Eo *o, Efl_Net_Dialer_Websocket_Data *pd
1499 if (pd->close_timeout) 1499 if (pd->close_timeout)
1500 efl_future_cancel(pd->close_timeout); 1500 efl_future_cancel(pd->close_timeout);
1501 1501
1502 efl_future_use(&pd->close_timeout, efl_loop_timeout(efl_loop_user_loop_get(o), 2.0, o)); 1502 efl_future_use(&pd->close_timeout, efl_loop_timeout(efl_loop_get(o), 2.0, o));
1503 efl_future_then(pd->close_timeout, _efl_net_dialer_websocket_close_request_timeout, NULL, NULL, o); 1503 efl_future_then(pd->close_timeout, _efl_net_dialer_websocket_close_request_timeout, NULL, NULL, o);
1504 efl_future_link(o, pd->close_timeout); 1504 efl_future_link(o, pd->close_timeout);
1505 1505
diff --git a/src/lib/eio/efl_io_manager.c b/src/lib/eio/efl_io_manager.c
index 0740f35896..51043f88c8 100644
--- a/src/lib/eio/efl_io_manager.c
+++ b/src/lib/eio/efl_io_manager.c
@@ -260,7 +260,7 @@ _efl_io_manager_direct_ls(Eo *obj,
260 Efl_Promise *p; 260 Efl_Promise *p;
261 Eio_File *h; 261 Eio_File *h;
262 262
263 Eo *loop = efl_loop_user_loop_get(obj); 263 Eo *loop = efl_loop_get(obj);
264 p = efl_add(EFL_PROMISE_CLASS, loop); 264 p = efl_add(EFL_PROMISE_CLASS, loop);
265 if (!p) return NULL; 265 if (!p) return NULL;
266 266
@@ -300,7 +300,7 @@ _efl_io_manager_stat_ls(Eo *obj,
300 Efl_Promise *p; 300 Efl_Promise *p;
301 Eio_File *h; 301 Eio_File *h;
302 302
303 Eo *loop = efl_loop_user_loop_get(obj); 303 Eo *loop = efl_loop_get(obj);
304 p = efl_add(EFL_PROMISE_CLASS, loop); 304 p = efl_add(EFL_PROMISE_CLASS, loop);
305 if (!p) return NULL; 305 if (!p) return NULL;
306 306
@@ -339,7 +339,7 @@ _efl_io_manager_ls(Eo *obj,
339 Efl_Promise *p; 339 Efl_Promise *p;
340 Eio_File *h; 340 Eio_File *h;
341 341
342 Eo *loop = efl_loop_user_loop_get(obj); 342 Eo *loop = efl_loop_get(obj);
343 p = efl_add(EFL_PROMISE_CLASS, loop); 343 p = efl_add(EFL_PROMISE_CLASS, loop);
344 if (!p) return NULL; 344 if (!p) return NULL;
345 345
@@ -387,7 +387,7 @@ _efl_io_manager_stat(Eo *obj,
387 Efl_Promise *p; 387 Efl_Promise *p;
388 Eio_File *h; 388 Eio_File *h;
389 389
390 Eo *loop = efl_loop_user_loop_get(obj); 390 Eo *loop = efl_loop_get(obj);
391 p = efl_add(EFL_PROMISE_CLASS, loop); 391 p = efl_add(EFL_PROMISE_CLASS, loop);
392 if (!p) return NULL; 392 if (!p) return NULL;
393 393
@@ -415,7 +415,7 @@ _efl_io_manager_xattr_ls(Eo *obj,
415 Efl_Promise *p; 415 Efl_Promise *p;
416 Eio_File *h; 416 Eio_File *h;
417 417
418 Eo *loop = efl_loop_user_loop_get(obj); 418 Eo *loop = efl_loop_get(obj);
419 p = efl_add(EFL_PROMISE_CLASS, loop); 419 p = efl_add(EFL_PROMISE_CLASS, loop);
420 if (!p) return NULL; 420 if (!p) return NULL;
421 421
@@ -445,7 +445,7 @@ _efl_io_manager_xattr_set(Eo *obj,
445 Efl_Promise *p; 445 Efl_Promise *p;
446 Eio_File *h; 446 Eio_File *h;
447 447
448 Eo *loop = efl_loop_user_loop_get(obj); 448 Eo *loop = efl_loop_get(obj);
449 p = efl_add(EFL_PROMISE_CLASS, loop); 449 p = efl_add(EFL_PROMISE_CLASS, loop);
450 if (!p) return NULL; 450 if (!p) return NULL;
451 451
@@ -475,7 +475,7 @@ _efl_io_manager_xattr_get(Eo *obj,
475 Efl_Promise *p; 475 Efl_Promise *p;
476 Eio_File *h; 476 Eio_File *h;
477 477
478 Eo *loop = efl_loop_user_loop_get(obj); 478 Eo *loop = efl_loop_get(obj);
479 p = efl_add(EFL_PROMISE_CLASS, loop); 479 p = efl_add(EFL_PROMISE_CLASS, loop);
480 if (!p) return NULL; 480 if (!p) return NULL;
481 481
@@ -514,7 +514,7 @@ _efl_io_manager_open(Eo *obj,
514 Efl_Promise *p; 514 Efl_Promise *p;
515 Eio_File *h; 515 Eio_File *h;
516 516
517 Eo *loop = efl_loop_user_loop_get(obj); 517 Eo *loop = efl_loop_get(obj);
518 p = efl_add(EFL_PROMISE_CLASS, loop); 518 p = efl_add(EFL_PROMISE_CLASS, loop);
519 if (!p) return NULL; 519 if (!p) return NULL;
520 520
@@ -541,7 +541,7 @@ _efl_io_manager_close(Eo *obj,
541 Efl_Promise *p; 541 Efl_Promise *p;
542 Eio_File *h; 542 Eio_File *h;
543 543
544 Eo *loop = efl_loop_user_loop_get(obj); 544 Eo *loop = efl_loop_get(obj);
545 p = efl_add(EFL_PROMISE_CLASS, loop); 545 p = efl_add(EFL_PROMISE_CLASS, loop);
546 if (!p) return NULL; 546 if (!p) return NULL;
547 547