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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines