ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/libev/ev.c
(Generate patch)

Comparing libev/ev.c (file contents):
Revision 1.60 by root, Sun Nov 4 18:29:44 2007 UTC vs.
Revision 1.157 by root, Wed Nov 28 20:58:32 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
97# endif
98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
53# endif 105# endif
54 106
55#endif 107#endif
56 108
57#include <math.h> 109#include <math.h>
58#include <stdlib.h> 110#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 111#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 112#include <stddef.h>
63 113
64#include <stdio.h> 114#include <stdio.h>
65 115
66#include <assert.h> 116#include <assert.h>
67#include <errno.h> 117#include <errno.h>
68#include <sys/types.h> 118#include <sys/types.h>
119#include <time.h>
120
121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
128
69#ifndef WIN32 129#ifndef _WIN32
130# include <sys/time.h>
70# include <sys/wait.h> 131# include <sys/wait.h>
132# include <unistd.h>
133#else
134# define WIN32_LEAN_AND_MEAN
135# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1
71#endif 138# endif
72#include <sys/time.h> 139#endif
73#include <time.h>
74 140
75/**/ 141/**/
76 142
77#ifndef EV_USE_MONOTONIC 143#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 144# define EV_USE_MONOTONIC 0
145#endif
146
147#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0
79#endif 149#endif
80 150
81#ifndef EV_USE_SELECT 151#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 152# define EV_USE_SELECT 1
83#endif 153#endif
84 154
85#ifndef EV_USE_POLL 155#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 156# ifdef _WIN32
157# define EV_USE_POLL 0
158# else
159# define EV_USE_POLL 1
160# endif
87#endif 161#endif
88 162
89#ifndef EV_USE_EPOLL 163#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 164# define EV_USE_EPOLL 0
91#endif 165#endif
92 166
93#ifndef EV_USE_KQUEUE 167#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 168# define EV_USE_KQUEUE 0
95#endif 169#endif
96 170
97#ifndef EV_USE_REALTIME 171#ifndef EV_USE_PORT
98# define EV_USE_REALTIME 1 172# define EV_USE_PORT 0
173#endif
174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
99#endif 193#endif
100 194
101/**/ 195/**/
102 196
103#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
108#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
109# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
110# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
111#endif 205#endif
112 206
207#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
113/**/ 219/**/
114 220
115#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
116#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
117#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
118/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
119
120#include "ev.h"
121 224
122#if __GNUC__ >= 3 225#if __GNUC__ >= 3
123# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
124# define inline inline 229# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
125#else 235#else
126# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
237# define inline_speed static
127# define inline static 238# define inline_size static
239# define noinline
128#endif 240#endif
129 241
130#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
131#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
132 244
133#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
134#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) ((w)->priority - EV_MINPRI)
135 247
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */
250
136typedef struct ev_watcher *W; 251typedef ev_watcher *W;
137typedef struct ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
138typedef struct ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
139 254
140static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
141 256
257#ifdef _WIN32
258# include "ev_win32.c"
259#endif
260
142/*****************************************************************************/ 261/*****************************************************************************/
143 262
263static void (*syserr_cb)(const char *msg);
264
265void
266ev_set_syserr_cb (void (*cb)(const char *msg))
267{
268 syserr_cb = cb;
269}
270
271static void noinline
272syserr (const char *msg)
273{
274 if (!msg)
275 msg = "(libev) system error";
276
277 if (syserr_cb)
278 syserr_cb (msg);
279 else
280 {
281 perror (msg);
282 abort ();
283 }
284}
285
286static void *(*alloc)(void *ptr, long size);
287
288void
289ev_set_allocator (void *(*cb)(void *ptr, long size))
290{
291 alloc = cb;
292}
293
294inline_speed void *
295ev_realloc (void *ptr, long size)
296{
297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
298
299 if (!ptr && size)
300 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
302 abort ();
303 }
304
305 return ptr;
306}
307
308#define ev_malloc(size) ev_realloc (0, (size))
309#define ev_free(ptr) ev_realloc ((ptr), 0)
310
311/*****************************************************************************/
312
144typedef struct 313typedef struct
145{ 314{
146 struct ev_watcher_list *head; 315 WL head;
147 unsigned char events; 316 unsigned char events;
148 unsigned char reify; 317 unsigned char reify;
318#if EV_SELECT_IS_WINSOCKET
319 SOCKET handle;
320#endif
149} ANFD; 321} ANFD;
150 322
151typedef struct 323typedef struct
152{ 324{
153 W w; 325 W w;
154 int events; 326 int events;
155} ANPENDING; 327} ANPENDING;
156 328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
335
157#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
158 337
159struct ev_loop 338 struct ev_loop
160{ 339 {
340 ev_tstamp ev_rt_now;
341 #define ev_rt_now ((loop)->ev_rt_now)
161# define VAR(name,decl) decl; 342 #define VAR(name,decl) decl;
162# include "ev_vars.h" 343 #include "ev_vars.h"
163};
164# undef VAR 344 #undef VAR
345 };
165# include "ev_wrap.h" 346 #include "ev_wrap.h"
347
348 static struct ev_loop default_loop_struct;
349 struct ev_loop *ev_default_loop_ptr;
166 350
167#else 351#else
168 352
353 ev_tstamp ev_rt_now;
169# define VAR(name,decl) static decl; 354 #define VAR(name,decl) static decl;
170# include "ev_vars.h" 355 #include "ev_vars.h"
171# undef VAR 356 #undef VAR
357
358 static int ev_default_loop_ptr;
172 359
173#endif 360#endif
174 361
175/*****************************************************************************/ 362/*****************************************************************************/
176 363
177inline ev_tstamp 364ev_tstamp
178ev_time (void) 365ev_time (void)
179{ 366{
180#if EV_USE_REALTIME 367#if EV_USE_REALTIME
181 struct timespec ts; 368 struct timespec ts;
182 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
186 gettimeofday (&tv, 0); 373 gettimeofday (&tv, 0);
187 return tv.tv_sec + tv.tv_usec * 1e-6; 374 return tv.tv_sec + tv.tv_usec * 1e-6;
188#endif 375#endif
189} 376}
190 377
191inline ev_tstamp 378ev_tstamp inline_size
192get_clock (void) 379get_clock (void)
193{ 380{
194#if EV_USE_MONOTONIC 381#if EV_USE_MONOTONIC
195 if (expect_true (have_monotonic)) 382 if (expect_true (have_monotonic))
196 { 383 {
201#endif 388#endif
202 389
203 return ev_time (); 390 return ev_time ();
204} 391}
205 392
393#if EV_MULTIPLICITY
206ev_tstamp 394ev_tstamp
207ev_now (EV_P) 395ev_now (EV_P)
208{ 396{
209 return rt_now; 397 return ev_rt_now;
210} 398}
399#endif
211 400
212#define array_roundsize(base,n) ((n) | 4 & ~3) 401#define array_roundsize(type,n) (((n) | 4) & ~3)
213 402
214#define array_needsize(base,cur,cnt,init) \ 403#define array_needsize(type,base,cur,cnt,init) \
215 if (expect_false ((cnt) > cur)) \ 404 if (expect_false ((cnt) > cur)) \
216 { \ 405 { \
217 int newcnt = cur; \ 406 int newcnt = cur; \
218 do \ 407 do \
219 { \ 408 { \
220 newcnt = array_roundsize (base, newcnt << 1); \ 409 newcnt = array_roundsize (type, newcnt << 1); \
221 } \ 410 } \
222 while ((cnt) > newcnt); \ 411 while ((cnt) > newcnt); \
223 \ 412 \
224 base = realloc (base, sizeof (*base) * (newcnt)); \ 413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
225 init (base + cur, newcnt - cur); \ 414 init (base + cur, newcnt - cur); \
226 cur = newcnt; \ 415 cur = newcnt; \
227 } 416 }
417
418#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 }
425
426#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
228 428
229/*****************************************************************************/ 429/*****************************************************************************/
230 430
231static void 431void noinline
432ev_feed_event (EV_P_ void *w, int revents)
433{
434 W w_ = (W)w;
435
436 if (expect_false (w_->pending))
437 {
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
439 return;
440 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446}
447
448void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type)
450{
451 int i;
452
453 for (i = 0; i < eventcnt; ++i)
454 ev_feed_event (EV_A_ events [i], type);
455}
456
457/*****************************************************************************/
458
459void inline_size
232anfds_init (ANFD *base, int count) 460anfds_init (ANFD *base, int count)
233{ 461{
234 while (count--) 462 while (count--)
235 { 463 {
236 base->head = 0; 464 base->head = 0;
239 467
240 ++base; 468 ++base;
241 } 469 }
242} 470}
243 471
244static void 472void inline_speed
245event (EV_P_ W w, int events)
246{
247 if (w->pending)
248 {
249 pendings [ABSPRI (w)][w->pending - 1].events |= events;
250 return;
251 }
252
253 w->pending = ++pendingcnt [ABSPRI (w)];
254 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
255 pendings [ABSPRI (w)][w->pending - 1].w = w;
256 pendings [ABSPRI (w)][w->pending - 1].events = events;
257}
258
259static void
260queue_events (EV_P_ W *events, int eventcnt, int type)
261{
262 int i;
263
264 for (i = 0; i < eventcnt; ++i)
265 event (EV_A_ events [i], type);
266}
267
268static void
269fd_event (EV_P_ int fd, int events) 473fd_event (EV_P_ int fd, int revents)
270{ 474{
271 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
272 struct ev_io *w; 476 ev_io *w;
273 477
274 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 478 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
275 { 479 {
276 int ev = w->events & events; 480 int ev = w->events & revents;
277 481
278 if (ev) 482 if (ev)
279 event (EV_A_ (W)w, ev); 483 ev_feed_event (EV_A_ (W)w, ev);
280 } 484 }
281} 485}
282 486
283/*****************************************************************************/ 487void
488ev_feed_fd_event (EV_P_ int fd, int revents)
489{
490 fd_event (EV_A_ fd, revents);
491}
284 492
285static void 493void inline_size
286fd_reify (EV_P) 494fd_reify (EV_P)
287{ 495{
288 int i; 496 int i;
289 497
290 for (i = 0; i < fdchangecnt; ++i) 498 for (i = 0; i < fdchangecnt; ++i)
291 { 499 {
292 int fd = fdchanges [i]; 500 int fd = fdchanges [i];
293 ANFD *anfd = anfds + fd; 501 ANFD *anfd = anfds + fd;
294 struct ev_io *w; 502 ev_io *w;
295 503
296 int events = 0; 504 int events = 0;
297 505
298 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
299 events |= w->events; 507 events |= w->events;
300 508
509#if EV_SELECT_IS_WINSOCKET
510 if (events)
511 {
512 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd);
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 }
516#endif
517
301 anfd->reify = 0; 518 anfd->reify = 0;
302 519
303 if (anfd->events != events)
304 {
305 method_modify (EV_A_ fd, anfd->events, events); 520 backend_modify (EV_A_ fd, anfd->events, events);
306 anfd->events = events; 521 anfd->events = events;
307 }
308 } 522 }
309 523
310 fdchangecnt = 0; 524 fdchangecnt = 0;
311} 525}
312 526
313static void 527void inline_size
314fd_change (EV_P_ int fd) 528fd_change (EV_P_ int fd)
315{ 529{
316 if (anfds [fd].reify || fdchangecnt < 0) 530 if (expect_false (anfds [fd].reify))
317 return; 531 return;
318 532
319 anfds [fd].reify = 1; 533 anfds [fd].reify = 1;
320 534
321 ++fdchangecnt; 535 ++fdchangecnt;
322 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
323 fdchanges [fdchangecnt - 1] = fd; 537 fdchanges [fdchangecnt - 1] = fd;
324} 538}
325 539
326static void 540void inline_speed
327fd_kill (EV_P_ int fd) 541fd_kill (EV_P_ int fd)
328{ 542{
329 struct ev_io *w; 543 ev_io *w;
330 544
331 while ((w = (struct ev_io *)anfds [fd].head)) 545 while ((w = (ev_io *)anfds [fd].head))
332 { 546 {
333 ev_io_stop (EV_A_ w); 547 ev_io_stop (EV_A_ w);
334 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 548 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
335 } 549 }
550}
551
552int inline_size
553fd_valid (int fd)
554{
555#ifdef _WIN32
556 return _get_osfhandle (fd) != -1;
557#else
558 return fcntl (fd, F_GETFD) != -1;
559#endif
336} 560}
337 561
338/* called on EBADF to verify fds */ 562/* called on EBADF to verify fds */
339static void 563static void noinline
340fd_ebadf (EV_P) 564fd_ebadf (EV_P)
341{ 565{
342 int fd; 566 int fd;
343 567
344 for (fd = 0; fd < anfdmax; ++fd) 568 for (fd = 0; fd < anfdmax; ++fd)
345 if (anfds [fd].events) 569 if (anfds [fd].events)
346 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 570 if (!fd_valid (fd) == -1 && errno == EBADF)
347 fd_kill (EV_A_ fd); 571 fd_kill (EV_A_ fd);
348} 572}
349 573
350/* called on ENOMEM in select/poll to kill some fds and retry */ 574/* called on ENOMEM in select/poll to kill some fds and retry */
351static void 575static void noinline
352fd_enomem (EV_P) 576fd_enomem (EV_P)
353{ 577{
354 int fd = anfdmax; 578 int fd;
355 579
356 while (fd--) 580 for (fd = anfdmax; fd--; )
357 if (anfds [fd].events) 581 if (anfds [fd].events)
358 { 582 {
359 close (fd);
360 fd_kill (EV_A_ fd); 583 fd_kill (EV_A_ fd);
361 return; 584 return;
362 } 585 }
363} 586}
364 587
365/* susually called after fork if method needs to re-arm all fds from scratch */ 588/* usually called after fork if backend needs to re-arm all fds from scratch */
366static void 589static void noinline
367fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
368{ 591{
369 int fd; 592 int fd;
370 593
371 /* this should be highly optimised to not do anything but set a flag */
372 for (fd = 0; fd < anfdmax; ++fd) 594 for (fd = 0; fd < anfdmax; ++fd)
373 if (anfds [fd].events) 595 if (anfds [fd].events)
374 { 596 {
375 anfds [fd].events = 0; 597 anfds [fd].events = 0;
376 fd_change (EV_A_ fd); 598 fd_change (EV_A_ fd);
377 } 599 }
378} 600}
379 601
380/*****************************************************************************/ 602/*****************************************************************************/
381 603
382static void 604void inline_speed
383upheap (WT *heap, int k) 605upheap (WT *heap, int k)
384{ 606{
385 WT w = heap [k]; 607 WT w = heap [k];
386 608
387 while (k && heap [k >> 1]->at > w->at) 609 while (k && heap [k >> 1]->at > w->at)
388 { 610 {
389 heap [k] = heap [k >> 1]; 611 heap [k] = heap [k >> 1];
390 heap [k]->active = k + 1; 612 ((W)heap [k])->active = k + 1;
391 k >>= 1; 613 k >>= 1;
392 } 614 }
393 615
394 heap [k] = w; 616 heap [k] = w;
395 heap [k]->active = k + 1; 617 ((W)heap [k])->active = k + 1;
396 618
397} 619}
398 620
399static void 621void inline_speed
400downheap (WT *heap, int N, int k) 622downheap (WT *heap, int N, int k)
401{ 623{
402 WT w = heap [k]; 624 WT w = heap [k];
403 625
404 while (k < (N >> 1)) 626 while (k < (N >> 1))
410 632
411 if (w->at <= heap [j]->at) 633 if (w->at <= heap [j]->at)
412 break; 634 break;
413 635
414 heap [k] = heap [j]; 636 heap [k] = heap [j];
415 heap [k]->active = k + 1; 637 ((W)heap [k])->active = k + 1;
416 k = j; 638 k = j;
417 } 639 }
418 640
419 heap [k] = w; 641 heap [k] = w;
420 heap [k]->active = k + 1; 642 ((W)heap [k])->active = k + 1;
643}
644
645void inline_size
646adjustheap (WT *heap, int N, int k)
647{
648 upheap (heap, k);
649 downheap (heap, N, k);
421} 650}
422 651
423/*****************************************************************************/ 652/*****************************************************************************/
424 653
425typedef struct 654typedef struct
426{ 655{
427 struct ev_watcher_list *head; 656 WL head;
428 sig_atomic_t volatile gotsig; 657 sig_atomic_t volatile gotsig;
429} ANSIG; 658} ANSIG;
430 659
431static ANSIG *signals; 660static ANSIG *signals;
432static int signalmax; 661static int signalmax;
433 662
434static int sigpipe [2]; 663static int sigpipe [2];
435static sig_atomic_t volatile gotsig; 664static sig_atomic_t volatile gotsig;
436static struct ev_io sigev; 665static ev_io sigev;
437 666
438static void 667void inline_size
439signals_init (ANSIG *base, int count) 668signals_init (ANSIG *base, int count)
440{ 669{
441 while (count--) 670 while (count--)
442 { 671 {
443 base->head = 0; 672 base->head = 0;
448} 677}
449 678
450static void 679static void
451sighandler (int signum) 680sighandler (int signum)
452{ 681{
682#if _WIN32
683 signal (signum, sighandler);
684#endif
685
453 signals [signum - 1].gotsig = 1; 686 signals [signum - 1].gotsig = 1;
454 687
455 if (!gotsig) 688 if (!gotsig)
456 { 689 {
457 int old_errno = errno; 690 int old_errno = errno;
459 write (sigpipe [1], &signum, 1); 692 write (sigpipe [1], &signum, 1);
460 errno = old_errno; 693 errno = old_errno;
461 } 694 }
462} 695}
463 696
697void noinline
698ev_feed_signal_event (EV_P_ int signum)
699{
700 WL w;
701
702#if EV_MULTIPLICITY
703 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
704#endif
705
706 --signum;
707
708 if (signum < 0 || signum >= signalmax)
709 return;
710
711 signals [signum].gotsig = 0;
712
713 for (w = signals [signum].head; w; w = w->next)
714 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
715}
716
464static void 717static void
465sigcb (EV_P_ struct ev_io *iow, int revents) 718sigcb (EV_P_ ev_io *iow, int revents)
466{ 719{
467 struct ev_watcher_list *w;
468 int signum; 720 int signum;
469 721
470 read (sigpipe [0], &revents, 1); 722 read (sigpipe [0], &revents, 1);
471 gotsig = 0; 723 gotsig = 0;
472 724
473 for (signum = signalmax; signum--; ) 725 for (signum = signalmax; signum--; )
474 if (signals [signum].gotsig) 726 if (signals [signum].gotsig)
475 { 727 ev_feed_signal_event (EV_A_ signum + 1);
476 signals [signum].gotsig = 0;
477
478 for (w = signals [signum].head; w; w = w->next)
479 event (EV_A_ (W)w, EV_SIGNAL);
480 }
481} 728}
482 729
483static void 730void inline_size
731fd_intern (int fd)
732{
733#ifdef _WIN32
734 int arg = 1;
735 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
736#else
737 fcntl (fd, F_SETFD, FD_CLOEXEC);
738 fcntl (fd, F_SETFL, O_NONBLOCK);
739#endif
740}
741
742static void noinline
484siginit (EV_P) 743siginit (EV_P)
485{ 744{
486#ifndef WIN32 745 fd_intern (sigpipe [0]);
487 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 746 fd_intern (sigpipe [1]);
488 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
489
490 /* rather than sort out wether we really need nb, set it */
491 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
492 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
493#endif
494 747
495 ev_io_set (&sigev, sigpipe [0], EV_READ); 748 ev_io_set (&sigev, sigpipe [0], EV_READ);
496 ev_io_start (EV_A_ &sigev); 749 ev_io_start (EV_A_ &sigev);
497 ev_unref (EV_A); /* child watcher should not keep loop alive */ 750 ev_unref (EV_A); /* child watcher should not keep loop alive */
498} 751}
499 752
500/*****************************************************************************/ 753/*****************************************************************************/
501 754
755static ev_child *childs [EV_PID_HASHSIZE];
756
502#ifndef WIN32 757#ifndef _WIN32
503 758
504static struct ev_child *childs [PID_HASHSIZE];
505static struct ev_signal childev; 759static ev_signal childev;
760
761void inline_speed
762child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
763{
764 ev_child *w;
765
766 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
767 if (w->pid == pid || !w->pid)
768 {
769 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
770 w->rpid = pid;
771 w->rstatus = status;
772 ev_feed_event (EV_A_ (W)w, EV_CHILD);
773 }
774}
506 775
507#ifndef WCONTINUED 776#ifndef WCONTINUED
508# define WCONTINUED 0 777# define WCONTINUED 0
509#endif 778#endif
510 779
511static void 780static void
512child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
513{
514 struct ev_child *w;
515
516 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
517 if (w->pid == pid || !w->pid)
518 {
519 w->priority = sw->priority; /* need to do it *now* */
520 w->rpid = pid;
521 w->rstatus = status;
522 event (EV_A_ (W)w, EV_CHILD);
523 }
524}
525
526static void
527childcb (EV_P_ struct ev_signal *sw, int revents) 781childcb (EV_P_ ev_signal *sw, int revents)
528{ 782{
529 int pid, status; 783 int pid, status;
530 784
785 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
531 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 786 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
532 { 787 if (!WCONTINUED
788 || errno != EINVAL
789 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
790 return;
791
533 /* make sure we are called again until all childs have been reaped */ 792 /* make sure we are called again until all childs have been reaped */
793 /* we need to do it this way so that the callback gets called before we continue */
534 event (EV_A_ (W)sw, EV_SIGNAL); 794 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
535 795
536 child_reap (EV_A_ sw, pid, pid, status); 796 child_reap (EV_A_ sw, pid, pid, status);
797 if (EV_PID_HASHSIZE > 1)
537 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 798 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
538 }
539} 799}
540 800
541#endif 801#endif
542 802
543/*****************************************************************************/ 803/*****************************************************************************/
544 804
805#if EV_USE_PORT
806# include "ev_port.c"
807#endif
545#if EV_USE_KQUEUE 808#if EV_USE_KQUEUE
546# include "ev_kqueue.c" 809# include "ev_kqueue.c"
547#endif 810#endif
548#if EV_USE_EPOLL 811#if EV_USE_EPOLL
549# include "ev_epoll.c" 812# include "ev_epoll.c"
566{ 829{
567 return EV_VERSION_MINOR; 830 return EV_VERSION_MINOR;
568} 831}
569 832
570/* return true if we are running with elevated privileges and should ignore env variables */ 833/* return true if we are running with elevated privileges and should ignore env variables */
571static int 834int inline_size
572enable_secure (void) 835enable_secure (void)
573{ 836{
574#ifdef WIN32 837#ifdef _WIN32
575 return 0; 838 return 0;
576#else 839#else
577 return getuid () != geteuid () 840 return getuid () != geteuid ()
578 || getgid () != getegid (); 841 || getgid () != getegid ();
579#endif 842#endif
580} 843}
581 844
582int 845unsigned int
583ev_method (EV_P) 846ev_supported_backends (void)
584{ 847{
585 return method; 848 unsigned int flags = 0;
586}
587 849
588static void 850 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
589loop_init (EV_P_ int methods) 851 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
852 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
853 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
854 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
855
856 return flags;
857}
858
859unsigned int
860ev_recommended_backends (void)
590{ 861{
591 if (!method) 862 unsigned int flags = ev_supported_backends ();
863
864#ifndef __NetBSD__
865 /* kqueue is borked on everything but netbsd apparently */
866 /* it usually doesn't work correctly on anything but sockets and pipes */
867 flags &= ~EVBACKEND_KQUEUE;
868#endif
869#ifdef __APPLE__
870 // flags &= ~EVBACKEND_KQUEUE; for documentation
871 flags &= ~EVBACKEND_POLL;
872#endif
873
874 return flags;
875}
876
877unsigned int
878ev_embeddable_backends (void)
879{
880 return EVBACKEND_EPOLL
881 | EVBACKEND_KQUEUE
882 | EVBACKEND_PORT;
883}
884
885unsigned int
886ev_backend (EV_P)
887{
888 return backend;
889}
890
891static void noinline
892loop_init (EV_P_ unsigned int flags)
893{
894 if (!backend)
592 { 895 {
593#if EV_USE_MONOTONIC 896#if EV_USE_MONOTONIC
594 { 897 {
595 struct timespec ts; 898 struct timespec ts;
596 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 899 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
597 have_monotonic = 1; 900 have_monotonic = 1;
598 } 901 }
599#endif 902#endif
600 903
601 rt_now = ev_time (); 904 ev_rt_now = ev_time ();
602 mn_now = get_clock (); 905 mn_now = get_clock ();
603 now_floor = mn_now; 906 now_floor = mn_now;
604 rtmn_diff = rt_now - mn_now; 907 rtmn_diff = ev_rt_now - mn_now;
605 908
606 if (methods == EVMETHOD_AUTO) 909 if (!(flags & EVFLAG_NOENV)
607 if (!enable_secure () && getenv ("LIBEV_METHODS")) 910 && !enable_secure ()
911 && getenv ("LIBEV_FLAGS"))
608 methods = atoi (getenv ("LIBEV_METHODS")); 912 flags = atoi (getenv ("LIBEV_FLAGS"));
609 else
610 methods = EVMETHOD_ANY;
611 913
612 method = 0; 914 if (!(flags & 0x0000ffffUL))
915 flags |= ev_recommended_backends ();
916
917 backend = 0;
918 backend_fd = -1;
919#if EV_USE_INOTIFY
920 fs_fd = -2;
921#endif
922
923#if EV_USE_PORT
924 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
925#endif
613#if EV_USE_KQUEUE 926#if EV_USE_KQUEUE
614 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 927 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
615#endif 928#endif
616#if EV_USE_EPOLL 929#if EV_USE_EPOLL
617 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 930 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
618#endif 931#endif
619#if EV_USE_POLL 932#if EV_USE_POLL
620 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 933 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
621#endif 934#endif
622#if EV_USE_SELECT 935#if EV_USE_SELECT
623 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 936 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
624#endif 937#endif
625 }
626}
627 938
628void 939 ev_init (&sigev, sigcb);
940 ev_set_priority (&sigev, EV_MAXPRI);
941 }
942}
943
944static void noinline
629loop_destroy (EV_P) 945loop_destroy (EV_P)
630{ 946{
947 int i;
948
949#if EV_USE_INOTIFY
950 if (fs_fd >= 0)
951 close (fs_fd);
952#endif
953
954 if (backend_fd >= 0)
955 close (backend_fd);
956
957#if EV_USE_PORT
958 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
959#endif
631#if EV_USE_KQUEUE 960#if EV_USE_KQUEUE
632 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 961 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
633#endif 962#endif
634#if EV_USE_EPOLL 963#if EV_USE_EPOLL
635 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 964 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
636#endif 965#endif
637#if EV_USE_POLL 966#if EV_USE_POLL
638 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 967 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
639#endif 968#endif
640#if EV_USE_SELECT 969#if EV_USE_SELECT
641 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 970 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
642#endif 971#endif
643 972
644 method = 0; 973 for (i = NUMPRI; i--; )
645 /*TODO*/ 974 array_free (pending, [i]);
646}
647 975
648void 976 /* have to use the microsoft-never-gets-it-right macro */
977 array_free (fdchange, EMPTY0);
978 array_free (timer, EMPTY0);
979#if EV_PERIODIC_ENABLE
980 array_free (periodic, EMPTY0);
981#endif
982 array_free (idle, EMPTY0);
983 array_free (prepare, EMPTY0);
984 array_free (check, EMPTY0);
985
986 backend = 0;
987}
988
989void inline_size infy_fork (EV_P);
990
991void inline_size
649loop_fork (EV_P) 992loop_fork (EV_P)
650{ 993{
651 /*TODO*/ 994#if EV_USE_PORT
995 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
996#endif
997#if EV_USE_KQUEUE
998 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
999#endif
652#if EV_USE_EPOLL 1000#if EV_USE_EPOLL
653 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1001 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
654#endif 1002#endif
655#if EV_USE_KQUEUE 1003#if EV_USE_INOTIFY
656 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 1004 infy_fork (EV_A);
657#endif 1005#endif
1006
1007 if (ev_is_active (&sigev))
1008 {
1009 /* default loop */
1010
1011 ev_ref (EV_A);
1012 ev_io_stop (EV_A_ &sigev);
1013 close (sigpipe [0]);
1014 close (sigpipe [1]);
1015
1016 while (pipe (sigpipe))
1017 syserr ("(libev) error creating pipe");
1018
1019 siginit (EV_A);
1020 }
1021
1022 postfork = 0;
658} 1023}
659 1024
660#if EV_MULTIPLICITY 1025#if EV_MULTIPLICITY
661struct ev_loop * 1026struct ev_loop *
662ev_loop_new (int methods) 1027ev_loop_new (unsigned int flags)
663{ 1028{
664 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 1029 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
665 1030
1031 memset (loop, 0, sizeof (struct ev_loop));
1032
666 loop_init (EV_A_ methods); 1033 loop_init (EV_A_ flags);
667 1034
668 if (ev_method (EV_A)) 1035 if (ev_backend (EV_A))
669 return loop; 1036 return loop;
670 1037
671 return 0; 1038 return 0;
672} 1039}
673 1040
674void 1041void
675ev_loop_destroy (EV_P) 1042ev_loop_destroy (EV_P)
676{ 1043{
677 loop_destroy (EV_A); 1044 loop_destroy (EV_A);
678 free (loop); 1045 ev_free (loop);
679} 1046}
680 1047
681void 1048void
682ev_loop_fork (EV_P) 1049ev_loop_fork (EV_P)
683{ 1050{
684 loop_fork (EV_A); 1051 postfork = 1;
685} 1052}
686 1053
687#endif 1054#endif
688 1055
689#if EV_MULTIPLICITY 1056#if EV_MULTIPLICITY
690struct ev_loop default_loop_struct;
691static struct ev_loop *default_loop;
692
693struct ev_loop * 1057struct ev_loop *
1058ev_default_loop_init (unsigned int flags)
694#else 1059#else
695static int default_loop;
696
697int 1060int
1061ev_default_loop (unsigned int flags)
698#endif 1062#endif
699ev_default_loop (int methods)
700{ 1063{
701 if (sigpipe [0] == sigpipe [1]) 1064 if (sigpipe [0] == sigpipe [1])
702 if (pipe (sigpipe)) 1065 if (pipe (sigpipe))
703 return 0; 1066 return 0;
704 1067
705 if (!default_loop) 1068 if (!ev_default_loop_ptr)
706 { 1069 {
707#if EV_MULTIPLICITY 1070#if EV_MULTIPLICITY
708 struct ev_loop *loop = default_loop = &default_loop_struct; 1071 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
709#else 1072#else
710 default_loop = 1; 1073 ev_default_loop_ptr = 1;
711#endif 1074#endif
712 1075
713 loop_init (EV_A_ methods); 1076 loop_init (EV_A_ flags);
714 1077
715 if (ev_method (EV_A)) 1078 if (ev_backend (EV_A))
716 { 1079 {
717 ev_watcher_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI);
719 siginit (EV_A); 1080 siginit (EV_A);
720 1081
721#ifndef WIN32 1082#ifndef _WIN32
722 ev_signal_init (&childev, childcb, SIGCHLD); 1083 ev_signal_init (&childev, childcb, SIGCHLD);
723 ev_set_priority (&childev, EV_MAXPRI); 1084 ev_set_priority (&childev, EV_MAXPRI);
724 ev_signal_start (EV_A_ &childev); 1085 ev_signal_start (EV_A_ &childev);
725 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1086 ev_unref (EV_A); /* child watcher should not keep loop alive */
726#endif 1087#endif
727 } 1088 }
728 else 1089 else
729 default_loop = 0; 1090 ev_default_loop_ptr = 0;
730 } 1091 }
731 1092
732 return default_loop; 1093 return ev_default_loop_ptr;
733} 1094}
734 1095
735void 1096void
736ev_default_destroy (void) 1097ev_default_destroy (void)
737{ 1098{
738#if EV_MULTIPLICITY 1099#if EV_MULTIPLICITY
739 struct ev_loop *loop = default_loop; 1100 struct ev_loop *loop = ev_default_loop_ptr;
740#endif 1101#endif
741 1102
1103#ifndef _WIN32
742 ev_ref (EV_A); /* child watcher */ 1104 ev_ref (EV_A); /* child watcher */
743 ev_signal_stop (EV_A_ &childev); 1105 ev_signal_stop (EV_A_ &childev);
1106#endif
744 1107
745 ev_ref (EV_A); /* signal watcher */ 1108 ev_ref (EV_A); /* signal watcher */
746 ev_io_stop (EV_A_ &sigev); 1109 ev_io_stop (EV_A_ &sigev);
747 1110
748 close (sigpipe [0]); sigpipe [0] = 0; 1111 close (sigpipe [0]); sigpipe [0] = 0;
753 1116
754void 1117void
755ev_default_fork (void) 1118ev_default_fork (void)
756{ 1119{
757#if EV_MULTIPLICITY 1120#if EV_MULTIPLICITY
758 struct ev_loop *loop = default_loop; 1121 struct ev_loop *loop = ev_default_loop_ptr;
759#endif 1122#endif
760 1123
761 loop_fork (EV_A); 1124 if (backend)
762 1125 postfork = 1;
763 ev_io_stop (EV_A_ &sigev);
764 close (sigpipe [0]);
765 close (sigpipe [1]);
766 pipe (sigpipe);
767
768 ev_ref (EV_A); /* signal watcher */
769 siginit (EV_A);
770} 1126}
771 1127
772/*****************************************************************************/ 1128/*****************************************************************************/
773 1129
774static void 1130int inline_size
1131any_pending (EV_P)
1132{
1133 int pri;
1134
1135 for (pri = NUMPRI; pri--; )
1136 if (pendingcnt [pri])
1137 return 1;
1138
1139 return 0;
1140}
1141
1142void inline_speed
775call_pending (EV_P) 1143call_pending (EV_P)
776{ 1144{
777 int pri; 1145 int pri;
778 1146
779 for (pri = NUMPRI; pri--; ) 1147 for (pri = NUMPRI; pri--; )
780 while (pendingcnt [pri]) 1148 while (pendingcnt [pri])
781 { 1149 {
782 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1150 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
783 1151
784 if (p->w) 1152 if (expect_true (p->w))
785 { 1153 {
1154 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1155
786 p->w->pending = 0; 1156 p->w->pending = 0;
787 p->w->cb (EV_A_ p->w, p->events); 1157 EV_CB_INVOKE (p->w, p->events);
788 } 1158 }
789 } 1159 }
790} 1160}
791 1161
792static void 1162void inline_size
793timers_reify (EV_P) 1163timers_reify (EV_P)
794{ 1164{
795 while (timercnt && timers [0]->at <= mn_now) 1165 while (timercnt && ((WT)timers [0])->at <= mn_now)
796 { 1166 {
797 struct ev_timer *w = timers [0]; 1167 ev_timer *w = timers [0];
1168
1169 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
798 1170
799 /* first reschedule or stop timer */ 1171 /* first reschedule or stop timer */
800 if (w->repeat) 1172 if (w->repeat)
801 { 1173 {
802 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1174 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1175
803 w->at = mn_now + w->repeat; 1176 ((WT)w)->at += w->repeat;
1177 if (((WT)w)->at < mn_now)
1178 ((WT)w)->at = mn_now;
1179
804 downheap ((WT *)timers, timercnt, 0); 1180 downheap ((WT *)timers, timercnt, 0);
805 } 1181 }
806 else 1182 else
807 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1183 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
808 1184
809 event (EV_A_ (W)w, EV_TIMEOUT); 1185 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
810 } 1186 }
811} 1187}
812 1188
813static void 1189#if EV_PERIODIC_ENABLE
1190void inline_size
814periodics_reify (EV_P) 1191periodics_reify (EV_P)
815{ 1192{
816 while (periodiccnt && periodics [0]->at <= rt_now) 1193 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
817 { 1194 {
818 struct ev_periodic *w = periodics [0]; 1195 ev_periodic *w = periodics [0];
1196
1197 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
819 1198
820 /* first reschedule or stop timer */ 1199 /* first reschedule or stop timer */
821 if (w->interval) 1200 if (w->reschedule_cb)
822 { 1201 {
1202 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1203 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1204 downheap ((WT *)periodics, periodiccnt, 0);
1205 }
1206 else if (w->interval)
1207 {
823 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 1208 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
824 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 1209 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
825 downheap ((WT *)periodics, periodiccnt, 0); 1210 downheap ((WT *)periodics, periodiccnt, 0);
826 } 1211 }
827 else 1212 else
828 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1213 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
829 1214
830 event (EV_A_ (W)w, EV_PERIODIC); 1215 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
831 } 1216 }
832} 1217}
833 1218
834static void 1219static void noinline
835periodics_reschedule (EV_P) 1220periodics_reschedule (EV_P)
836{ 1221{
837 int i; 1222 int i;
838 1223
839 /* adjust periodics after time jump */ 1224 /* adjust periodics after time jump */
840 for (i = 0; i < periodiccnt; ++i) 1225 for (i = 0; i < periodiccnt; ++i)
841 { 1226 {
842 struct ev_periodic *w = periodics [i]; 1227 ev_periodic *w = periodics [i];
843 1228
1229 if (w->reschedule_cb)
1230 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
844 if (w->interval) 1231 else if (w->interval)
845 {
846 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1232 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
847
848 if (fabs (diff) >= 1e-4)
849 {
850 ev_periodic_stop (EV_A_ w);
851 ev_periodic_start (EV_A_ w);
852
853 i = 0; /* restart loop, inefficient, but time jumps should be rare */
854 }
855 }
856 } 1233 }
857}
858 1234
859inline int 1235 /* now rebuild the heap */
1236 for (i = periodiccnt >> 1; i--; )
1237 downheap ((WT *)periodics, periodiccnt, i);
1238}
1239#endif
1240
1241int inline_size
860time_update_monotonic (EV_P) 1242time_update_monotonic (EV_P)
861{ 1243{
862 mn_now = get_clock (); 1244 mn_now = get_clock ();
863 1245
864 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1246 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
865 { 1247 {
866 rt_now = rtmn_diff + mn_now; 1248 ev_rt_now = rtmn_diff + mn_now;
867 return 0; 1249 return 0;
868 } 1250 }
869 else 1251 else
870 { 1252 {
871 now_floor = mn_now; 1253 now_floor = mn_now;
872 rt_now = ev_time (); 1254 ev_rt_now = ev_time ();
873 return 1; 1255 return 1;
874 } 1256 }
875} 1257}
876 1258
877static void 1259void inline_size
878time_update (EV_P) 1260time_update (EV_P)
879{ 1261{
880 int i; 1262 int i;
881 1263
882#if EV_USE_MONOTONIC 1264#if EV_USE_MONOTONIC
884 { 1266 {
885 if (time_update_monotonic (EV_A)) 1267 if (time_update_monotonic (EV_A))
886 { 1268 {
887 ev_tstamp odiff = rtmn_diff; 1269 ev_tstamp odiff = rtmn_diff;
888 1270
889 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1271 /* loop a few times, before making important decisions.
1272 * on the choice of "4": one iteration isn't enough,
1273 * in case we get preempted during the calls to
1274 * ev_time and get_clock. a second call is almost guaranteed
1275 * to succeed in that case, though. and looping a few more times
1276 * doesn't hurt either as we only do this on time-jumps or
1277 * in the unlikely event of having been preempted here.
1278 */
1279 for (i = 4; --i; )
890 { 1280 {
891 rtmn_diff = rt_now - mn_now; 1281 rtmn_diff = ev_rt_now - mn_now;
892 1282
893 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1283 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
894 return; /* all is well */ 1284 return; /* all is well */
895 1285
896 rt_now = ev_time (); 1286 ev_rt_now = ev_time ();
897 mn_now = get_clock (); 1287 mn_now = get_clock ();
898 now_floor = mn_now; 1288 now_floor = mn_now;
899 } 1289 }
900 1290
1291# if EV_PERIODIC_ENABLE
901 periodics_reschedule (EV_A); 1292 periodics_reschedule (EV_A);
1293# endif
902 /* no timer adjustment, as the monotonic clock doesn't jump */ 1294 /* no timer adjustment, as the monotonic clock doesn't jump */
903 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1295 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
904 } 1296 }
905 } 1297 }
906 else 1298 else
907#endif 1299#endif
908 { 1300 {
909 rt_now = ev_time (); 1301 ev_rt_now = ev_time ();
910 1302
911 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1303 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
912 { 1304 {
1305#if EV_PERIODIC_ENABLE
913 periodics_reschedule (EV_A); 1306 periodics_reschedule (EV_A);
1307#endif
914 1308
915 /* adjust timers. this is easy, as the offset is the same for all */ 1309 /* adjust timers. this is easy, as the offset is the same for all of them */
916 for (i = 0; i < timercnt; ++i) 1310 for (i = 0; i < timercnt; ++i)
917 timers [i]->at += rt_now - mn_now; 1311 ((WT)timers [i])->at += ev_rt_now - mn_now;
918 } 1312 }
919 1313
920 mn_now = rt_now; 1314 mn_now = ev_rt_now;
921 } 1315 }
922} 1316}
923 1317
924void 1318void
925ev_ref (EV_P) 1319ev_ref (EV_P)
936static int loop_done; 1330static int loop_done;
937 1331
938void 1332void
939ev_loop (EV_P_ int flags) 1333ev_loop (EV_P_ int flags)
940{ 1334{
941 double block;
942 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1335 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1336 ? EVUNLOOP_ONE
1337 : EVUNLOOP_CANCEL;
943 1338
944 do 1339 while (activecnt)
945 { 1340 {
1341#if EV_FORK_ENABLE
1342 /* we might have forked, so queue fork handlers */
1343 if (expect_false (postfork))
1344 if (forkcnt)
1345 {
1346 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1347 call_pending (EV_A);
1348 }
1349#endif
1350
946 /* queue check watchers (and execute them) */ 1351 /* queue check watchers (and execute them) */
947 if (expect_false (preparecnt)) 1352 if (expect_false (preparecnt))
948 { 1353 {
949 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1354 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
950 call_pending (EV_A); 1355 call_pending (EV_A);
951 } 1356 }
952 1357
1358 /* we might have forked, so reify kernel state if necessary */
1359 if (expect_false (postfork))
1360 loop_fork (EV_A);
1361
953 /* update fd-related kernel structures */ 1362 /* update fd-related kernel structures */
954 fd_reify (EV_A); 1363 fd_reify (EV_A);
955 1364
956 /* calculate blocking time */ 1365 /* calculate blocking time */
1366 {
1367 ev_tstamp block;
957 1368
958 /* we only need this for !monotonic clockor timers, but as we basically 1369 if (flags & EVLOOP_NONBLOCK || idlecnt)
959 always have timers, we just calculate it always */ 1370 block = 0.; /* do not block at all */
1371 else
1372 {
1373 /* update time to cancel out callback processing overhead */
960#if EV_USE_MONOTONIC 1374#if EV_USE_MONOTONIC
961 if (expect_true (have_monotonic)) 1375 if (expect_true (have_monotonic))
962 time_update_monotonic (EV_A); 1376 time_update_monotonic (EV_A);
963 else 1377 else
964#endif 1378#endif
965 { 1379 {
966 rt_now = ev_time (); 1380 ev_rt_now = ev_time ();
967 mn_now = rt_now; 1381 mn_now = ev_rt_now;
968 } 1382 }
969 1383
970 if (flags & EVLOOP_NONBLOCK || idlecnt)
971 block = 0.;
972 else
973 {
974 block = MAX_BLOCKTIME; 1384 block = MAX_BLOCKTIME;
975 1385
976 if (timercnt) 1386 if (timercnt)
977 { 1387 {
978 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1388 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
979 if (block > to) block = to; 1389 if (block > to) block = to;
980 } 1390 }
981 1391
1392#if EV_PERIODIC_ENABLE
982 if (periodiccnt) 1393 if (periodiccnt)
983 { 1394 {
984 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1395 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
985 if (block > to) block = to; 1396 if (block > to) block = to;
986 } 1397 }
1398#endif
987 1399
988 if (block < 0.) block = 0.; 1400 if (expect_false (block < 0.)) block = 0.;
989 } 1401 }
990 1402
991 method_poll (EV_A_ block); 1403 backend_poll (EV_A_ block);
1404 }
992 1405
993 /* update rt_now, do magic */ 1406 /* update ev_rt_now, do magic */
994 time_update (EV_A); 1407 time_update (EV_A);
995 1408
996 /* queue pending timers and reschedule them */ 1409 /* queue pending timers and reschedule them */
997 timers_reify (EV_A); /* relative timers called last */ 1410 timers_reify (EV_A); /* relative timers called last */
1411#if EV_PERIODIC_ENABLE
998 periodics_reify (EV_A); /* absolute timers called first */ 1412 periodics_reify (EV_A); /* absolute timers called first */
1413#endif
999 1414
1000 /* queue idle watchers unless io or timers are pending */ 1415 /* queue idle watchers unless other events are pending */
1001 if (!pendingcnt) 1416 if (idlecnt && !any_pending (EV_A))
1002 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1417 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1003 1418
1004 /* queue check watchers, to be executed first */ 1419 /* queue check watchers, to be executed first */
1005 if (checkcnt) 1420 if (expect_false (checkcnt))
1006 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1421 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1007 1422
1008 call_pending (EV_A); 1423 call_pending (EV_A);
1009 }
1010 while (activecnt && !loop_done);
1011 1424
1012 if (loop_done != 2) 1425 if (expect_false (loop_done))
1013 loop_done = 0; 1426 break;
1427 }
1428
1429 if (loop_done == EVUNLOOP_ONE)
1430 loop_done = EVUNLOOP_CANCEL;
1014} 1431}
1015 1432
1016void 1433void
1017ev_unloop (EV_P_ int how) 1434ev_unloop (EV_P_ int how)
1018{ 1435{
1019 loop_done = how; 1436 loop_done = how;
1020} 1437}
1021 1438
1022/*****************************************************************************/ 1439/*****************************************************************************/
1023 1440
1024inline void 1441void inline_size
1025wlist_add (WL *head, WL elem) 1442wlist_add (WL *head, WL elem)
1026{ 1443{
1027 elem->next = *head; 1444 elem->next = *head;
1028 *head = elem; 1445 *head = elem;
1029} 1446}
1030 1447
1031inline void 1448void inline_size
1032wlist_del (WL *head, WL elem) 1449wlist_del (WL *head, WL elem)
1033{ 1450{
1034 while (*head) 1451 while (*head)
1035 { 1452 {
1036 if (*head == elem) 1453 if (*head == elem)
1041 1458
1042 head = &(*head)->next; 1459 head = &(*head)->next;
1043 } 1460 }
1044} 1461}
1045 1462
1046inline void 1463void inline_speed
1047ev_clear_pending (EV_P_ W w) 1464ev_clear_pending (EV_P_ W w)
1048{ 1465{
1049 if (w->pending) 1466 if (w->pending)
1050 { 1467 {
1051 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1468 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1052 w->pending = 0; 1469 w->pending = 0;
1053 } 1470 }
1054} 1471}
1055 1472
1056inline void 1473void inline_speed
1057ev_start (EV_P_ W w, int active) 1474ev_start (EV_P_ W w, int active)
1058{ 1475{
1059 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1476 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1060 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 1477 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1061 1478
1062 w->active = active; 1479 w->active = active;
1063 ev_ref (EV_A); 1480 ev_ref (EV_A);
1064} 1481}
1065 1482
1066inline void 1483void inline_size
1067ev_stop (EV_P_ W w) 1484ev_stop (EV_P_ W w)
1068{ 1485{
1069 ev_unref (EV_A); 1486 ev_unref (EV_A);
1070 w->active = 0; 1487 w->active = 0;
1071} 1488}
1072 1489
1073/*****************************************************************************/ 1490/*****************************************************************************/
1074 1491
1075void 1492void
1076ev_io_start (EV_P_ struct ev_io *w) 1493ev_io_start (EV_P_ ev_io *w)
1077{ 1494{
1078 int fd = w->fd; 1495 int fd = w->fd;
1079 1496
1080 if (ev_is_active (w)) 1497 if (expect_false (ev_is_active (w)))
1081 return; 1498 return;
1082 1499
1083 assert (("ev_io_start called with negative fd", fd >= 0)); 1500 assert (("ev_io_start called with negative fd", fd >= 0));
1084 1501
1085 ev_start (EV_A_ (W)w, 1); 1502 ev_start (EV_A_ (W)w, 1);
1086 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1503 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1087 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1504 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1088 1505
1089 fd_change (EV_A_ fd); 1506 fd_change (EV_A_ fd);
1090} 1507}
1091 1508
1092void 1509void
1093ev_io_stop (EV_P_ struct ev_io *w) 1510ev_io_stop (EV_P_ ev_io *w)
1094{ 1511{
1095 ev_clear_pending (EV_A_ (W)w); 1512 ev_clear_pending (EV_A_ (W)w);
1096 if (!ev_is_active (w)) 1513 if (expect_false (!ev_is_active (w)))
1097 return; 1514 return;
1515
1516 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1098 1517
1099 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1518 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1100 ev_stop (EV_A_ (W)w); 1519 ev_stop (EV_A_ (W)w);
1101 1520
1102 fd_change (EV_A_ w->fd); 1521 fd_change (EV_A_ w->fd);
1103} 1522}
1104 1523
1105void 1524void
1106ev_timer_start (EV_P_ struct ev_timer *w) 1525ev_timer_start (EV_P_ ev_timer *w)
1107{ 1526{
1108 if (ev_is_active (w)) 1527 if (expect_false (ev_is_active (w)))
1109 return; 1528 return;
1110 1529
1111 w->at += mn_now; 1530 ((WT)w)->at += mn_now;
1112 1531
1113 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1532 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1114 1533
1115 ev_start (EV_A_ (W)w, ++timercnt); 1534 ev_start (EV_A_ (W)w, ++timercnt);
1116 array_needsize (timers, timermax, timercnt, ); 1535 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1117 timers [timercnt - 1] = w; 1536 timers [timercnt - 1] = w;
1118 upheap ((WT *)timers, timercnt - 1); 1537 upheap ((WT *)timers, timercnt - 1);
1119}
1120 1538
1539 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1540}
1541
1121void 1542void
1122ev_timer_stop (EV_P_ struct ev_timer *w) 1543ev_timer_stop (EV_P_ ev_timer *w)
1123{ 1544{
1124 ev_clear_pending (EV_A_ (W)w); 1545 ev_clear_pending (EV_A_ (W)w);
1125 if (!ev_is_active (w)) 1546 if (expect_false (!ev_is_active (w)))
1126 return; 1547 return;
1127 1548
1128 if (w->active < timercnt--) 1549 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1550
1551 {
1552 int active = ((W)w)->active;
1553
1554 if (expect_true (--active < --timercnt))
1129 { 1555 {
1130 timers [w->active - 1] = timers [timercnt]; 1556 timers [active] = timers [timercnt];
1131 downheap ((WT *)timers, timercnt, w->active - 1); 1557 adjustheap ((WT *)timers, timercnt, active);
1132 } 1558 }
1559 }
1133 1560
1134 w->at = w->repeat; 1561 ((WT)w)->at -= mn_now;
1135 1562
1136 ev_stop (EV_A_ (W)w); 1563 ev_stop (EV_A_ (W)w);
1137} 1564}
1138 1565
1139void 1566void
1140ev_timer_again (EV_P_ struct ev_timer *w) 1567ev_timer_again (EV_P_ ev_timer *w)
1141{ 1568{
1142 if (ev_is_active (w)) 1569 if (ev_is_active (w))
1143 { 1570 {
1144 if (w->repeat) 1571 if (w->repeat)
1145 { 1572 {
1146 w->at = mn_now + w->repeat; 1573 ((WT)w)->at = mn_now + w->repeat;
1147 downheap ((WT *)timers, timercnt, w->active - 1); 1574 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1148 } 1575 }
1149 else 1576 else
1150 ev_timer_stop (EV_A_ w); 1577 ev_timer_stop (EV_A_ w);
1151 } 1578 }
1152 else if (w->repeat) 1579 else if (w->repeat)
1580 {
1581 w->at = w->repeat;
1153 ev_timer_start (EV_A_ w); 1582 ev_timer_start (EV_A_ w);
1583 }
1154} 1584}
1155 1585
1586#if EV_PERIODIC_ENABLE
1156void 1587void
1157ev_periodic_start (EV_P_ struct ev_periodic *w) 1588ev_periodic_start (EV_P_ ev_periodic *w)
1158{ 1589{
1159 if (ev_is_active (w)) 1590 if (expect_false (ev_is_active (w)))
1160 return; 1591 return;
1161 1592
1593 if (w->reschedule_cb)
1594 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1595 else if (w->interval)
1596 {
1162 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1597 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1163
1164 /* this formula differs from the one in periodic_reify because we do not always round up */ 1598 /* this formula differs from the one in periodic_reify because we do not always round up */
1165 if (w->interval)
1166 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1599 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1600 }
1167 1601
1168 ev_start (EV_A_ (W)w, ++periodiccnt); 1602 ev_start (EV_A_ (W)w, ++periodiccnt);
1169 array_needsize (periodics, periodicmax, periodiccnt, ); 1603 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1170 periodics [periodiccnt - 1] = w; 1604 periodics [periodiccnt - 1] = w;
1171 upheap ((WT *)periodics, periodiccnt - 1); 1605 upheap ((WT *)periodics, periodiccnt - 1);
1172}
1173 1606
1607 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1608}
1609
1174void 1610void
1175ev_periodic_stop (EV_P_ struct ev_periodic *w) 1611ev_periodic_stop (EV_P_ ev_periodic *w)
1176{ 1612{
1177 ev_clear_pending (EV_A_ (W)w); 1613 ev_clear_pending (EV_A_ (W)w);
1178 if (!ev_is_active (w)) 1614 if (expect_false (!ev_is_active (w)))
1179 return; 1615 return;
1180 1616
1181 if (w->active < periodiccnt--) 1617 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1618
1619 {
1620 int active = ((W)w)->active;
1621
1622 if (expect_true (--active < --periodiccnt))
1182 { 1623 {
1183 periodics [w->active - 1] = periodics [periodiccnt]; 1624 periodics [active] = periodics [periodiccnt];
1184 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1625 adjustheap ((WT *)periodics, periodiccnt, active);
1185 } 1626 }
1627 }
1186 1628
1187 ev_stop (EV_A_ (W)w); 1629 ev_stop (EV_A_ (W)w);
1188} 1630}
1189 1631
1190void 1632void
1191ev_idle_start (EV_P_ struct ev_idle *w) 1633ev_periodic_again (EV_P_ ev_periodic *w)
1192{ 1634{
1193 if (ev_is_active (w)) 1635 /* TODO: use adjustheap and recalculation */
1194 return;
1195
1196 ev_start (EV_A_ (W)w, ++idlecnt);
1197 array_needsize (idles, idlemax, idlecnt, );
1198 idles [idlecnt - 1] = w;
1199}
1200
1201void
1202ev_idle_stop (EV_P_ struct ev_idle *w)
1203{
1204 ev_clear_pending (EV_A_ (W)w);
1205 if (ev_is_active (w))
1206 return;
1207
1208 idles [w->active - 1] = idles [--idlecnt];
1209 ev_stop (EV_A_ (W)w); 1636 ev_periodic_stop (EV_A_ w);
1637 ev_periodic_start (EV_A_ w);
1210} 1638}
1211 1639#endif
1212void
1213ev_prepare_start (EV_P_ struct ev_prepare *w)
1214{
1215 if (ev_is_active (w))
1216 return;
1217
1218 ev_start (EV_A_ (W)w, ++preparecnt);
1219 array_needsize (prepares, preparemax, preparecnt, );
1220 prepares [preparecnt - 1] = w;
1221}
1222
1223void
1224ev_prepare_stop (EV_P_ struct ev_prepare *w)
1225{
1226 ev_clear_pending (EV_A_ (W)w);
1227 if (ev_is_active (w))
1228 return;
1229
1230 prepares [w->active - 1] = prepares [--preparecnt];
1231 ev_stop (EV_A_ (W)w);
1232}
1233
1234void
1235ev_check_start (EV_P_ struct ev_check *w)
1236{
1237 if (ev_is_active (w))
1238 return;
1239
1240 ev_start (EV_A_ (W)w, ++checkcnt);
1241 array_needsize (checks, checkmax, checkcnt, );
1242 checks [checkcnt - 1] = w;
1243}
1244
1245void
1246ev_check_stop (EV_P_ struct ev_check *w)
1247{
1248 ev_clear_pending (EV_A_ (W)w);
1249 if (ev_is_active (w))
1250 return;
1251
1252 checks [w->active - 1] = checks [--checkcnt];
1253 ev_stop (EV_A_ (W)w);
1254}
1255 1640
1256#ifndef SA_RESTART 1641#ifndef SA_RESTART
1257# define SA_RESTART 0 1642# define SA_RESTART 0
1258#endif 1643#endif
1259 1644
1260void 1645void
1261ev_signal_start (EV_P_ struct ev_signal *w) 1646ev_signal_start (EV_P_ ev_signal *w)
1262{ 1647{
1263#if EV_MULTIPLICITY 1648#if EV_MULTIPLICITY
1264 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1649 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1265#endif 1650#endif
1266 if (ev_is_active (w)) 1651 if (expect_false (ev_is_active (w)))
1267 return; 1652 return;
1268 1653
1269 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1654 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1270 1655
1271 ev_start (EV_A_ (W)w, 1); 1656 ev_start (EV_A_ (W)w, 1);
1272 array_needsize (signals, signalmax, w->signum, signals_init); 1657 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1273 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1658 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1274 1659
1275 if (!w->next) 1660 if (!((WL)w)->next)
1276 { 1661 {
1662#if _WIN32
1663 signal (w->signum, sighandler);
1664#else
1277 struct sigaction sa; 1665 struct sigaction sa;
1278 sa.sa_handler = sighandler; 1666 sa.sa_handler = sighandler;
1279 sigfillset (&sa.sa_mask); 1667 sigfillset (&sa.sa_mask);
1280 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1668 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1281 sigaction (w->signum, &sa, 0); 1669 sigaction (w->signum, &sa, 0);
1670#endif
1282 } 1671 }
1283} 1672}
1284 1673
1285void 1674void
1286ev_signal_stop (EV_P_ struct ev_signal *w) 1675ev_signal_stop (EV_P_ ev_signal *w)
1287{ 1676{
1288 ev_clear_pending (EV_A_ (W)w); 1677 ev_clear_pending (EV_A_ (W)w);
1289 if (!ev_is_active (w)) 1678 if (expect_false (!ev_is_active (w)))
1290 return; 1679 return;
1291 1680
1292 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1681 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1293 ev_stop (EV_A_ (W)w); 1682 ev_stop (EV_A_ (W)w);
1294 1683
1295 if (!signals [w->signum - 1].head) 1684 if (!signals [w->signum - 1].head)
1296 signal (w->signum, SIG_DFL); 1685 signal (w->signum, SIG_DFL);
1297} 1686}
1298 1687
1299void 1688void
1300ev_child_start (EV_P_ struct ev_child *w) 1689ev_child_start (EV_P_ ev_child *w)
1301{ 1690{
1302#if EV_MULTIPLICITY 1691#if EV_MULTIPLICITY
1303 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1692 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1304#endif 1693#endif
1305 if (ev_is_active (w)) 1694 if (expect_false (ev_is_active (w)))
1306 return; 1695 return;
1307 1696
1308 ev_start (EV_A_ (W)w, 1); 1697 ev_start (EV_A_ (W)w, 1);
1309 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1698 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1310} 1699}
1311 1700
1312void 1701void
1313ev_child_stop (EV_P_ struct ev_child *w) 1702ev_child_stop (EV_P_ ev_child *w)
1314{ 1703{
1315 ev_clear_pending (EV_A_ (W)w); 1704 ev_clear_pending (EV_A_ (W)w);
1316 if (ev_is_active (w)) 1705 if (expect_false (!ev_is_active (w)))
1317 return; 1706 return;
1318 1707
1319 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1708 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1320 ev_stop (EV_A_ (W)w); 1709 ev_stop (EV_A_ (W)w);
1321} 1710}
1322 1711
1712#if EV_STAT_ENABLE
1713
1714# ifdef _WIN32
1715# undef lstat
1716# define lstat(a,b) _stati64 (a,b)
1717# endif
1718
1719#define DEF_STAT_INTERVAL 5.0074891
1720#define MIN_STAT_INTERVAL 0.1074891
1721
1722static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1723
1724#if EV_USE_INOTIFY
1725# define EV_INOTIFY_BUFSIZE 8192
1726
1727static void noinline
1728infy_add (EV_P_ ev_stat *w)
1729{
1730 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1731
1732 if (w->wd < 0)
1733 {
1734 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1735
1736 /* monitor some parent directory for speedup hints */
1737 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1738 {
1739 char path [4096];
1740 strcpy (path, w->path);
1741
1742 do
1743 {
1744 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1745 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1746
1747 char *pend = strrchr (path, '/');
1748
1749 if (!pend)
1750 break; /* whoops, no '/', complain to your admin */
1751
1752 *pend = 0;
1753 w->wd = inotify_add_watch (fs_fd, path, mask);
1754 }
1755 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1756 }
1757 }
1758 else
1759 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1760
1761 if (w->wd >= 0)
1762 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1763}
1764
1765static void noinline
1766infy_del (EV_P_ ev_stat *w)
1767{
1768 int slot;
1769 int wd = w->wd;
1770
1771 if (wd < 0)
1772 return;
1773
1774 w->wd = -2;
1775 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1776 wlist_del (&fs_hash [slot].head, (WL)w);
1777
1778 /* remove this watcher, if others are watching it, they will rearm */
1779 inotify_rm_watch (fs_fd, wd);
1780}
1781
1782static void noinline
1783infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1784{
1785 if (slot < 0)
1786 /* overflow, need to check for all hahs slots */
1787 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1788 infy_wd (EV_A_ slot, wd, ev);
1789 else
1790 {
1791 WL w_;
1792
1793 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1794 {
1795 ev_stat *w = (ev_stat *)w_;
1796 w_ = w_->next; /* lets us remove this watcher and all before it */
1797
1798 if (w->wd == wd || wd == -1)
1799 {
1800 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1801 {
1802 w->wd = -1;
1803 infy_add (EV_A_ w); /* re-add, no matter what */
1804 }
1805
1806 stat_timer_cb (EV_A_ &w->timer, 0);
1807 }
1808 }
1809 }
1810}
1811
1812static void
1813infy_cb (EV_P_ ev_io *w, int revents)
1814{
1815 char buf [EV_INOTIFY_BUFSIZE];
1816 struct inotify_event *ev = (struct inotify_event *)buf;
1817 int ofs;
1818 int len = read (fs_fd, buf, sizeof (buf));
1819
1820 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1821 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1822}
1823
1824void inline_size
1825infy_init (EV_P)
1826{
1827 if (fs_fd != -2)
1828 return;
1829
1830 fs_fd = inotify_init ();
1831
1832 if (fs_fd >= 0)
1833 {
1834 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1835 ev_set_priority (&fs_w, EV_MAXPRI);
1836 ev_io_start (EV_A_ &fs_w);
1837 }
1838}
1839
1840void inline_size
1841infy_fork (EV_P)
1842{
1843 int slot;
1844
1845 if (fs_fd < 0)
1846 return;
1847
1848 close (fs_fd);
1849 fs_fd = inotify_init ();
1850
1851 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1852 {
1853 WL w_ = fs_hash [slot].head;
1854 fs_hash [slot].head = 0;
1855
1856 while (w_)
1857 {
1858 ev_stat *w = (ev_stat *)w_;
1859 w_ = w_->next; /* lets us add this watcher */
1860
1861 w->wd = -1;
1862
1863 if (fs_fd >= 0)
1864 infy_add (EV_A_ w); /* re-add, no matter what */
1865 else
1866 ev_timer_start (EV_A_ &w->timer);
1867 }
1868
1869 }
1870}
1871
1872#endif
1873
1874void
1875ev_stat_stat (EV_P_ ev_stat *w)
1876{
1877 if (lstat (w->path, &w->attr) < 0)
1878 w->attr.st_nlink = 0;
1879 else if (!w->attr.st_nlink)
1880 w->attr.st_nlink = 1;
1881}
1882
1883static void noinline
1884stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1885{
1886 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1887
1888 /* we copy this here each the time so that */
1889 /* prev has the old value when the callback gets invoked */
1890 w->prev = w->attr;
1891 ev_stat_stat (EV_A_ w);
1892
1893 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1894 if (
1895 w->prev.st_dev != w->attr.st_dev
1896 || w->prev.st_ino != w->attr.st_ino
1897 || w->prev.st_mode != w->attr.st_mode
1898 || w->prev.st_nlink != w->attr.st_nlink
1899 || w->prev.st_uid != w->attr.st_uid
1900 || w->prev.st_gid != w->attr.st_gid
1901 || w->prev.st_rdev != w->attr.st_rdev
1902 || w->prev.st_size != w->attr.st_size
1903 || w->prev.st_atime != w->attr.st_atime
1904 || w->prev.st_mtime != w->attr.st_mtime
1905 || w->prev.st_ctime != w->attr.st_ctime
1906 ) {
1907 #if EV_USE_INOTIFY
1908 infy_del (EV_A_ w);
1909 infy_add (EV_A_ w);
1910 ev_stat_stat (EV_A_ w); /* avoid race... */
1911 #endif
1912
1913 ev_feed_event (EV_A_ w, EV_STAT);
1914 }
1915}
1916
1917void
1918ev_stat_start (EV_P_ ev_stat *w)
1919{
1920 if (expect_false (ev_is_active (w)))
1921 return;
1922
1923 /* since we use memcmp, we need to clear any padding data etc. */
1924 memset (&w->prev, 0, sizeof (ev_statdata));
1925 memset (&w->attr, 0, sizeof (ev_statdata));
1926
1927 ev_stat_stat (EV_A_ w);
1928
1929 if (w->interval < MIN_STAT_INTERVAL)
1930 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1931
1932 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1933 ev_set_priority (&w->timer, ev_priority (w));
1934
1935#if EV_USE_INOTIFY
1936 infy_init (EV_A);
1937
1938 if (fs_fd >= 0)
1939 infy_add (EV_A_ w);
1940 else
1941#endif
1942 ev_timer_start (EV_A_ &w->timer);
1943
1944 ev_start (EV_A_ (W)w, 1);
1945}
1946
1947void
1948ev_stat_stop (EV_P_ ev_stat *w)
1949{
1950 ev_clear_pending (EV_A_ (W)w);
1951 if (expect_false (!ev_is_active (w)))
1952 return;
1953
1954#if EV_USE_INOTIFY
1955 infy_del (EV_A_ w);
1956#endif
1957 ev_timer_stop (EV_A_ &w->timer);
1958
1959 ev_stop (EV_A_ (W)w);
1960}
1961#endif
1962
1963void
1964ev_idle_start (EV_P_ ev_idle *w)
1965{
1966 if (expect_false (ev_is_active (w)))
1967 return;
1968
1969 ev_start (EV_A_ (W)w, ++idlecnt);
1970 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1971 idles [idlecnt - 1] = w;
1972}
1973
1974void
1975ev_idle_stop (EV_P_ ev_idle *w)
1976{
1977 ev_clear_pending (EV_A_ (W)w);
1978 if (expect_false (!ev_is_active (w)))
1979 return;
1980
1981 {
1982 int active = ((W)w)->active;
1983 idles [active - 1] = idles [--idlecnt];
1984 ((W)idles [active - 1])->active = active;
1985 }
1986
1987 ev_stop (EV_A_ (W)w);
1988}
1989
1990void
1991ev_prepare_start (EV_P_ ev_prepare *w)
1992{
1993 if (expect_false (ev_is_active (w)))
1994 return;
1995
1996 ev_start (EV_A_ (W)w, ++preparecnt);
1997 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1998 prepares [preparecnt - 1] = w;
1999}
2000
2001void
2002ev_prepare_stop (EV_P_ ev_prepare *w)
2003{
2004 ev_clear_pending (EV_A_ (W)w);
2005 if (expect_false (!ev_is_active (w)))
2006 return;
2007
2008 {
2009 int active = ((W)w)->active;
2010 prepares [active - 1] = prepares [--preparecnt];
2011 ((W)prepares [active - 1])->active = active;
2012 }
2013
2014 ev_stop (EV_A_ (W)w);
2015}
2016
2017void
2018ev_check_start (EV_P_ ev_check *w)
2019{
2020 if (expect_false (ev_is_active (w)))
2021 return;
2022
2023 ev_start (EV_A_ (W)w, ++checkcnt);
2024 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2025 checks [checkcnt - 1] = w;
2026}
2027
2028void
2029ev_check_stop (EV_P_ ev_check *w)
2030{
2031 ev_clear_pending (EV_A_ (W)w);
2032 if (expect_false (!ev_is_active (w)))
2033 return;
2034
2035 {
2036 int active = ((W)w)->active;
2037 checks [active - 1] = checks [--checkcnt];
2038 ((W)checks [active - 1])->active = active;
2039 }
2040
2041 ev_stop (EV_A_ (W)w);
2042}
2043
2044#if EV_EMBED_ENABLE
2045void noinline
2046ev_embed_sweep (EV_P_ ev_embed *w)
2047{
2048 ev_loop (w->loop, EVLOOP_NONBLOCK);
2049}
2050
2051static void
2052embed_cb (EV_P_ ev_io *io, int revents)
2053{
2054 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2055
2056 if (ev_cb (w))
2057 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2058 else
2059 ev_embed_sweep (loop, w);
2060}
2061
2062void
2063ev_embed_start (EV_P_ ev_embed *w)
2064{
2065 if (expect_false (ev_is_active (w)))
2066 return;
2067
2068 {
2069 struct ev_loop *loop = w->loop;
2070 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2071 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2072 }
2073
2074 ev_set_priority (&w->io, ev_priority (w));
2075 ev_io_start (EV_A_ &w->io);
2076
2077 ev_start (EV_A_ (W)w, 1);
2078}
2079
2080void
2081ev_embed_stop (EV_P_ ev_embed *w)
2082{
2083 ev_clear_pending (EV_A_ (W)w);
2084 if (expect_false (!ev_is_active (w)))
2085 return;
2086
2087 ev_io_stop (EV_A_ &w->io);
2088
2089 ev_stop (EV_A_ (W)w);
2090}
2091#endif
2092
2093#if EV_FORK_ENABLE
2094void
2095ev_fork_start (EV_P_ ev_fork *w)
2096{
2097 if (expect_false (ev_is_active (w)))
2098 return;
2099
2100 ev_start (EV_A_ (W)w, ++forkcnt);
2101 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2102 forks [forkcnt - 1] = w;
2103}
2104
2105void
2106ev_fork_stop (EV_P_ ev_fork *w)
2107{
2108 ev_clear_pending (EV_A_ (W)w);
2109 if (expect_false (!ev_is_active (w)))
2110 return;
2111
2112 {
2113 int active = ((W)w)->active;
2114 forks [active - 1] = forks [--forkcnt];
2115 ((W)forks [active - 1])->active = active;
2116 }
2117
2118 ev_stop (EV_A_ (W)w);
2119}
2120#endif
2121
1323/*****************************************************************************/ 2122/*****************************************************************************/
1324 2123
1325struct ev_once 2124struct ev_once
1326{ 2125{
1327 struct ev_io io; 2126 ev_io io;
1328 struct ev_timer to; 2127 ev_timer to;
1329 void (*cb)(int revents, void *arg); 2128 void (*cb)(int revents, void *arg);
1330 void *arg; 2129 void *arg;
1331}; 2130};
1332 2131
1333static void 2132static void
1336 void (*cb)(int revents, void *arg) = once->cb; 2135 void (*cb)(int revents, void *arg) = once->cb;
1337 void *arg = once->arg; 2136 void *arg = once->arg;
1338 2137
1339 ev_io_stop (EV_A_ &once->io); 2138 ev_io_stop (EV_A_ &once->io);
1340 ev_timer_stop (EV_A_ &once->to); 2139 ev_timer_stop (EV_A_ &once->to);
1341 free (once); 2140 ev_free (once);
1342 2141
1343 cb (revents, arg); 2142 cb (revents, arg);
1344} 2143}
1345 2144
1346static void 2145static void
1347once_cb_io (EV_P_ struct ev_io *w, int revents) 2146once_cb_io (EV_P_ ev_io *w, int revents)
1348{ 2147{
1349 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 2148 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1350} 2149}
1351 2150
1352static void 2151static void
1353once_cb_to (EV_P_ struct ev_timer *w, int revents) 2152once_cb_to (EV_P_ ev_timer *w, int revents)
1354{ 2153{
1355 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 2154 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1356} 2155}
1357 2156
1358void 2157void
1359ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 2158ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1360{ 2159{
1361 struct ev_once *once = malloc (sizeof (struct ev_once)); 2160 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1362 2161
1363 if (!once) 2162 if (expect_false (!once))
2163 {
1364 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 2164 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1365 else 2165 return;
1366 { 2166 }
2167
1367 once->cb = cb; 2168 once->cb = cb;
1368 once->arg = arg; 2169 once->arg = arg;
1369 2170
1370 ev_watcher_init (&once->io, once_cb_io); 2171 ev_init (&once->io, once_cb_io);
1371 if (fd >= 0) 2172 if (fd >= 0)
1372 { 2173 {
1373 ev_io_set (&once->io, fd, events); 2174 ev_io_set (&once->io, fd, events);
1374 ev_io_start (EV_A_ &once->io); 2175 ev_io_start (EV_A_ &once->io);
1375 } 2176 }
1376 2177
1377 ev_watcher_init (&once->to, once_cb_to); 2178 ev_init (&once->to, once_cb_to);
1378 if (timeout >= 0.) 2179 if (timeout >= 0.)
1379 { 2180 {
1380 ev_timer_set (&once->to, timeout, 0.); 2181 ev_timer_set (&once->to, timeout, 0.);
1381 ev_timer_start (EV_A_ &once->to); 2182 ev_timer_start (EV_A_ &once->to);
1382 }
1383 } 2183 }
1384} 2184}
1385 2185
2186#ifdef __cplusplus
2187}
2188#endif
2189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines