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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines