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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines