From 043fadeac39c58bbcba579cda54dc9f280ceb72f Mon Sep 17 00:00:00 2001 From: Ruslan Osmanov Date: Thu, 3 Nov 2011 19:38:18 +0000 Subject: [PATCH] Change: sync with svn changes git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@318754 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/eio/book.xml | 24 ++++---------- reference/eio/examples.xml | 12 ++----- ...t-eventfd.xml => eio-get-event-stream.xml} | 32 ++++++++----------- reference/eio/versions.xml | 2 +- 4 files changed, 23 insertions(+), 47 deletions(-) rename reference/eio/functions/{eio-get-eventfd.xml => eio-get-event-stream.xml} (68%) diff --git a/reference/eio/book.xml b/reference/eio/book.xml index c22cc58b94..89332db6de 100644 --- a/reference/eio/book.xml +++ b/reference/eio/book.xml @@ -105,14 +105,11 @@ eio_event_loop(); request that opens, reads and closes a file. - Since version 0.3.0 alpha, a file descriptor used for communications with - libeio internally, could be retrieved with - eio_get_eventfd. The file descriptor could be used to - bind to an event loop supported by some other extension. For instance, - libevent currently(Fri Oct 28 01:07:55 UZT 2011) - supports numeric file descriptors in both basic and buffered APIs in SVN. - Thus, you might organize a simple event loop where eio and libevent work - together: + Since version 0.3.0 alpha, a variable used in communications with libeio + internally, could be retrieved with + eio_get_event_stream. The variable could be used + to bind to an event loop supported by some other extension. You might + organize a simple event loop where eio and libevent work together: Using eio with libevent - eio_get_eventfd - Get the file descriptor used in internal communications with libeio. + eio_get_event_stream + Get stream representing a variable used in internal communications with libeio. &reftitle.description; - inteio_get_eventfd + mixedeio_get_event_stream - eio_get_eventfd acquires the file descriptor used in - internal communications with libeio. Could be used to bind with some event - loop provided by other PECL extension, for example libevent. + eio_get_event_stream acquires stream representing a + variable used in internal communications with libeio. Could be used to bind + with some event loop provided by other PECL extension, for example + libevent. @@ -28,7 +29,8 @@ &reftitle.returnvalues; - eio_get_eventfd returns the numeric file desriptor. + eio_get_event_stream returns stream on success; + otherwise, &null; @@ -47,35 +49,27 @@ function my_eio_poll($fd, $events, $arg) { /* .. and here */ } -function my_nop_cb($d, $r) { +function my_res_cb($d, $r) { var_dump($r); var_dump($d); } $base = event_base_new(); $event = event_new(); -// Get eio's file descriptor -$fd = eio_get_eventfd(); +$fd = eio_get_event_stream(); var_dump($fd); -eio_nop(EIO_PRI_DEFAULT, "my_nop_cb", "nop data"); -eio_mkdir("/tmp/abc-eio-temp", 0750, EIO_PRI_DEFAULT, "my_nop_cb", "nop data"); +eio_nop(EIO_PRI_DEFAULT, "my_res_cb", "nop data"); +eio_mkdir("/tmp/abc-eio-temp", 0750, EIO_PRI_DEFAULT, "my_res_cb", "mkdir data"); /* some other eio_* calls here ... */ // set event flags event_set($event, $fd, EV_READ /*| EV_PERSIST*/, "my_eio_poll", array($event, $base)); -// Set event priorities -event_base_priority_init($base, 10); - // set event base event_base_set($event, $base); -// This one is currently in SVN, but should appear in the next libevent -// release -event_priority_set($event, 2); - // enable event event_add($event); diff --git a/reference/eio/versions.xml b/reference/eio/versions.xml index 87264f044c..bd46028d94 100644 --- a/reference/eio/versions.xml +++ b/reference/eio/versions.xml @@ -48,7 +48,7 @@ - +