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

Comparing libev/ev.c (file contents):
Revision 1.57 by root, Sun Nov 4 16:43:53 2007 UTC vs.
Revision 1.162 by root, Mon Dec 3 13:41:24 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
891unsigned int
892ev_loop_count (EV_P)
893{
894 return loop_count;
895}
896
897static void noinline
898loop_init (EV_P_ unsigned int flags)
899{
900 if (!backend)
566 { 901 {
567#if EV_USE_MONOTONIC 902#if EV_USE_MONOTONIC
568 { 903 {
569 struct timespec ts; 904 struct timespec ts;
570 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 905 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
571 have_monotonic = 1; 906 have_monotonic = 1;
572 } 907 }
573#endif 908#endif
574 909
575 rt_now = ev_time (); 910 ev_rt_now = ev_time ();
576 mn_now = get_clock (); 911 mn_now = get_clock ();
577 now_floor = mn_now; 912 now_floor = mn_now;
578 rtmn_diff = rt_now - mn_now; 913 rtmn_diff = ev_rt_now - mn_now;
579 914
580 if (methods == EVMETHOD_AUTO) 915 /* pid check not overridable via env */
581 if (!enable_secure () && getenv ("LIBEV_METHODS")) 916#ifndef _WIN32
917 if (flags & EVFLAG_FORKCHECK)
918 curpid = getpid ();
919#endif
920
921 if (!(flags & EVFLAG_NOENV)
922 && !enable_secure ()
923 && getenv ("LIBEV_FLAGS"))
582 methods = atoi (getenv ("LIBEV_METHODS")); 924 flags = atoi (getenv ("LIBEV_FLAGS"));
583 else
584 methods = EVMETHOD_ANY;
585 925
586 method = 0; 926 if (!(flags & 0x0000ffffUL))
927 flags |= ev_recommended_backends ();
928
929 backend = 0;
930 backend_fd = -1;
931#if EV_USE_INOTIFY
932 fs_fd = -2;
933#endif
934
935#if EV_USE_PORT
936 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
937#endif
587#if EV_USE_KQUEUE 938#if EV_USE_KQUEUE
588 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 939 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
589#endif 940#endif
590#if EV_USE_EPOLL 941#if EV_USE_EPOLL
591 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 942 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
592#endif 943#endif
593#if EV_USEV_POLL 944#if EV_USE_POLL
594 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 945 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
595#endif 946#endif
596#if EV_USE_SELECT 947#if EV_USE_SELECT
597 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 948 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
598#endif 949#endif
599 }
600}
601 950
602void 951 ev_init (&sigev, sigcb);
952 ev_set_priority (&sigev, EV_MAXPRI);
953 }
954}
955
956static void noinline
603loop_destroy (EV_P) 957loop_destroy (EV_P)
604{ 958{
959 int i;
960
961#if EV_USE_INOTIFY
962 if (fs_fd >= 0)
963 close (fs_fd);
964#endif
965
966 if (backend_fd >= 0)
967 close (backend_fd);
968
969#if EV_USE_PORT
970 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
971#endif
605#if EV_USE_KQUEUE 972#if EV_USE_KQUEUE
606 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 973 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
607#endif 974#endif
608#if EV_USE_EPOLL 975#if EV_USE_EPOLL
609 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 976 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
610#endif 977#endif
611#if EV_USEV_POLL 978#if EV_USE_POLL
612 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 979 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
613#endif 980#endif
614#if EV_USE_SELECT 981#if EV_USE_SELECT
615 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 982 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
616#endif 983#endif
617 984
618 method = 0; 985 for (i = NUMPRI; i--; )
619 /*TODO*/ 986 array_free (pending, [i]);
620}
621 987
622void 988 /* have to use the microsoft-never-gets-it-right macro */
989 array_free (fdchange, EMPTY0);
990 array_free (timer, EMPTY0);
991#if EV_PERIODIC_ENABLE
992 array_free (periodic, EMPTY0);
993#endif
994 array_free (idle, EMPTY0);
995 array_free (prepare, EMPTY0);
996 array_free (check, EMPTY0);
997
998 backend = 0;
999}
1000
1001void inline_size infy_fork (EV_P);
1002
1003void inline_size
623loop_fork (EV_P) 1004loop_fork (EV_P)
624{ 1005{
625 /*TODO*/ 1006#if EV_USE_PORT
1007 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1008#endif
1009#if EV_USE_KQUEUE
1010 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
1011#endif
626#if EV_USE_EPOLL 1012#if EV_USE_EPOLL
627 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1013 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
628#endif 1014#endif
629#if EV_USE_KQUEUE 1015#if EV_USE_INOTIFY
630 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 1016 infy_fork (EV_A);
631#endif 1017#endif
1018
1019 if (ev_is_active (&sigev))
1020 {
1021 /* default loop */
1022
1023 ev_ref (EV_A);
1024 ev_io_stop (EV_A_ &sigev);
1025 close (sigpipe [0]);
1026 close (sigpipe [1]);
1027
1028 while (pipe (sigpipe))
1029 syserr ("(libev) error creating pipe");
1030
1031 siginit (EV_A);
1032 }
1033
1034 postfork = 0;
632} 1035}
633 1036
634#if EV_MULTIPLICITY 1037#if EV_MULTIPLICITY
635struct ev_loop * 1038struct ev_loop *
636ev_loop_new (int methods) 1039ev_loop_new (unsigned int flags)
637{ 1040{
638 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 1041 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
639 1042
1043 memset (loop, 0, sizeof (struct ev_loop));
1044
640 loop_init (EV_A_ methods); 1045 loop_init (EV_A_ flags);
641 1046
642 if (ev_methods (EV_A)) 1047 if (ev_backend (EV_A))
643 return loop; 1048 return loop;
644 1049
645 return 0; 1050 return 0;
646} 1051}
647 1052
648void 1053void
649ev_loop_destroy (EV_P) 1054ev_loop_destroy (EV_P)
650{ 1055{
651 loop_destroy (EV_A); 1056 loop_destroy (EV_A);
652 free (loop); 1057 ev_free (loop);
653} 1058}
654 1059
655void 1060void
656ev_loop_fork (EV_P) 1061ev_loop_fork (EV_P)
657{ 1062{
658 loop_fork (EV_A); 1063 postfork = 1;
659} 1064}
660 1065
661#endif 1066#endif
662 1067
663#if EV_MULTIPLICITY 1068#if EV_MULTIPLICITY
664struct ev_loop default_loop_struct;
665static struct ev_loop *default_loop;
666
667struct ev_loop * 1069struct ev_loop *
1070ev_default_loop_init (unsigned int flags)
668#else 1071#else
669static int default_loop;
670
671int 1072int
1073ev_default_loop (unsigned int flags)
672#endif 1074#endif
673ev_default_loop (int methods)
674{ 1075{
675 if (sigpipe [0] == sigpipe [1]) 1076 if (sigpipe [0] == sigpipe [1])
676 if (pipe (sigpipe)) 1077 if (pipe (sigpipe))
677 return 0; 1078 return 0;
678 1079
679 if (!default_loop) 1080 if (!ev_default_loop_ptr)
680 { 1081 {
681#if EV_MULTIPLICITY 1082#if EV_MULTIPLICITY
682 struct ev_loop *loop = default_loop = &default_loop_struct; 1083 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
683#else 1084#else
684 default_loop = 1; 1085 ev_default_loop_ptr = 1;
685#endif 1086#endif
686 1087
687 loop_init (EV_A_ methods); 1088 loop_init (EV_A_ flags);
688 1089
689 if (ev_method (EV_A)) 1090 if (ev_backend (EV_A))
690 { 1091 {
691 ev_watcher_init (&sigev, sigcb);
692 ev_set_priority (&sigev, EV_MAXPRI);
693 siginit (EV_A); 1092 siginit (EV_A);
694 1093
695#ifndef WIN32 1094#ifndef _WIN32
696 ev_signal_init (&childev, childcb, SIGCHLD); 1095 ev_signal_init (&childev, childcb, SIGCHLD);
697 ev_set_priority (&childev, EV_MAXPRI); 1096 ev_set_priority (&childev, EV_MAXPRI);
698 ev_signal_start (EV_A_ &childev); 1097 ev_signal_start (EV_A_ &childev);
699 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1098 ev_unref (EV_A); /* child watcher should not keep loop alive */
700#endif 1099#endif
701 } 1100 }
702 else 1101 else
703 default_loop = 0; 1102 ev_default_loop_ptr = 0;
704 } 1103 }
705 1104
706 return default_loop; 1105 return ev_default_loop_ptr;
707} 1106}
708 1107
709void 1108void
710ev_default_destroy (void) 1109ev_default_destroy (void)
711{ 1110{
712#if EV_MULTIPLICITY 1111#if EV_MULTIPLICITY
713 struct ev_loop *loop = default_loop; 1112 struct ev_loop *loop = ev_default_loop_ptr;
714#endif 1113#endif
715 1114
1115#ifndef _WIN32
716 ev_ref (EV_A); /* child watcher */ 1116 ev_ref (EV_A); /* child watcher */
717 ev_signal_stop (EV_A_ &childev); 1117 ev_signal_stop (EV_A_ &childev);
1118#endif
718 1119
719 ev_ref (EV_A); /* signal watcher */ 1120 ev_ref (EV_A); /* signal watcher */
720 ev_io_stop (EV_A_ &sigev); 1121 ev_io_stop (EV_A_ &sigev);
721 1122
722 close (sigpipe [0]); sigpipe [0] = 0; 1123 close (sigpipe [0]); sigpipe [0] = 0;
… …
724 1125
725 loop_destroy (EV_A); 1126 loop_destroy (EV_A);
726} 1127}
727 1128
728void 1129void
729ev_default_fork (EV_P) 1130ev_default_fork (void)
730{ 1131{
731 loop_fork (EV_A); 1132#if EV_MULTIPLICITY
1133 struct ev_loop *loop = ev_default_loop_ptr;
1134#endif
732 1135
733 ev_io_stop (EV_A_ &sigev); 1136 if (backend)
734 close (sigpipe [0]); 1137 postfork = 1;
735 close (sigpipe [1]);
736 pipe (sigpipe);
737
738 ev_ref (EV_A); /* signal watcher */
739 siginit (EV_A);
740} 1138}
741 1139
742/*****************************************************************************/ 1140/*****************************************************************************/
743 1141
744static void 1142int inline_size
1143any_pending (EV_P)
1144{
1145 int pri;
1146
1147 for (pri = NUMPRI; pri--; )
1148 if (pendingcnt [pri])
1149 return 1;
1150
1151 return 0;
1152}
1153
1154void inline_speed
745call_pending (EV_P) 1155call_pending (EV_P)
746{ 1156{
747 int pri; 1157 int pri;
748 1158
749 for (pri = NUMPRI; pri--; ) 1159 for (pri = NUMPRI; pri--; )
750 while (pendingcnt [pri]) 1160 while (pendingcnt [pri])
751 { 1161 {
752 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1162 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
753 1163
754 if (p->w) 1164 if (expect_true (p->w))
755 { 1165 {
1166 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1167
756 p->w->pending = 0; 1168 p->w->pending = 0;
757 p->w->cb (EV_A_ p->w, p->events); 1169 EV_CB_INVOKE (p->w, p->events);
758 } 1170 }
759 } 1171 }
760} 1172}
761 1173
762static void 1174void inline_size
763timers_reify (EV_P) 1175timers_reify (EV_P)
764{ 1176{
765 while (timercnt && timers [0]->at <= mn_now) 1177 while (timercnt && ((WT)timers [0])->at <= mn_now)
766 { 1178 {
767 struct ev_timer *w = timers [0]; 1179 ev_timer *w = timers [0];
1180
1181 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
768 1182
769 /* first reschedule or stop timer */ 1183 /* first reschedule or stop timer */
770 if (w->repeat) 1184 if (w->repeat)
771 { 1185 {
772 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1186 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1187
773 w->at = mn_now + w->repeat; 1188 ((WT)w)->at += w->repeat;
1189 if (((WT)w)->at < mn_now)
1190 ((WT)w)->at = mn_now;
1191
774 downheap ((WT *)timers, timercnt, 0); 1192 downheap ((WT *)timers, timercnt, 0);
775 } 1193 }
776 else 1194 else
777 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1195 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
778 1196
779 event (EV_A_ (W)w, EV_TIMEOUT); 1197 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
780 } 1198 }
781} 1199}
782 1200
783static void 1201#if EV_PERIODIC_ENABLE
1202void inline_size
784periodics_reify (EV_P) 1203periodics_reify (EV_P)
785{ 1204{
786 while (periodiccnt && periodics [0]->at <= rt_now) 1205 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
787 { 1206 {
788 struct ev_periodic *w = periodics [0]; 1207 ev_periodic *w = periodics [0];
1208
1209 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
789 1210
790 /* first reschedule or stop timer */ 1211 /* first reschedule or stop timer */
791 if (w->interval) 1212 if (w->reschedule_cb)
792 { 1213 {
1214 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1215 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1216 downheap ((WT *)periodics, periodiccnt, 0);
1217 }
1218 else if (w->interval)
1219 {
793 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 1220 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
794 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 1221 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
795 downheap ((WT *)periodics, periodiccnt, 0); 1222 downheap ((WT *)periodics, periodiccnt, 0);
796 } 1223 }
797 else 1224 else
798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1225 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
799 1226
800 event (EV_A_ (W)w, EV_PERIODIC); 1227 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
801 } 1228 }
802} 1229}
803 1230
804static void 1231static void noinline
805periodics_reschedule (EV_P) 1232periodics_reschedule (EV_P)
806{ 1233{
807 int i; 1234 int i;
808 1235
809 /* adjust periodics after time jump */ 1236 /* adjust periodics after time jump */
810 for (i = 0; i < periodiccnt; ++i) 1237 for (i = 0; i < periodiccnt; ++i)
811 { 1238 {
812 struct ev_periodic *w = periodics [i]; 1239 ev_periodic *w = periodics [i];
813 1240
1241 if (w->reschedule_cb)
1242 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
814 if (w->interval) 1243 else if (w->interval)
815 {
816 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1244 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
817
818 if (fabs (diff) >= 1e-4)
819 {
820 ev_periodic_stop (EV_A_ w);
821 ev_periodic_start (EV_A_ w);
822
823 i = 0; /* restart loop, inefficient, but time jumps should be rare */
824 }
825 }
826 } 1245 }
827}
828 1246
829inline int 1247 /* now rebuild the heap */
1248 for (i = periodiccnt >> 1; i--; )
1249 downheap ((WT *)periodics, periodiccnt, i);
1250}
1251#endif
1252
1253int inline_size
830time_update_monotonic (EV_P) 1254time_update_monotonic (EV_P)
831{ 1255{
832 mn_now = get_clock (); 1256 mn_now = get_clock ();
833 1257
834 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1258 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
835 { 1259 {
836 rt_now = rtmn_diff + mn_now; 1260 ev_rt_now = rtmn_diff + mn_now;
837 return 0; 1261 return 0;
838 } 1262 }
839 else 1263 else
840 { 1264 {
841 now_floor = mn_now; 1265 now_floor = mn_now;
842 rt_now = ev_time (); 1266 ev_rt_now = ev_time ();
843 return 1; 1267 return 1;
844 } 1268 }
845} 1269}
846 1270
847static void 1271void inline_size
848time_update (EV_P) 1272time_update (EV_P)
849{ 1273{
850 int i; 1274 int i;
851 1275
852#if EV_USE_MONOTONIC 1276#if EV_USE_MONOTONIC
… …
854 { 1278 {
855 if (time_update_monotonic (EV_A)) 1279 if (time_update_monotonic (EV_A))
856 { 1280 {
857 ev_tstamp odiff = rtmn_diff; 1281 ev_tstamp odiff = rtmn_diff;
858 1282
859 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1283 /* loop a few times, before making important decisions.
1284 * on the choice of "4": one iteration isn't enough,
1285 * in case we get preempted during the calls to
1286 * ev_time and get_clock. a second call is almost guaranteed
1287 * to succeed in that case, though. and looping a few more times
1288 * doesn't hurt either as we only do this on time-jumps or
1289 * in the unlikely event of having been preempted here.
1290 */
1291 for (i = 4; --i; )
860 { 1292 {
861 rtmn_diff = rt_now - mn_now; 1293 rtmn_diff = ev_rt_now - mn_now;
862 1294
863 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1295 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
864 return; /* all is well */ 1296 return; /* all is well */
865 1297
866 rt_now = ev_time (); 1298 ev_rt_now = ev_time ();
867 mn_now = get_clock (); 1299 mn_now = get_clock ();
868 now_floor = mn_now; 1300 now_floor = mn_now;
869 } 1301 }
870 1302
1303# if EV_PERIODIC_ENABLE
871 periodics_reschedule (EV_A); 1304 periodics_reschedule (EV_A);
1305# endif
872 /* no timer adjustment, as the monotonic clock doesn't jump */ 1306 /* no timer adjustment, as the monotonic clock doesn't jump */
873 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1307 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
874 } 1308 }
875 } 1309 }
876 else 1310 else
877#endif 1311#endif
878 { 1312 {
879 rt_now = ev_time (); 1313 ev_rt_now = ev_time ();
880 1314
881 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1315 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
882 { 1316 {
1317#if EV_PERIODIC_ENABLE
883 periodics_reschedule (EV_A); 1318 periodics_reschedule (EV_A);
1319#endif
884 1320
885 /* adjust timers. this is easy, as the offset is the same for all */ 1321 /* adjust timers. this is easy, as the offset is the same for all of them */
886 for (i = 0; i < timercnt; ++i) 1322 for (i = 0; i < timercnt; ++i)
887 timers [i]->at += rt_now - mn_now; 1323 ((WT)timers [i])->at += ev_rt_now - mn_now;
888 } 1324 }
889 1325
890 mn_now = rt_now; 1326 mn_now = ev_rt_now;
891 } 1327 }
892} 1328}
893 1329
894void 1330void
895ev_ref (EV_P) 1331ev_ref (EV_P)
… …
906static int loop_done; 1342static int loop_done;
907 1343
908void 1344void
909ev_loop (EV_P_ int flags) 1345ev_loop (EV_P_ int flags)
910{ 1346{
911 double block;
912 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1347 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1348 ? EVUNLOOP_ONE
1349 : EVUNLOOP_CANCEL;
1350
1351 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
913 1352
914 do 1353 do
915 { 1354 {
1355#ifndef _WIN32
1356 if (expect_false (curpid)) /* penalise the forking check even more */
1357 if (expect_false (getpid () != curpid))
1358 {
1359 curpid = getpid ();
1360 postfork = 1;
1361 }
1362#endif
1363
1364#if EV_FORK_ENABLE
1365 /* we might have forked, so queue fork handlers */
1366 if (expect_false (postfork))
1367 if (forkcnt)
1368 {
1369 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1370 call_pending (EV_A);
1371 }
1372#endif
1373
916 /* queue check watchers (and execute them) */ 1374 /* queue check watchers (and execute them) */
917 if (expect_false (preparecnt)) 1375 if (expect_false (preparecnt))
918 { 1376 {
919 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1377 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
920 call_pending (EV_A); 1378 call_pending (EV_A);
921 } 1379 }
922 1380
1381 if (expect_false (!activecnt))
1382 break;
1383
1384 /* we might have forked, so reify kernel state if necessary */
1385 if (expect_false (postfork))
1386 loop_fork (EV_A);
1387
923 /* update fd-related kernel structures */ 1388 /* update fd-related kernel structures */
924 fd_reify (EV_A); 1389 fd_reify (EV_A);
925 1390
926 /* calculate blocking time */ 1391 /* calculate blocking time */
1392 {
1393 ev_tstamp block;
927 1394
928 /* we only need this for !monotonic clockor timers, but as we basically 1395 if (expect_false (flags & EVLOOP_NONBLOCK || idlecnt || !activecnt))
929 always have timers, we just calculate it always */ 1396 block = 0.; /* do not block at all */
1397 else
1398 {
1399 /* update time to cancel out callback processing overhead */
930#if EV_USE_MONOTONIC 1400#if EV_USE_MONOTONIC
931 if (expect_true (have_monotonic)) 1401 if (expect_true (have_monotonic))
932 time_update_monotonic (EV_A); 1402 time_update_monotonic (EV_A);
933 else 1403 else
934#endif 1404#endif
935 { 1405 {
936 rt_now = ev_time (); 1406 ev_rt_now = ev_time ();
937 mn_now = rt_now; 1407 mn_now = ev_rt_now;
938 } 1408 }
939 1409
940 if (flags & EVLOOP_NONBLOCK || idlecnt)
941 block = 0.;
942 else
943 {
944 block = MAX_BLOCKTIME; 1410 block = MAX_BLOCKTIME;
945 1411
946 if (timercnt) 1412 if (timercnt)
947 { 1413 {
948 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1414 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
949 if (block > to) block = to; 1415 if (block > to) block = to;
950 } 1416 }
951 1417
1418#if EV_PERIODIC_ENABLE
952 if (periodiccnt) 1419 if (periodiccnt)
953 { 1420 {
954 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1421 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
955 if (block > to) block = to; 1422 if (block > to) block = to;
956 } 1423 }
1424#endif
957 1425
958 if (block < 0.) block = 0.; 1426 if (expect_false (block < 0.)) block = 0.;
959 } 1427 }
960 1428
1429 ++loop_count;
961 method_poll (EV_A_ block); 1430 backend_poll (EV_A_ block);
1431 }
962 1432
963 /* update rt_now, do magic */ 1433 /* update ev_rt_now, do magic */
964 time_update (EV_A); 1434 time_update (EV_A);
965 1435
966 /* queue pending timers and reschedule them */ 1436 /* queue pending timers and reschedule them */
967 timers_reify (EV_A); /* relative timers called last */ 1437 timers_reify (EV_A); /* relative timers called last */
1438#if EV_PERIODIC_ENABLE
968 periodics_reify (EV_A); /* absolute timers called first */ 1439 periodics_reify (EV_A); /* absolute timers called first */
1440#endif
969 1441
970 /* queue idle watchers unless io or timers are pending */ 1442 /* queue idle watchers unless other events are pending */
971 if (!pendingcnt) 1443 if (idlecnt && !any_pending (EV_A))
972 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1444 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
973 1445
974 /* queue check watchers, to be executed first */ 1446 /* queue check watchers, to be executed first */
975 if (checkcnt) 1447 if (expect_false (checkcnt))
976 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1448 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
977 1449
978 call_pending (EV_A); 1450 call_pending (EV_A);
1451
979 } 1452 }
980 while (activecnt && !loop_done); 1453 while (expect_true (activecnt && !loop_done));
981 1454
982 if (loop_done != 2) 1455 if (loop_done == EVUNLOOP_ONE)
983 loop_done = 0; 1456 loop_done = EVUNLOOP_CANCEL;
984} 1457}
985 1458
986void 1459void
987ev_unloop (EV_P_ int how) 1460ev_unloop (EV_P_ int how)
988{ 1461{
989 loop_done = how; 1462 loop_done = how;
990} 1463}
991 1464
992/*****************************************************************************/ 1465/*****************************************************************************/
993 1466
994inline void 1467void inline_size
995wlist_add (WL *head, WL elem) 1468wlist_add (WL *head, WL elem)
996{ 1469{
997 elem->next = *head; 1470 elem->next = *head;
998 *head = elem; 1471 *head = elem;
999} 1472}
1000 1473
1001inline void 1474void inline_size
1002wlist_del (WL *head, WL elem) 1475wlist_del (WL *head, WL elem)
1003{ 1476{
1004 while (*head) 1477 while (*head)
1005 { 1478 {
1006 if (*head == elem) 1479 if (*head == elem)
… …
1011 1484
1012 head = &(*head)->next; 1485 head = &(*head)->next;
1013 } 1486 }
1014} 1487}
1015 1488
1016inline void 1489void inline_speed
1017ev_clear_pending (EV_P_ W w) 1490ev_clear_pending (EV_P_ W w)
1018{ 1491{
1019 if (w->pending) 1492 if (w->pending)
1020 { 1493 {
1021 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1494 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1022 w->pending = 0; 1495 w->pending = 0;
1023 } 1496 }
1024} 1497}
1025 1498
1026inline void 1499void inline_speed
1027ev_start (EV_P_ W w, int active) 1500ev_start (EV_P_ W w, int active)
1028{ 1501{
1029 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1502 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1030 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 1503 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1031 1504
1032 w->active = active; 1505 w->active = active;
1033 ev_ref (EV_A); 1506 ev_ref (EV_A);
1034} 1507}
1035 1508
1036inline void 1509void inline_size
1037ev_stop (EV_P_ W w) 1510ev_stop (EV_P_ W w)
1038{ 1511{
1039 ev_unref (EV_A); 1512 ev_unref (EV_A);
1040 w->active = 0; 1513 w->active = 0;
1041} 1514}
1042 1515
1043/*****************************************************************************/ 1516/*****************************************************************************/
1044 1517
1045void 1518void
1046ev_io_start (EV_P_ struct ev_io *w) 1519ev_io_start (EV_P_ ev_io *w)
1047{ 1520{
1048 int fd = w->fd; 1521 int fd = w->fd;
1049 1522
1050 if (ev_is_active (w)) 1523 if (expect_false (ev_is_active (w)))
1051 return; 1524 return;
1052 1525
1053 assert (("ev_io_start called with negative fd", fd >= 0)); 1526 assert (("ev_io_start called with negative fd", fd >= 0));
1054 1527
1055 ev_start (EV_A_ (W)w, 1); 1528 ev_start (EV_A_ (W)w, 1);
1056 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1529 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1057 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1530 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1058 1531
1059 fd_change (EV_A_ fd); 1532 fd_change (EV_A_ fd);
1060} 1533}
1061 1534
1062void 1535void
1063ev_io_stop (EV_P_ struct ev_io *w) 1536ev_io_stop (EV_P_ ev_io *w)
1064{ 1537{
1065 ev_clear_pending (EV_A_ (W)w); 1538 ev_clear_pending (EV_A_ (W)w);
1066 if (!ev_is_active (w)) 1539 if (expect_false (!ev_is_active (w)))
1067 return; 1540 return;
1541
1542 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1068 1543
1069 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1544 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1070 ev_stop (EV_A_ (W)w); 1545 ev_stop (EV_A_ (W)w);
1071 1546
1072 fd_change (EV_A_ w->fd); 1547 fd_change (EV_A_ w->fd);
1073} 1548}
1074 1549
1075void 1550void
1076ev_timer_start (EV_P_ struct ev_timer *w) 1551ev_timer_start (EV_P_ ev_timer *w)
1077{ 1552{
1078 if (ev_is_active (w)) 1553 if (expect_false (ev_is_active (w)))
1079 return; 1554 return;
1080 1555
1081 w->at += mn_now; 1556 ((WT)w)->at += mn_now;
1082 1557
1083 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1558 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1084 1559
1085 ev_start (EV_A_ (W)w, ++timercnt); 1560 ev_start (EV_A_ (W)w, ++timercnt);
1086 array_needsize (timers, timermax, timercnt, ); 1561 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1087 timers [timercnt - 1] = w; 1562 timers [timercnt - 1] = w;
1088 upheap ((WT *)timers, timercnt - 1); 1563 upheap ((WT *)timers, timercnt - 1);
1089}
1090 1564
1565 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1566}
1567
1091void 1568void
1092ev_timer_stop (EV_P_ struct ev_timer *w) 1569ev_timer_stop (EV_P_ ev_timer *w)
1093{ 1570{
1094 ev_clear_pending (EV_A_ (W)w); 1571 ev_clear_pending (EV_A_ (W)w);
1095 if (!ev_is_active (w)) 1572 if (expect_false (!ev_is_active (w)))
1096 return; 1573 return;
1097 1574
1098 if (w->active < timercnt--) 1575 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1576
1577 {
1578 int active = ((W)w)->active;
1579
1580 if (expect_true (--active < --timercnt))
1099 { 1581 {
1100 timers [w->active - 1] = timers [timercnt]; 1582 timers [active] = timers [timercnt];
1101 downheap ((WT *)timers, timercnt, w->active - 1); 1583 adjustheap ((WT *)timers, timercnt, active);
1102 } 1584 }
1585 }
1103 1586
1104 w->at = w->repeat; 1587 ((WT)w)->at -= mn_now;
1105 1588
1106 ev_stop (EV_A_ (W)w); 1589 ev_stop (EV_A_ (W)w);
1107} 1590}
1108 1591
1109void 1592void
1110ev_timer_again (EV_P_ struct ev_timer *w) 1593ev_timer_again (EV_P_ ev_timer *w)
1111{ 1594{
1112 if (ev_is_active (w)) 1595 if (ev_is_active (w))
1113 { 1596 {
1114 if (w->repeat) 1597 if (w->repeat)
1115 { 1598 {
1116 w->at = mn_now + w->repeat; 1599 ((WT)w)->at = mn_now + w->repeat;
1117 downheap ((WT *)timers, timercnt, w->active - 1); 1600 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1118 } 1601 }
1119 else 1602 else
1120 ev_timer_stop (EV_A_ w); 1603 ev_timer_stop (EV_A_ w);
1121 } 1604 }
1122 else if (w->repeat) 1605 else if (w->repeat)
1606 {
1607 w->at = w->repeat;
1123 ev_timer_start (EV_A_ w); 1608 ev_timer_start (EV_A_ w);
1609 }
1124} 1610}
1125 1611
1612#if EV_PERIODIC_ENABLE
1126void 1613void
1127ev_periodic_start (EV_P_ struct ev_periodic *w) 1614ev_periodic_start (EV_P_ ev_periodic *w)
1128{ 1615{
1129 if (ev_is_active (w)) 1616 if (expect_false (ev_is_active (w)))
1130 return; 1617 return;
1131 1618
1619 if (w->reschedule_cb)
1620 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1621 else if (w->interval)
1622 {
1132 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1623 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1133
1134 /* this formula differs from the one in periodic_reify because we do not always round up */ 1624 /* this formula differs from the one in periodic_reify because we do not always round up */
1135 if (w->interval)
1136 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1625 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1626 }
1137 1627
1138 ev_start (EV_A_ (W)w, ++periodiccnt); 1628 ev_start (EV_A_ (W)w, ++periodiccnt);
1139 array_needsize (periodics, periodicmax, periodiccnt, ); 1629 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1140 periodics [periodiccnt - 1] = w; 1630 periodics [periodiccnt - 1] = w;
1141 upheap ((WT *)periodics, periodiccnt - 1); 1631 upheap ((WT *)periodics, periodiccnt - 1);
1142}
1143 1632
1633 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1634}
1635
1144void 1636void
1145ev_periodic_stop (EV_P_ struct ev_periodic *w) 1637ev_periodic_stop (EV_P_ ev_periodic *w)
1146{ 1638{
1147 ev_clear_pending (EV_A_ (W)w); 1639 ev_clear_pending (EV_A_ (W)w);
1148 if (!ev_is_active (w)) 1640 if (expect_false (!ev_is_active (w)))
1149 return; 1641 return;
1150 1642
1151 if (w->active < periodiccnt--) 1643 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1644
1645 {
1646 int active = ((W)w)->active;
1647
1648 if (expect_true (--active < --periodiccnt))
1152 { 1649 {
1153 periodics [w->active - 1] = periodics [periodiccnt]; 1650 periodics [active] = periodics [periodiccnt];
1154 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1651 adjustheap ((WT *)periodics, periodiccnt, active);
1155 } 1652 }
1653 }
1156 1654
1157 ev_stop (EV_A_ (W)w); 1655 ev_stop (EV_A_ (W)w);
1158} 1656}
1159 1657
1160void 1658void
1161ev_idle_start (EV_P_ struct ev_idle *w) 1659ev_periodic_again (EV_P_ ev_periodic *w)
1162{ 1660{
1163 if (ev_is_active (w)) 1661 /* TODO: use adjustheap and recalculation */
1164 return;
1165
1166 ev_start (EV_A_ (W)w, ++idlecnt);
1167 array_needsize (idles, idlemax, idlecnt, );
1168 idles [idlecnt - 1] = w;
1169}
1170
1171void
1172ev_idle_stop (EV_P_ struct ev_idle *w)
1173{
1174 ev_clear_pending (EV_A_ (W)w);
1175 if (ev_is_active (w))
1176 return;
1177
1178 idles [w->active - 1] = idles [--idlecnt];
1179 ev_stop (EV_A_ (W)w); 1662 ev_periodic_stop (EV_A_ w);
1663 ev_periodic_start (EV_A_ w);
1180} 1664}
1181 1665#endif
1182void
1183ev_prepare_start (EV_P_ struct ev_prepare *w)
1184{
1185 if (ev_is_active (w))
1186 return;
1187
1188 ev_start (EV_A_ (W)w, ++preparecnt);
1189 array_needsize (prepares, preparemax, preparecnt, );
1190 prepares [preparecnt - 1] = w;
1191}
1192
1193void
1194ev_prepare_stop (EV_P_ struct ev_prepare *w)
1195{
1196 ev_clear_pending (EV_A_ (W)w);
1197 if (ev_is_active (w))
1198 return;
1199
1200 prepares [w->active - 1] = prepares [--preparecnt];
1201 ev_stop (EV_A_ (W)w);
1202}
1203
1204void
1205ev_check_start (EV_P_ struct ev_check *w)
1206{
1207 if (ev_is_active (w))
1208 return;
1209
1210 ev_start (EV_A_ (W)w, ++checkcnt);
1211 array_needsize (checks, checkmax, checkcnt, );
1212 checks [checkcnt - 1] = w;
1213}
1214
1215void
1216ev_check_stop (EV_P_ struct ev_check *w)
1217{
1218 ev_clear_pending (EV_A_ (W)w);
1219 if (ev_is_active (w))
1220 return;
1221
1222 checks [w->active - 1] = checks [--checkcnt];
1223 ev_stop (EV_A_ (W)w);
1224}
1225 1666
1226#ifndef SA_RESTART 1667#ifndef SA_RESTART
1227# define SA_RESTART 0 1668# define SA_RESTART 0
1228#endif 1669#endif
1229 1670
1230void 1671void
1231ev_signal_start (EV_P_ struct ev_signal *w) 1672ev_signal_start (EV_P_ ev_signal *w)
1232{ 1673{
1233#if EV_MULTIPLICITY 1674#if EV_MULTIPLICITY
1234 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1675 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1235#endif 1676#endif
1236 if (ev_is_active (w)) 1677 if (expect_false (ev_is_active (w)))
1237 return; 1678 return;
1238 1679
1239 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1680 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1240 1681
1241 ev_start (EV_A_ (W)w, 1); 1682 ev_start (EV_A_ (W)w, 1);
1242 array_needsize (signals, signalmax, w->signum, signals_init); 1683 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1243 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1684 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1244 1685
1245 if (!w->next) 1686 if (!((WL)w)->next)
1246 { 1687 {
1688#if _WIN32
1689 signal (w->signum, sighandler);
1690#else
1247 struct sigaction sa; 1691 struct sigaction sa;
1248 sa.sa_handler = sighandler; 1692 sa.sa_handler = sighandler;
1249 sigfillset (&sa.sa_mask); 1693 sigfillset (&sa.sa_mask);
1250 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1694 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1251 sigaction (w->signum, &sa, 0); 1695 sigaction (w->signum, &sa, 0);
1696#endif
1252 } 1697 }
1253} 1698}
1254 1699
1255void 1700void
1256ev_signal_stop (EV_P_ struct ev_signal *w) 1701ev_signal_stop (EV_P_ ev_signal *w)
1257{ 1702{
1258 ev_clear_pending (EV_A_ (W)w); 1703 ev_clear_pending (EV_A_ (W)w);
1259 if (!ev_is_active (w)) 1704 if (expect_false (!ev_is_active (w)))
1260 return; 1705 return;
1261 1706
1262 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1707 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1263 ev_stop (EV_A_ (W)w); 1708 ev_stop (EV_A_ (W)w);
1264 1709
1265 if (!signals [w->signum - 1].head) 1710 if (!signals [w->signum - 1].head)
1266 signal (w->signum, SIG_DFL); 1711 signal (w->signum, SIG_DFL);
1267} 1712}
1268 1713
1269void 1714void
1270ev_child_start (EV_P_ struct ev_child *w) 1715ev_child_start (EV_P_ ev_child *w)
1271{ 1716{
1272#if EV_MULTIPLICITY 1717#if EV_MULTIPLICITY
1273 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1718 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1274#endif 1719#endif
1275 if (ev_is_active (w)) 1720 if (expect_false (ev_is_active (w)))
1276 return; 1721 return;
1277 1722
1278 ev_start (EV_A_ (W)w, 1); 1723 ev_start (EV_A_ (W)w, 1);
1279 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1724 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1280} 1725}
1281 1726
1282void 1727void
1283ev_child_stop (EV_P_ struct ev_child *w) 1728ev_child_stop (EV_P_ ev_child *w)
1284{ 1729{
1285 ev_clear_pending (EV_A_ (W)w); 1730 ev_clear_pending (EV_A_ (W)w);
1286 if (ev_is_active (w)) 1731 if (expect_false (!ev_is_active (w)))
1287 return; 1732 return;
1288 1733
1289 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1734 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1290 ev_stop (EV_A_ (W)w); 1735 ev_stop (EV_A_ (W)w);
1291} 1736}
1292 1737
1738#if EV_STAT_ENABLE
1739
1740# ifdef _WIN32
1741# undef lstat
1742# define lstat(a,b) _stati64 (a,b)
1743# endif
1744
1745#define DEF_STAT_INTERVAL 5.0074891
1746#define MIN_STAT_INTERVAL 0.1074891
1747
1748static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1749
1750#if EV_USE_INOTIFY
1751# define EV_INOTIFY_BUFSIZE 8192
1752
1753static void noinline
1754infy_add (EV_P_ ev_stat *w)
1755{
1756 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);
1757
1758 if (w->wd < 0)
1759 {
1760 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1761
1762 /* monitor some parent directory for speedup hints */
1763 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1764 {
1765 char path [4096];
1766 strcpy (path, w->path);
1767
1768 do
1769 {
1770 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1771 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1772
1773 char *pend = strrchr (path, '/');
1774
1775 if (!pend)
1776 break; /* whoops, no '/', complain to your admin */
1777
1778 *pend = 0;
1779 w->wd = inotify_add_watch (fs_fd, path, mask);
1780 }
1781 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1782 }
1783 }
1784 else
1785 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1786
1787 if (w->wd >= 0)
1788 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1789}
1790
1791static void noinline
1792infy_del (EV_P_ ev_stat *w)
1793{
1794 int slot;
1795 int wd = w->wd;
1796
1797 if (wd < 0)
1798 return;
1799
1800 w->wd = -2;
1801 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1802 wlist_del (&fs_hash [slot].head, (WL)w);
1803
1804 /* remove this watcher, if others are watching it, they will rearm */
1805 inotify_rm_watch (fs_fd, wd);
1806}
1807
1808static void noinline
1809infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1810{
1811 if (slot < 0)
1812 /* overflow, need to check for all hahs slots */
1813 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1814 infy_wd (EV_A_ slot, wd, ev);
1815 else
1816 {
1817 WL w_;
1818
1819 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1820 {
1821 ev_stat *w = (ev_stat *)w_;
1822 w_ = w_->next; /* lets us remove this watcher and all before it */
1823
1824 if (w->wd == wd || wd == -1)
1825 {
1826 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1827 {
1828 w->wd = -1;
1829 infy_add (EV_A_ w); /* re-add, no matter what */
1830 }
1831
1832 stat_timer_cb (EV_A_ &w->timer, 0);
1833 }
1834 }
1835 }
1836}
1837
1838static void
1839infy_cb (EV_P_ ev_io *w, int revents)
1840{
1841 char buf [EV_INOTIFY_BUFSIZE];
1842 struct inotify_event *ev = (struct inotify_event *)buf;
1843 int ofs;
1844 int len = read (fs_fd, buf, sizeof (buf));
1845
1846 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1847 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1848}
1849
1850void inline_size
1851infy_init (EV_P)
1852{
1853 if (fs_fd != -2)
1854 return;
1855
1856 fs_fd = inotify_init ();
1857
1858 if (fs_fd >= 0)
1859 {
1860 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1861 ev_set_priority (&fs_w, EV_MAXPRI);
1862 ev_io_start (EV_A_ &fs_w);
1863 }
1864}
1865
1866void inline_size
1867infy_fork (EV_P)
1868{
1869 int slot;
1870
1871 if (fs_fd < 0)
1872 return;
1873
1874 close (fs_fd);
1875 fs_fd = inotify_init ();
1876
1877 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1878 {
1879 WL w_ = fs_hash [slot].head;
1880 fs_hash [slot].head = 0;
1881
1882 while (w_)
1883 {
1884 ev_stat *w = (ev_stat *)w_;
1885 w_ = w_->next; /* lets us add this watcher */
1886
1887 w->wd = -1;
1888
1889 if (fs_fd >= 0)
1890 infy_add (EV_A_ w); /* re-add, no matter what */
1891 else
1892 ev_timer_start (EV_A_ &w->timer);
1893 }
1894
1895 }
1896}
1897
1898#endif
1899
1900void
1901ev_stat_stat (EV_P_ ev_stat *w)
1902{
1903 if (lstat (w->path, &w->attr) < 0)
1904 w->attr.st_nlink = 0;
1905 else if (!w->attr.st_nlink)
1906 w->attr.st_nlink = 1;
1907}
1908
1909static void noinline
1910stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1911{
1912 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1913
1914 /* we copy this here each the time so that */
1915 /* prev has the old value when the callback gets invoked */
1916 w->prev = w->attr;
1917 ev_stat_stat (EV_A_ w);
1918
1919 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1920 if (
1921 w->prev.st_dev != w->attr.st_dev
1922 || w->prev.st_ino != w->attr.st_ino
1923 || w->prev.st_mode != w->attr.st_mode
1924 || w->prev.st_nlink != w->attr.st_nlink
1925 || w->prev.st_uid != w->attr.st_uid
1926 || w->prev.st_gid != w->attr.st_gid
1927 || w->prev.st_rdev != w->attr.st_rdev
1928 || w->prev.st_size != w->attr.st_size
1929 || w->prev.st_atime != w->attr.st_atime
1930 || w->prev.st_mtime != w->attr.st_mtime
1931 || w->prev.st_ctime != w->attr.st_ctime
1932 ) {
1933 #if EV_USE_INOTIFY
1934 infy_del (EV_A_ w);
1935 infy_add (EV_A_ w);
1936 ev_stat_stat (EV_A_ w); /* avoid race... */
1937 #endif
1938
1939 ev_feed_event (EV_A_ w, EV_STAT);
1940 }
1941}
1942
1943void
1944ev_stat_start (EV_P_ ev_stat *w)
1945{
1946 if (expect_false (ev_is_active (w)))
1947 return;
1948
1949 /* since we use memcmp, we need to clear any padding data etc. */
1950 memset (&w->prev, 0, sizeof (ev_statdata));
1951 memset (&w->attr, 0, sizeof (ev_statdata));
1952
1953 ev_stat_stat (EV_A_ w);
1954
1955 if (w->interval < MIN_STAT_INTERVAL)
1956 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1957
1958 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1959 ev_set_priority (&w->timer, ev_priority (w));
1960
1961#if EV_USE_INOTIFY
1962 infy_init (EV_A);
1963
1964 if (fs_fd >= 0)
1965 infy_add (EV_A_ w);
1966 else
1967#endif
1968 ev_timer_start (EV_A_ &w->timer);
1969
1970 ev_start (EV_A_ (W)w, 1);
1971}
1972
1973void
1974ev_stat_stop (EV_P_ ev_stat *w)
1975{
1976 ev_clear_pending (EV_A_ (W)w);
1977 if (expect_false (!ev_is_active (w)))
1978 return;
1979
1980#if EV_USE_INOTIFY
1981 infy_del (EV_A_ w);
1982#endif
1983 ev_timer_stop (EV_A_ &w->timer);
1984
1985 ev_stop (EV_A_ (W)w);
1986}
1987#endif
1988
1989void
1990ev_idle_start (EV_P_ ev_idle *w)
1991{
1992 if (expect_false (ev_is_active (w)))
1993 return;
1994
1995 ev_start (EV_A_ (W)w, ++idlecnt);
1996 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1997 idles [idlecnt - 1] = w;
1998}
1999
2000void
2001ev_idle_stop (EV_P_ ev_idle *w)
2002{
2003 ev_clear_pending (EV_A_ (W)w);
2004 if (expect_false (!ev_is_active (w)))
2005 return;
2006
2007 {
2008 int active = ((W)w)->active;
2009 idles [active - 1] = idles [--idlecnt];
2010 ((W)idles [active - 1])->active = active;
2011 }
2012
2013 ev_stop (EV_A_ (W)w);
2014}
2015
2016void
2017ev_prepare_start (EV_P_ ev_prepare *w)
2018{
2019 if (expect_false (ev_is_active (w)))
2020 return;
2021
2022 ev_start (EV_A_ (W)w, ++preparecnt);
2023 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2024 prepares [preparecnt - 1] = w;
2025}
2026
2027void
2028ev_prepare_stop (EV_P_ ev_prepare *w)
2029{
2030 ev_clear_pending (EV_A_ (W)w);
2031 if (expect_false (!ev_is_active (w)))
2032 return;
2033
2034 {
2035 int active = ((W)w)->active;
2036 prepares [active - 1] = prepares [--preparecnt];
2037 ((W)prepares [active - 1])->active = active;
2038 }
2039
2040 ev_stop (EV_A_ (W)w);
2041}
2042
2043void
2044ev_check_start (EV_P_ ev_check *w)
2045{
2046 if (expect_false (ev_is_active (w)))
2047 return;
2048
2049 ev_start (EV_A_ (W)w, ++checkcnt);
2050 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2051 checks [checkcnt - 1] = w;
2052}
2053
2054void
2055ev_check_stop (EV_P_ ev_check *w)
2056{
2057 ev_clear_pending (EV_A_ (W)w);
2058 if (expect_false (!ev_is_active (w)))
2059 return;
2060
2061 {
2062 int active = ((W)w)->active;
2063 checks [active - 1] = checks [--checkcnt];
2064 ((W)checks [active - 1])->active = active;
2065 }
2066
2067 ev_stop (EV_A_ (W)w);
2068}
2069
2070#if EV_EMBED_ENABLE
2071void noinline
2072ev_embed_sweep (EV_P_ ev_embed *w)
2073{
2074 ev_loop (w->loop, EVLOOP_NONBLOCK);
2075}
2076
2077static void
2078embed_cb (EV_P_ ev_io *io, int revents)
2079{
2080 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2081
2082 if (ev_cb (w))
2083 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2084 else
2085 ev_embed_sweep (loop, w);
2086}
2087
2088void
2089ev_embed_start (EV_P_ ev_embed *w)
2090{
2091 if (expect_false (ev_is_active (w)))
2092 return;
2093
2094 {
2095 struct ev_loop *loop = w->loop;
2096 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2097 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2098 }
2099
2100 ev_set_priority (&w->io, ev_priority (w));
2101 ev_io_start (EV_A_ &w->io);
2102
2103 ev_start (EV_A_ (W)w, 1);
2104}
2105
2106void
2107ev_embed_stop (EV_P_ ev_embed *w)
2108{
2109 ev_clear_pending (EV_A_ (W)w);
2110 if (expect_false (!ev_is_active (w)))
2111 return;
2112
2113 ev_io_stop (EV_A_ &w->io);
2114
2115 ev_stop (EV_A_ (W)w);
2116}
2117#endif
2118
2119#if EV_FORK_ENABLE
2120void
2121ev_fork_start (EV_P_ ev_fork *w)
2122{
2123 if (expect_false (ev_is_active (w)))
2124 return;
2125
2126 ev_start (EV_A_ (W)w, ++forkcnt);
2127 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2128 forks [forkcnt - 1] = w;
2129}
2130
2131void
2132ev_fork_stop (EV_P_ ev_fork *w)
2133{
2134 ev_clear_pending (EV_A_ (W)w);
2135 if (expect_false (!ev_is_active (w)))
2136 return;
2137
2138 {
2139 int active = ((W)w)->active;
2140 forks [active - 1] = forks [--forkcnt];
2141 ((W)forks [active - 1])->active = active;
2142 }
2143
2144 ev_stop (EV_A_ (W)w);
2145}
2146#endif
2147
1293/*****************************************************************************/ 2148/*****************************************************************************/
1294 2149
1295struct ev_once 2150struct ev_once
1296{ 2151{
1297 struct ev_io io; 2152 ev_io io;
1298 struct ev_timer to; 2153 ev_timer to;
1299 void (*cb)(int revents, void *arg); 2154 void (*cb)(int revents, void *arg);
1300 void *arg; 2155 void *arg;
1301}; 2156};
1302 2157
1303static void 2158static void
… …
1306 void (*cb)(int revents, void *arg) = once->cb; 2161 void (*cb)(int revents, void *arg) = once->cb;
1307 void *arg = once->arg; 2162 void *arg = once->arg;
1308 2163
1309 ev_io_stop (EV_A_ &once->io); 2164 ev_io_stop (EV_A_ &once->io);
1310 ev_timer_stop (EV_A_ &once->to); 2165 ev_timer_stop (EV_A_ &once->to);
1311 free (once); 2166 ev_free (once);
1312 2167
1313 cb (revents, arg); 2168 cb (revents, arg);
1314} 2169}
1315 2170
1316static void 2171static void
1317once_cb_io (EV_P_ struct ev_io *w, int revents) 2172once_cb_io (EV_P_ ev_io *w, int revents)
1318{ 2173{
1319 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 2174 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1320} 2175}
1321 2176
1322static void 2177static void
1323once_cb_to (EV_P_ struct ev_timer *w, int revents) 2178once_cb_to (EV_P_ ev_timer *w, int revents)
1324{ 2179{
1325 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 2180 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1326} 2181}
1327 2182
1328void 2183void
1329ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 2184ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1330{ 2185{
1331 struct ev_once *once = malloc (sizeof (struct ev_once)); 2186 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1332 2187
1333 if (!once) 2188 if (expect_false (!once))
2189 {
1334 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 2190 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1335 else 2191 return;
1336 { 2192 }
2193
1337 once->cb = cb; 2194 once->cb = cb;
1338 once->arg = arg; 2195 once->arg = arg;
1339 2196
1340 ev_watcher_init (&once->io, once_cb_io); 2197 ev_init (&once->io, once_cb_io);
1341 if (fd >= 0) 2198 if (fd >= 0)
1342 { 2199 {
1343 ev_io_set (&once->io, fd, events); 2200 ev_io_set (&once->io, fd, events);
1344 ev_io_start (EV_A_ &once->io); 2201 ev_io_start (EV_A_ &once->io);
1345 } 2202 }
1346 2203
1347 ev_watcher_init (&once->to, once_cb_to); 2204 ev_init (&once->to, once_cb_to);
1348 if (timeout >= 0.) 2205 if (timeout >= 0.)
1349 { 2206 {
1350 ev_timer_set (&once->to, timeout, 0.); 2207 ev_timer_set (&once->to, timeout, 0.);
1351 ev_timer_start (EV_A_ &once->to); 2208 ev_timer_start (EV_A_ &once->to);
1352 }
1353 } 2209 }
1354} 2210}
1355 2211
2212#ifdef __cplusplus
2213}
2214#endif
2215

Diff Legend

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