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

Comparing libev/ev.c (file contents):
Revision 1.73 by root, Tue Nov 6 16:27:10 2007 UTC vs.
Revision 1.154 by root, Wed Nov 28 11:53:37 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>
66#include <sys/types.h> 118#include <sys/types.h>
67#include <time.h> 119#include <time.h>
68 120
69#include <signal.h> 121#include <signal.h>
70 122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
128
71#ifndef WIN32 129#ifndef _WIN32
72# include <unistd.h>
73# include <sys/time.h> 130# include <sys/time.h>
74# 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
75#endif 138# endif
139#endif
140
76/**/ 141/**/
77 142
78#ifndef EV_USE_MONOTONIC 143#ifndef EV_USE_MONOTONIC
79# 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
80#endif 149#endif
81 150
82#ifndef EV_USE_SELECT 151#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 152# define EV_USE_SELECT 1
84#endif 153#endif
85 154
86#ifndef EV_USE_POLL 155#ifndef EV_USE_POLL
87# 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
88#endif 161#endif
89 162
90#ifndef EV_USE_EPOLL 163#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 164# define EV_USE_EPOLL 0
92#endif 165#endif
93 166
94#ifndef EV_USE_KQUEUE 167#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 168# define EV_USE_KQUEUE 0
96#endif 169#endif
97 170
171#ifndef EV_USE_PORT
172# define EV_USE_PORT 0
173#endif
174
98#ifndef EV_USE_WIN32 175#ifndef EV_USE_INOTIFY
99# ifdef WIN32 176# define EV_USE_INOTIFY 0
100# define EV_USE_WIN32 0 /* it does not exist, use select */ 177#endif
101# undef EV_USE_SELECT 178
102# define EV_USE_SELECT 1 179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
103# else 182# else
104# define EV_USE_WIN32 0 183# define EV_PID_HASHSIZE 16
105# endif 184# endif
106#endif 185#endif
107 186
108#ifndef EV_USE_REALTIME 187#ifndef EV_INOTIFY_HASHSIZE
109# 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
110#endif 193#endif
111 194
112/**/ 195/**/
113 196
114#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
119#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
122#endif 205#endif
123 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
124/**/ 219/**/
125 220
126#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) */
127#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) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#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 */
130
131#include "ev.h"
132 224
133#if __GNUC__ >= 3 225#if __GNUC__ >= 3
134# 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
135# 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
136#else 235#else
137# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
237# define inline_speed static
138# define inline static 238# define inline_size static
239# define noinline
139#endif 240#endif
140 241
141#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
142#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
143 244
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 247
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */
250
147typedef struct ev_watcher *W; 251typedef ev_watcher *W;
148typedef struct ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
150 254
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 256
257#ifdef _WIN32
153#include "ev_win32.c" 258# include "ev_win32.c"
259#endif
154 260
155/*****************************************************************************/ 261/*****************************************************************************/
156 262
157static void (*syserr_cb)(const char *msg); 263static void (*syserr_cb)(const char *msg);
158 264
265void
159void ev_set_syserr_cb (void (*cb)(const char *msg)) 266ev_set_syserr_cb (void (*cb)(const char *msg))
160{ 267{
161 syserr_cb = cb; 268 syserr_cb = cb;
162} 269}
163 270
164static void 271static void noinline
165syserr (const char *msg) 272syserr (const char *msg)
166{ 273{
167 if (!msg) 274 if (!msg)
168 msg = "(libev) system error"; 275 msg = "(libev) system error";
169 276
174 perror (msg); 281 perror (msg);
175 abort (); 282 abort ();
176 } 283 }
177} 284}
178 285
179static void *(*alloc)(void *ptr, long size); 286static void *(*alloc)(void *ptr, size_t size) = realloc;
180 287
288void
181void ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, size_t size))
182{ 290{
183 alloc = cb; 291 alloc = cb;
184} 292}
185 293
186static void * 294inline_speed void *
187ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, size_t size)
188{ 296{
189 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc (ptr, size);
190 298
191 if (!ptr && size) 299 if (!ptr && size)
192 { 300 {
193 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size);
194 abort (); 302 abort ();
195 } 303 }
196 304
197 return ptr; 305 return ptr;
198} 306}
205typedef struct 313typedef struct
206{ 314{
207 WL head; 315 WL head;
208 unsigned char events; 316 unsigned char events;
209 unsigned char reify; 317 unsigned char reify;
318#if EV_SELECT_IS_WINSOCKET
319 SOCKET handle;
320#endif
210} ANFD; 321} ANFD;
211 322
212typedef struct 323typedef struct
213{ 324{
214 W w; 325 W w;
215 int events; 326 int events;
216} ANPENDING; 327} ANPENDING;
217 328
329typedef struct
330{
331#if EV_USE_INOTIFY
332 WL head;
333#endif
334} ANFS;
335
218#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
219 337
220struct ev_loop 338 struct ev_loop
221{ 339 {
340 ev_tstamp ev_rt_now;
341 #define ev_rt_now ((loop)->ev_rt_now)
222# define VAR(name,decl) decl; 342 #define VAR(name,decl) decl;
223# include "ev_vars.h" 343 #include "ev_vars.h"
224};
225# undef VAR 344 #undef VAR
345 };
226# 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;
227 350
228#else 351#else
229 352
353 ev_tstamp ev_rt_now;
230# define VAR(name,decl) static decl; 354 #define VAR(name,decl) static decl;
231# include "ev_vars.h" 355 #include "ev_vars.h"
232# undef VAR 356 #undef VAR
357
358 static int ev_default_loop_ptr;
233 359
234#endif 360#endif
235 361
236/*****************************************************************************/ 362/*****************************************************************************/
237 363
238inline ev_tstamp 364ev_tstamp
239ev_time (void) 365ev_time (void)
240{ 366{
241#if EV_USE_REALTIME 367#if EV_USE_REALTIME
242 struct timespec ts; 368 struct timespec ts;
243 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
247 gettimeofday (&tv, 0); 373 gettimeofday (&tv, 0);
248 return tv.tv_sec + tv.tv_usec * 1e-6; 374 return tv.tv_sec + tv.tv_usec * 1e-6;
249#endif 375#endif
250} 376}
251 377
252inline ev_tstamp 378ev_tstamp inline_size
253get_clock (void) 379get_clock (void)
254{ 380{
255#if EV_USE_MONOTONIC 381#if EV_USE_MONOTONIC
256 if (expect_true (have_monotonic)) 382 if (expect_true (have_monotonic))
257 { 383 {
262#endif 388#endif
263 389
264 return ev_time (); 390 return ev_time ();
265} 391}
266 392
393#if EV_MULTIPLICITY
267ev_tstamp 394ev_tstamp
268ev_now (EV_P) 395ev_now (EV_P)
269{ 396{
270 return rt_now; 397 return ev_rt_now;
271} 398}
399#endif
272 400
273#define array_roundsize(base,n) ((n) | 4 & ~3) 401#define array_roundsize(type,n) (((n) | 4) & ~3)
274 402
275#define array_needsize(base,cur,cnt,init) \ 403#define array_needsize(type,base,cur,cnt,init) \
276 if (expect_false ((cnt) > cur)) \ 404 if (expect_false ((cnt) > cur)) \
277 { \ 405 { \
278 int newcnt = cur; \ 406 int newcnt = cur; \
279 do \ 407 do \
280 { \ 408 { \
281 newcnt = array_roundsize (base, newcnt << 1); \ 409 newcnt = array_roundsize (type, newcnt << 1); \
282 } \ 410 } \
283 while ((cnt) > newcnt); \ 411 while ((cnt) > newcnt); \
284 \ 412 \
285 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
286 init (base + cur, newcnt - cur); \ 414 init (base + cur, newcnt - cur); \
287 cur = newcnt; \ 415 cur = newcnt; \
288 } 416 }
289 417
290#define array_slim(stem) \ 418#define array_slim(type,stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \ 420 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \ 421 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 } 424 }
297
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302 425
303#define array_free(stem, idx) \ 426#define array_free(stem, idx) \
304 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;
305 428
306/*****************************************************************************/ 429/*****************************************************************************/
307 430
308static 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
309anfds_init (ANFD *base, int count) 460anfds_init (ANFD *base, int count)
310{ 461{
311 while (count--) 462 while (count--)
312 { 463 {
313 base->head = 0; 464 base->head = 0;
316 467
317 ++base; 468 ++base;
318 } 469 }
319} 470}
320 471
321static void 472void inline_speed
322event (EV_P_ W w, int events)
323{
324 if (w->pending)
325 {
326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
327 return;
328 }
329
330 w->pending = ++pendingcnt [ABSPRI (w)];
331 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
332 pendings [ABSPRI (w)][w->pending - 1].w = w;
333 pendings [ABSPRI (w)][w->pending - 1].events = events;
334}
335
336static void
337queue_events (EV_P_ W *events, int eventcnt, int type)
338{
339 int i;
340
341 for (i = 0; i < eventcnt; ++i)
342 event (EV_A_ events [i], type);
343}
344
345static void
346fd_event (EV_P_ int fd, int events) 473fd_event (EV_P_ int fd, int revents)
347{ 474{
348 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
349 struct ev_io *w; 476 ev_io *w;
350 477
351 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)
352 { 479 {
353 int ev = w->events & events; 480 int ev = w->events & revents;
354 481
355 if (ev) 482 if (ev)
356 event (EV_A_ (W)w, ev); 483 ev_feed_event (EV_A_ (W)w, ev);
357 } 484 }
358} 485}
359 486
360/*****************************************************************************/ 487void
488ev_feed_fd_event (EV_P_ int fd, int revents)
489{
490 fd_event (EV_A_ fd, revents);
491}
361 492
362static void 493void inline_size
363fd_reify (EV_P) 494fd_reify (EV_P)
364{ 495{
365 int i; 496 int i;
366 497
367 for (i = 0; i < fdchangecnt; ++i) 498 for (i = 0; i < fdchangecnt; ++i)
368 { 499 {
369 int fd = fdchanges [i]; 500 int fd = fdchanges [i];
370 ANFD *anfd = anfds + fd; 501 ANFD *anfd = anfds + fd;
371 struct ev_io *w; 502 ev_io *w;
372 503
373 int events = 0; 504 int events = 0;
374 505
375 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)
376 events |= w->events; 507 events |= w->events;
377 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
378 anfd->reify = 0; 518 anfd->reify = 0;
379 519
380 method_modify (EV_A_ fd, anfd->events, events); 520 backend_modify (EV_A_ fd, anfd->events, events);
381 anfd->events = events; 521 anfd->events = events;
382 } 522 }
383 523
384 fdchangecnt = 0; 524 fdchangecnt = 0;
385} 525}
386 526
387static void 527void inline_size
388fd_change (EV_P_ int fd) 528fd_change (EV_P_ int fd)
389{ 529{
390 if (anfds [fd].reify) 530 if (expect_false (anfds [fd].reify))
391 return; 531 return;
392 532
393 anfds [fd].reify = 1; 533 anfds [fd].reify = 1;
394 534
395 ++fdchangecnt; 535 ++fdchangecnt;
396 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void)); 536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
397 fdchanges [fdchangecnt - 1] = fd; 537 fdchanges [fdchangecnt - 1] = fd;
398} 538}
399 539
400static void 540void inline_speed
401fd_kill (EV_P_ int fd) 541fd_kill (EV_P_ int fd)
402{ 542{
403 struct ev_io *w; 543 ev_io *w;
404 544
405 while ((w = (struct ev_io *)anfds [fd].head)) 545 while ((w = (ev_io *)anfds [fd].head))
406 { 546 {
407 ev_io_stop (EV_A_ w); 547 ev_io_stop (EV_A_ w);
408 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);
409 } 549 }
410} 550}
411 551
412static int 552int inline_size
413fd_valid (int fd) 553fd_valid (int fd)
414{ 554{
415#ifdef WIN32 555#ifdef _WIN32
416 return !!win32_get_osfhandle (fd); 556 return _get_osfhandle (fd) != -1;
417#else 557#else
418 return fcntl (fd, F_GETFD) != -1; 558 return fcntl (fd, F_GETFD) != -1;
419#endif 559#endif
420} 560}
421 561
422/* called on EBADF to verify fds */ 562/* called on EBADF to verify fds */
423static void 563static void noinline
424fd_ebadf (EV_P) 564fd_ebadf (EV_P)
425{ 565{
426 int fd; 566 int fd;
427 567
428 for (fd = 0; fd < anfdmax; ++fd) 568 for (fd = 0; fd < anfdmax; ++fd)
430 if (!fd_valid (fd) == -1 && errno == EBADF) 570 if (!fd_valid (fd) == -1 && errno == EBADF)
431 fd_kill (EV_A_ fd); 571 fd_kill (EV_A_ fd);
432} 572}
433 573
434/* 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 */
435static void 575static void noinline
436fd_enomem (EV_P) 576fd_enomem (EV_P)
437{ 577{
438 int fd; 578 int fd;
439 579
440 for (fd = anfdmax; fd--; ) 580 for (fd = anfdmax; fd--; )
443 fd_kill (EV_A_ fd); 583 fd_kill (EV_A_ fd);
444 return; 584 return;
445 } 585 }
446} 586}
447 587
448/* usually 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 */
449static void 589static void noinline
450fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
451{ 591{
452 int fd; 592 int fd;
453 593
454 /* 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 */
460 } 600 }
461} 601}
462 602
463/*****************************************************************************/ 603/*****************************************************************************/
464 604
465static void 605void inline_speed
466upheap (WT *heap, int k) 606upheap (WT *heap, int k)
467{ 607{
468 WT w = heap [k]; 608 WT w = heap [k];
469 609
470 while (k && heap [k >> 1]->at > w->at) 610 while (k && heap [k >> 1]->at > w->at)
477 heap [k] = w; 617 heap [k] = w;
478 ((W)heap [k])->active = k + 1; 618 ((W)heap [k])->active = k + 1;
479 619
480} 620}
481 621
482static void 622void inline_speed
483downheap (WT *heap, int N, int k) 623downheap (WT *heap, int N, int k)
484{ 624{
485 WT w = heap [k]; 625 WT w = heap [k];
486 626
487 while (k < (N >> 1)) 627 while (k < (N >> 1))
501 641
502 heap [k] = w; 642 heap [k] = w;
503 ((W)heap [k])->active = k + 1; 643 ((W)heap [k])->active = k + 1;
504} 644}
505 645
646void inline_size
647adjustheap (WT *heap, int N, int k)
648{
649 upheap (heap, k);
650 downheap (heap, N, k);
651}
652
506/*****************************************************************************/ 653/*****************************************************************************/
507 654
508typedef struct 655typedef struct
509{ 656{
510 WL head; 657 WL head;
514static ANSIG *signals; 661static ANSIG *signals;
515static int signalmax; 662static int signalmax;
516 663
517static int sigpipe [2]; 664static int sigpipe [2];
518static sig_atomic_t volatile gotsig; 665static sig_atomic_t volatile gotsig;
519static struct ev_io sigev; 666static ev_io sigev;
520 667
521static void 668void inline_size
522signals_init (ANSIG *base, int count) 669signals_init (ANSIG *base, int count)
523{ 670{
524 while (count--) 671 while (count--)
525 { 672 {
526 base->head = 0; 673 base->head = 0;
531} 678}
532 679
533static void 680static void
534sighandler (int signum) 681sighandler (int signum)
535{ 682{
536#if WIN32 683#if _WIN32
537 signal (signum, sighandler); 684 signal (signum, sighandler);
538#endif 685#endif
539 686
540 signals [signum - 1].gotsig = 1; 687 signals [signum - 1].gotsig = 1;
541 688
546 write (sigpipe [1], &signum, 1); 693 write (sigpipe [1], &signum, 1);
547 errno = old_errno; 694 errno = old_errno;
548 } 695 }
549} 696}
550 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
551static void 718static void
552sigcb (EV_P_ struct ev_io *iow, int revents) 719sigcb (EV_P_ ev_io *iow, int revents)
553{ 720{
554 WL w;
555 int signum; 721 int signum;
556 722
557 read (sigpipe [0], &revents, 1); 723 read (sigpipe [0], &revents, 1);
558 gotsig = 0; 724 gotsig = 0;
559 725
560 for (signum = signalmax; signum--; ) 726 for (signum = signalmax; signum--; )
561 if (signals [signum].gotsig) 727 if (signals [signum].gotsig)
562 { 728 ev_feed_signal_event (EV_A_ signum + 1);
563 signals [signum].gotsig = 0;
564
565 for (w = signals [signum].head; w; w = w->next)
566 event (EV_A_ (W)w, EV_SIGNAL);
567 }
568} 729}
569 730
570static 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
571siginit (EV_P) 744siginit (EV_P)
572{ 745{
573#ifndef WIN32 746 fd_intern (sigpipe [0]);
574 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 747 fd_intern (sigpipe [1]);
575 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
576
577 /* rather than sort out wether we really need nb, set it */
578 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
579 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
580#endif
581 748
582 ev_io_set (&sigev, sigpipe [0], EV_READ); 749 ev_io_set (&sigev, sigpipe [0], EV_READ);
583 ev_io_start (EV_A_ &sigev); 750 ev_io_start (EV_A_ &sigev);
584 ev_unref (EV_A); /* child watcher should not keep loop alive */ 751 ev_unref (EV_A); /* child watcher should not keep loop alive */
585} 752}
586 753
587/*****************************************************************************/ 754/*****************************************************************************/
588 755
589static struct ev_child *childs [PID_HASHSIZE]; 756static ev_child *childs [EV_PID_HASHSIZE];
590 757
591#ifndef WIN32 758#ifndef _WIN32
592 759
593static struct ev_signal childev; 760static ev_signal childev;
594 761
595#ifndef WCONTINUED 762void inline_speed
596# define WCONTINUED 0
597#endif
598
599static void
600child_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)
601{ 764{
602 struct ev_child *w; 765 ev_child *w;
603 766
604 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)
605 if (w->pid == pid || !w->pid) 768 if (w->pid == pid || !w->pid)
606 { 769 {
607 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
608 w->rpid = pid; 771 w->rpid = pid;
609 w->rstatus = status; 772 w->rstatus = status;
610 event (EV_A_ (W)w, EV_CHILD); 773 ev_feed_event (EV_A_ (W)w, EV_CHILD);
611 } 774 }
612} 775}
613 776
777#ifndef WCONTINUED
778# define WCONTINUED 0
779#endif
780
614static void 781static void
615childcb (EV_P_ struct ev_signal *sw, int revents) 782childcb (EV_P_ ev_signal *sw, int revents)
616{ 783{
617 int pid, status; 784 int pid, status;
618 785
786 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
619 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 787 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
620 { 788 if (!WCONTINUED
789 || errno != EINVAL
790 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
791 return;
792
621 /* 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 */
622 event (EV_A_ (W)sw, EV_SIGNAL); 795 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
623 796
624 child_reap (EV_A_ sw, pid, pid, status); 797 child_reap (EV_A_ sw, pid, pid, status);
798 if (EV_PID_HASHSIZE > 1)
625 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 */
626 }
627} 800}
628 801
629#endif 802#endif
630 803
631/*****************************************************************************/ 804/*****************************************************************************/
632 805
806#if EV_USE_PORT
807# include "ev_port.c"
808#endif
633#if EV_USE_KQUEUE 809#if EV_USE_KQUEUE
634# include "ev_kqueue.c" 810# include "ev_kqueue.c"
635#endif 811#endif
636#if EV_USE_EPOLL 812#if EV_USE_EPOLL
637# include "ev_epoll.c" 813# include "ev_epoll.c"
654{ 830{
655 return EV_VERSION_MINOR; 831 return EV_VERSION_MINOR;
656} 832}
657 833
658/* 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 */
659static int 835int inline_size
660enable_secure (void) 836enable_secure (void)
661{ 837{
662#ifdef WIN32 838#ifdef _WIN32
663 return 0; 839 return 0;
664#else 840#else
665 return getuid () != geteuid () 841 return getuid () != geteuid ()
666 || getgid () != getegid (); 842 || getgid () != getegid ();
667#endif 843#endif
668} 844}
669 845
670int 846unsigned int
671ev_method (EV_P) 847ev_supported_backends (void)
672{ 848{
673 return method; 849 unsigned int flags = 0;
674}
675 850
676static void 851 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
677loop_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)
678{ 862{
679 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)
680 { 896 {
681#if EV_USE_MONOTONIC 897#if EV_USE_MONOTONIC
682 { 898 {
683 struct timespec ts; 899 struct timespec ts;
684 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 900 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
685 have_monotonic = 1; 901 have_monotonic = 1;
686 } 902 }
687#endif 903#endif
688 904
689 rt_now = ev_time (); 905 ev_rt_now = ev_time ();
690 mn_now = get_clock (); 906 mn_now = get_clock ();
691 now_floor = mn_now; 907 now_floor = mn_now;
692 rtmn_diff = rt_now - mn_now; 908 rtmn_diff = ev_rt_now - mn_now;
693 909
694 if (methods == EVMETHOD_AUTO) 910 if (!(flags & EVFLAG_NOENV)
695 if (!enable_secure () && getenv ("LIBEV_METHODS")) 911 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS"))
696 methods = atoi (getenv ("LIBEV_METHODS")); 913 flags = atoi (getenv ("LIBEV_FLAGS"));
697 else
698 methods = EVMETHOD_ANY;
699 914
700 method = 0; 915 if (!(flags & 0x0000ffffUL))
916 flags |= ev_recommended_backends ();
917
918 backend = 0;
919 backend_fd = -1;
701#if EV_USE_WIN32 920#if EV_USE_INOTIFY
702 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);
703#endif 926#endif
704#if EV_USE_KQUEUE 927#if EV_USE_KQUEUE
705 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 928 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
706#endif 929#endif
707#if EV_USE_EPOLL 930#if EV_USE_EPOLL
708 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 931 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
709#endif 932#endif
710#if EV_USE_POLL 933#if EV_USE_POLL
711 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 934 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
712#endif 935#endif
713#if EV_USE_SELECT 936#if EV_USE_SELECT
714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 937 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
715#endif 938#endif
716 939
717 ev_watcher_init (&sigev, sigcb); 940 ev_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI); 941 ev_set_priority (&sigev, EV_MAXPRI);
719 } 942 }
720} 943}
721 944
722void 945static void noinline
723loop_destroy (EV_P) 946loop_destroy (EV_P)
724{ 947{
725 int i; 948 int i;
726 949
727#if EV_USE_WIN32 950#if EV_USE_INOTIFY
728 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);
729#endif 960#endif
730#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
731 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 962 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
732#endif 963#endif
733#if EV_USE_EPOLL 964#if EV_USE_EPOLL
734 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 965 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
735#endif 966#endif
736#if EV_USE_POLL 967#if EV_USE_POLL
737 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 968 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
738#endif 969#endif
739#if EV_USE_SELECT 970#if EV_USE_SELECT
740 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
741#endif 972#endif
742 973
743 for (i = NUMPRI; i--; ) 974 for (i = NUMPRI; i--; )
744 array_free (pending, [i]); 975 array_free (pending, [i]);
745 976
746 /* have to use the microsoft-never-gets-it-right macro */ 977 /* have to use the microsoft-never-gets-it-right macro */
747 array_free_microshit (fdchange); 978 array_free (fdchange, EMPTY0);
748 array_free_microshit (timer); 979 array_free (timer, EMPTY0);
749 array_free_microshit (periodic); 980#if EV_PERIODIC_ENABLE
750 array_free_microshit (idle); 981 array_free (periodic, EMPTY0);
751 array_free_microshit (prepare); 982#endif
752 array_free_microshit (check); 983 array_free (idle, EMPTY0);
984 array_free (prepare, EMPTY0);
985 array_free (check, EMPTY0);
753 986
754 method = 0; 987 backend = 0;
755} 988}
756 989
757static void 990void inline_size infy_fork (EV_P);
991
992void inline_size
758loop_fork (EV_P) 993loop_fork (EV_P)
759{ 994{
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
760#if EV_USE_EPOLL 1001#if EV_USE_EPOLL
761 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1002 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
762#endif 1003#endif
763#if EV_USE_KQUEUE 1004#if EV_USE_INOTIFY
764 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 1005 infy_fork (EV_A);
765#endif 1006#endif
766 1007
767 if (ev_is_active (&sigev)) 1008 if (ev_is_active (&sigev))
768 { 1009 {
769 /* default loop */ 1010 /* default loop */
782 postfork = 0; 1023 postfork = 0;
783} 1024}
784 1025
785#if EV_MULTIPLICITY 1026#if EV_MULTIPLICITY
786struct ev_loop * 1027struct ev_loop *
787ev_loop_new (int methods) 1028ev_loop_new (unsigned int flags)
788{ 1029{
789 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));
790 1031
791 memset (loop, 0, sizeof (struct ev_loop)); 1032 memset (loop, 0, sizeof (struct ev_loop));
792 1033
793 loop_init (EV_A_ methods); 1034 loop_init (EV_A_ flags);
794 1035
795 if (ev_method (EV_A)) 1036 if (ev_backend (EV_A))
796 return loop; 1037 return loop;
797 1038
798 return 0; 1039 return 0;
799} 1040}
800 1041
812} 1053}
813 1054
814#endif 1055#endif
815 1056
816#if EV_MULTIPLICITY 1057#if EV_MULTIPLICITY
817struct ev_loop default_loop_struct;
818static struct ev_loop *default_loop;
819
820struct ev_loop * 1058struct ev_loop *
1059ev_default_loop_init (unsigned int flags)
821#else 1060#else
822static int default_loop;
823
824int 1061int
1062ev_default_loop (unsigned int flags)
825#endif 1063#endif
826ev_default_loop (int methods)
827{ 1064{
828 if (sigpipe [0] == sigpipe [1]) 1065 if (sigpipe [0] == sigpipe [1])
829 if (pipe (sigpipe)) 1066 if (pipe (sigpipe))
830 return 0; 1067 return 0;
831 1068
832 if (!default_loop) 1069 if (!ev_default_loop_ptr)
833 { 1070 {
834#if EV_MULTIPLICITY 1071#if EV_MULTIPLICITY
835 struct ev_loop *loop = default_loop = &default_loop_struct; 1072 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
836#else 1073#else
837 default_loop = 1; 1074 ev_default_loop_ptr = 1;
838#endif 1075#endif
839 1076
840 loop_init (EV_A_ methods); 1077 loop_init (EV_A_ flags);
841 1078
842 if (ev_method (EV_A)) 1079 if (ev_backend (EV_A))
843 { 1080 {
844 siginit (EV_A); 1081 siginit (EV_A);
845 1082
846#ifndef WIN32 1083#ifndef _WIN32
847 ev_signal_init (&childev, childcb, SIGCHLD); 1084 ev_signal_init (&childev, childcb, SIGCHLD);
848 ev_set_priority (&childev, EV_MAXPRI); 1085 ev_set_priority (&childev, EV_MAXPRI);
849 ev_signal_start (EV_A_ &childev); 1086 ev_signal_start (EV_A_ &childev);
850 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1087 ev_unref (EV_A); /* child watcher should not keep loop alive */
851#endif 1088#endif
852 } 1089 }
853 else 1090 else
854 default_loop = 0; 1091 ev_default_loop_ptr = 0;
855 } 1092 }
856 1093
857 return default_loop; 1094 return ev_default_loop_ptr;
858} 1095}
859 1096
860void 1097void
861ev_default_destroy (void) 1098ev_default_destroy (void)
862{ 1099{
863#if EV_MULTIPLICITY 1100#if EV_MULTIPLICITY
864 struct ev_loop *loop = default_loop; 1101 struct ev_loop *loop = ev_default_loop_ptr;
865#endif 1102#endif
866 1103
867#ifndef WIN32 1104#ifndef _WIN32
868 ev_ref (EV_A); /* child watcher */ 1105 ev_ref (EV_A); /* child watcher */
869 ev_signal_stop (EV_A_ &childev); 1106 ev_signal_stop (EV_A_ &childev);
870#endif 1107#endif
871 1108
872 ev_ref (EV_A); /* signal watcher */ 1109 ev_ref (EV_A); /* signal watcher */
880 1117
881void 1118void
882ev_default_fork (void) 1119ev_default_fork (void)
883{ 1120{
884#if EV_MULTIPLICITY 1121#if EV_MULTIPLICITY
885 struct ev_loop *loop = default_loop; 1122 struct ev_loop *loop = ev_default_loop_ptr;
886#endif 1123#endif
887 1124
888 if (method) 1125 if (backend)
889 postfork = 1; 1126 postfork = 1;
890} 1127}
891 1128
892/*****************************************************************************/ 1129/*****************************************************************************/
893 1130
894static 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
895call_pending (EV_P) 1144call_pending (EV_P)
896{ 1145{
897 int pri; 1146 int pri;
898 1147
899 for (pri = NUMPRI; pri--; ) 1148 for (pri = NUMPRI; pri--; )
900 while (pendingcnt [pri]) 1149 while (pendingcnt [pri])
901 { 1150 {
902 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1151 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
903 1152
904 if (p->w) 1153 if (expect_true (p->w))
905 { 1154 {
1155 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1156
906 p->w->pending = 0; 1157 p->w->pending = 0;
907 p->w->cb (EV_A_ p->w, p->events); 1158 EV_CB_INVOKE (p->w, p->events);
908 } 1159 }
909 } 1160 }
910} 1161}
911 1162
912static void 1163void inline_size
913timers_reify (EV_P) 1164timers_reify (EV_P)
914{ 1165{
915 while (timercnt && ((WT)timers [0])->at <= mn_now) 1166 while (timercnt && ((WT)timers [0])->at <= mn_now)
916 { 1167 {
917 struct ev_timer *w = timers [0]; 1168 ev_timer *w = timers [0];
918 1169
919 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1170 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
920 1171
921 /* first reschedule or stop timer */ 1172 /* first reschedule or stop timer */
922 if (w->repeat) 1173 if (w->repeat)
923 { 1174 {
924 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
925 ((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
926 downheap ((WT *)timers, timercnt, 0); 1181 downheap ((WT *)timers, timercnt, 0);
927 } 1182 }
928 else 1183 else
929 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1184 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
930 1185
931 event (EV_A_ (W)w, EV_TIMEOUT); 1186 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
932 } 1187 }
933} 1188}
934 1189
935static void 1190#if EV_PERIODIC_ENABLE
1191void inline_size
936periodics_reify (EV_P) 1192periodics_reify (EV_P)
937{ 1193{
938 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1194 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
939 { 1195 {
940 struct ev_periodic *w = periodics [0]; 1196 ev_periodic *w = periodics [0];
941 1197
942 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1198 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
943 1199
944 /* first reschedule or stop timer */ 1200 /* first reschedule or stop timer */
945 if (w->interval) 1201 if (w->reschedule_cb)
946 { 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 {
947 ((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;
948 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));
949 downheap ((WT *)periodics, periodiccnt, 0); 1211 downheap ((WT *)periodics, periodiccnt, 0);
950 } 1212 }
951 else 1213 else
952 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1214 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
953 1215
954 event (EV_A_ (W)w, EV_PERIODIC); 1216 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
955 } 1217 }
956} 1218}
957 1219
958static void 1220static void noinline
959periodics_reschedule (EV_P) 1221periodics_reschedule (EV_P)
960{ 1222{
961 int i; 1223 int i;
962 1224
963 /* adjust periodics after time jump */ 1225 /* adjust periodics after time jump */
964 for (i = 0; i < periodiccnt; ++i) 1226 for (i = 0; i < periodiccnt; ++i)
965 { 1227 {
966 struct ev_periodic *w = periodics [i]; 1228 ev_periodic *w = periodics [i];
967 1229
1230 if (w->reschedule_cb)
1231 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
968 if (w->interval) 1232 else if (w->interval)
969 {
970 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;
971
972 if (fabs (diff) >= 1e-4)
973 {
974 ev_periodic_stop (EV_A_ w);
975 ev_periodic_start (EV_A_ w);
976
977 i = 0; /* restart loop, inefficient, but time jumps should be rare */
978 }
979 }
980 } 1234 }
981}
982 1235
983inline 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
984time_update_monotonic (EV_P) 1243time_update_monotonic (EV_P)
985{ 1244{
986 mn_now = get_clock (); 1245 mn_now = get_clock ();
987 1246
988 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1247 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
989 { 1248 {
990 rt_now = rtmn_diff + mn_now; 1249 ev_rt_now = rtmn_diff + mn_now;
991 return 0; 1250 return 0;
992 } 1251 }
993 else 1252 else
994 { 1253 {
995 now_floor = mn_now; 1254 now_floor = mn_now;
996 rt_now = ev_time (); 1255 ev_rt_now = ev_time ();
997 return 1; 1256 return 1;
998 } 1257 }
999} 1258}
1000 1259
1001static void 1260void inline_size
1002time_update (EV_P) 1261time_update (EV_P)
1003{ 1262{
1004 int i; 1263 int i;
1005 1264
1006#if EV_USE_MONOTONIC 1265#if EV_USE_MONOTONIC
1008 { 1267 {
1009 if (time_update_monotonic (EV_A)) 1268 if (time_update_monotonic (EV_A))
1010 { 1269 {
1011 ev_tstamp odiff = rtmn_diff; 1270 ev_tstamp odiff = rtmn_diff;
1012 1271
1013 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; )
1014 { 1281 {
1015 rtmn_diff = rt_now - mn_now; 1282 rtmn_diff = ev_rt_now - mn_now;
1016 1283
1017 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1284 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1018 return; /* all is well */ 1285 return; /* all is well */
1019 1286
1020 rt_now = ev_time (); 1287 ev_rt_now = ev_time ();
1021 mn_now = get_clock (); 1288 mn_now = get_clock ();
1022 now_floor = mn_now; 1289 now_floor = mn_now;
1023 } 1290 }
1024 1291
1292# if EV_PERIODIC_ENABLE
1025 periodics_reschedule (EV_A); 1293 periodics_reschedule (EV_A);
1294# endif
1026 /* no timer adjustment, as the monotonic clock doesn't jump */ 1295 /* no timer adjustment, as the monotonic clock doesn't jump */
1027 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1296 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1028 } 1297 }
1029 } 1298 }
1030 else 1299 else
1031#endif 1300#endif
1032 { 1301 {
1033 rt_now = ev_time (); 1302 ev_rt_now = ev_time ();
1034 1303
1035 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))
1036 { 1305 {
1306#if EV_PERIODIC_ENABLE
1037 periodics_reschedule (EV_A); 1307 periodics_reschedule (EV_A);
1308#endif
1038 1309
1039 /* 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 */
1040 for (i = 0; i < timercnt; ++i) 1311 for (i = 0; i < timercnt; ++i)
1041 ((WT)timers [i])->at += rt_now - mn_now; 1312 ((WT)timers [i])->at += ev_rt_now - mn_now;
1042 } 1313 }
1043 1314
1044 mn_now = rt_now; 1315 mn_now = ev_rt_now;
1045 } 1316 }
1046} 1317}
1047 1318
1048void 1319void
1049ev_ref (EV_P) 1320ev_ref (EV_P)
1060static int loop_done; 1331static int loop_done;
1061 1332
1062void 1333void
1063ev_loop (EV_P_ int flags) 1334ev_loop (EV_P_ int flags)
1064{ 1335{
1065 double block;
1066 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1336 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1337 ? EVUNLOOP_ONE
1338 : EVUNLOOP_CANCEL;
1067 1339
1068 do 1340 while (activecnt)
1069 { 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
1070 /* queue check watchers (and execute them) */ 1352 /* queue check watchers (and execute them) */
1071 if (expect_false (preparecnt)) 1353 if (expect_false (preparecnt))
1072 { 1354 {
1073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1355 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1074 call_pending (EV_A); 1356 call_pending (EV_A);
1080 1362
1081 /* update fd-related kernel structures */ 1363 /* update fd-related kernel structures */
1082 fd_reify (EV_A); 1364 fd_reify (EV_A);
1083 1365
1084 /* calculate blocking time */ 1366 /* calculate blocking time */
1367 {
1368 double block;
1085 1369
1086 /* we only need this for !monotonic clockor timers, but as we basically 1370 if (flags & EVLOOP_NONBLOCK || idlecnt)
1087 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 */
1088#if EV_USE_MONOTONIC 1375#if EV_USE_MONOTONIC
1089 if (expect_true (have_monotonic)) 1376 if (expect_true (have_monotonic))
1090 time_update_monotonic (EV_A); 1377 time_update_monotonic (EV_A);
1091 else 1378 else
1092#endif 1379#endif
1093 { 1380 {
1094 rt_now = ev_time (); 1381 ev_rt_now = ev_time ();
1095 mn_now = rt_now; 1382 mn_now = ev_rt_now;
1096 } 1383 }
1097 1384
1098 if (flags & EVLOOP_NONBLOCK || idlecnt)
1099 block = 0.;
1100 else
1101 {
1102 block = MAX_BLOCKTIME; 1385 block = MAX_BLOCKTIME;
1103 1386
1104 if (timercnt) 1387 if (timercnt)
1105 { 1388 {
1106 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1389 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1107 if (block > to) block = to; 1390 if (block > to) block = to;
1108 } 1391 }
1109 1392
1393#if EV_PERIODIC_ENABLE
1110 if (periodiccnt) 1394 if (periodiccnt)
1111 { 1395 {
1112 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1396 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1113 if (block > to) block = to; 1397 if (block > to) block = to;
1114 } 1398 }
1399#endif
1115 1400
1116 if (block < 0.) block = 0.; 1401 if (expect_false (block < 0.)) block = 0.;
1117 } 1402 }
1118 1403
1119 method_poll (EV_A_ block); 1404 backend_poll (EV_A_ block);
1405 }
1120 1406
1121 /* update rt_now, do magic */ 1407 /* update ev_rt_now, do magic */
1122 time_update (EV_A); 1408 time_update (EV_A);
1123 1409
1124 /* queue pending timers and reschedule them */ 1410 /* queue pending timers and reschedule them */
1125 timers_reify (EV_A); /* relative timers called last */ 1411 timers_reify (EV_A); /* relative timers called last */
1412#if EV_PERIODIC_ENABLE
1126 periodics_reify (EV_A); /* absolute timers called first */ 1413 periodics_reify (EV_A); /* absolute timers called first */
1414#endif
1127 1415
1128 /* queue idle watchers unless io or timers are pending */ 1416 /* queue idle watchers unless other events are pending */
1129 if (!pendingcnt) 1417 if (idlecnt && !any_pending (EV_A))
1130 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1418 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1131 1419
1132 /* queue check watchers, to be executed first */ 1420 /* queue check watchers, to be executed first */
1133 if (checkcnt) 1421 if (expect_false (checkcnt))
1134 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1422 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1135 1423
1136 call_pending (EV_A); 1424 call_pending (EV_A);
1137 }
1138 while (activecnt && !loop_done);
1139 1425
1140 if (loop_done != 2) 1426 if (expect_false (loop_done))
1141 loop_done = 0; 1427 break;
1428 }
1429
1430 if (loop_done == EVUNLOOP_ONE)
1431 loop_done = EVUNLOOP_CANCEL;
1142} 1432}
1143 1433
1144void 1434void
1145ev_unloop (EV_P_ int how) 1435ev_unloop (EV_P_ int how)
1146{ 1436{
1147 loop_done = how; 1437 loop_done = how;
1148} 1438}
1149 1439
1150/*****************************************************************************/ 1440/*****************************************************************************/
1151 1441
1152inline void 1442void inline_size
1153wlist_add (WL *head, WL elem) 1443wlist_add (WL *head, WL elem)
1154{ 1444{
1155 elem->next = *head; 1445 elem->next = *head;
1156 *head = elem; 1446 *head = elem;
1157} 1447}
1158 1448
1159inline void 1449void inline_size
1160wlist_del (WL *head, WL elem) 1450wlist_del (WL *head, WL elem)
1161{ 1451{
1162 while (*head) 1452 while (*head)
1163 { 1453 {
1164 if (*head == elem) 1454 if (*head == elem)
1169 1459
1170 head = &(*head)->next; 1460 head = &(*head)->next;
1171 } 1461 }
1172} 1462}
1173 1463
1174inline void 1464void inline_speed
1175ev_clear_pending (EV_P_ W w) 1465ev_clear_pending (EV_P_ W w)
1176{ 1466{
1177 if (w->pending) 1467 if (w->pending)
1178 { 1468 {
1179 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1469 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1180 w->pending = 0; 1470 w->pending = 0;
1181 } 1471 }
1182} 1472}
1183 1473
1184inline void 1474void inline_speed
1185ev_start (EV_P_ W w, int active) 1475ev_start (EV_P_ W w, int active)
1186{ 1476{
1187 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1477 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1188 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 1478 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1189 1479
1190 w->active = active; 1480 w->active = active;
1191 ev_ref (EV_A); 1481 ev_ref (EV_A);
1192} 1482}
1193 1483
1194inline void 1484void inline_size
1195ev_stop (EV_P_ W w) 1485ev_stop (EV_P_ W w)
1196{ 1486{
1197 ev_unref (EV_A); 1487 ev_unref (EV_A);
1198 w->active = 0; 1488 w->active = 0;
1199} 1489}
1200 1490
1201/*****************************************************************************/ 1491/*****************************************************************************/
1202 1492
1203void 1493void
1204ev_io_start (EV_P_ struct ev_io *w) 1494ev_io_start (EV_P_ ev_io *w)
1205{ 1495{
1206 int fd = w->fd; 1496 int fd = w->fd;
1207 1497
1208 if (ev_is_active (w)) 1498 if (expect_false (ev_is_active (w)))
1209 return; 1499 return;
1210 1500
1211 assert (("ev_io_start called with negative fd", fd >= 0)); 1501 assert (("ev_io_start called with negative fd", fd >= 0));
1212 1502
1213 ev_start (EV_A_ (W)w, 1); 1503 ev_start (EV_A_ (W)w, 1);
1214 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1504 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1215 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1505 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1216 1506
1217 fd_change (EV_A_ fd); 1507 fd_change (EV_A_ fd);
1218} 1508}
1219 1509
1220void 1510void
1221ev_io_stop (EV_P_ struct ev_io *w) 1511ev_io_stop (EV_P_ ev_io *w)
1222{ 1512{
1223 ev_clear_pending (EV_A_ (W)w); 1513 ev_clear_pending (EV_A_ (W)w);
1224 if (!ev_is_active (w)) 1514 if (expect_false (!ev_is_active (w)))
1225 return; 1515 return;
1516
1517 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1226 1518
1227 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1519 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1228 ev_stop (EV_A_ (W)w); 1520 ev_stop (EV_A_ (W)w);
1229 1521
1230 fd_change (EV_A_ w->fd); 1522 fd_change (EV_A_ w->fd);
1231} 1523}
1232 1524
1233void 1525void
1234ev_timer_start (EV_P_ struct ev_timer *w) 1526ev_timer_start (EV_P_ ev_timer *w)
1235{ 1527{
1236 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1237 return; 1529 return;
1238 1530
1239 ((WT)w)->at += mn_now; 1531 ((WT)w)->at += mn_now;
1240 1532
1241 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.));
1242 1534
1243 ev_start (EV_A_ (W)w, ++timercnt); 1535 ev_start (EV_A_ (W)w, ++timercnt);
1244 array_needsize (timers, timermax, timercnt, (void)); 1536 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1245 timers [timercnt - 1] = w; 1537 timers [timercnt - 1] = w;
1246 upheap ((WT *)timers, timercnt - 1); 1538 upheap ((WT *)timers, timercnt - 1);
1247 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
1248 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1550 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1249}
1250 1551
1251void 1552 {
1252ev_timer_stop (EV_P_ struct ev_timer *w) 1553 int active = ((W)w)->active;
1253{
1254 ev_clear_pending (EV_A_ (W)w);
1255 if (!ev_is_active (w))
1256 return;
1257 1554
1258 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1555 if (expect_true (--active < --timercnt))
1259
1260 if (((W)w)->active < timercnt--)
1261 { 1556 {
1262 timers [((W)w)->active - 1] = timers [timercnt]; 1557 timers [active] = timers [timercnt];
1263 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1558 adjustheap ((WT *)timers, timercnt, active);
1264 } 1559 }
1560 }
1265 1561
1266 ((WT)w)->at = w->repeat; 1562 ((WT)w)->at -= mn_now;
1267 1563
1268 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1269} 1565}
1270 1566
1271void 1567void
1272ev_timer_again (EV_P_ struct ev_timer *w) 1568ev_timer_again (EV_P_ ev_timer *w)
1273{ 1569{
1274 if (ev_is_active (w)) 1570 if (ev_is_active (w))
1275 { 1571 {
1276 if (w->repeat) 1572 if (w->repeat)
1277 { 1573 {
1278 ((WT)w)->at = mn_now + w->repeat; 1574 ((WT)w)->at = mn_now + w->repeat;
1279 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1575 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1280 } 1576 }
1281 else 1577 else
1282 ev_timer_stop (EV_A_ w); 1578 ev_timer_stop (EV_A_ w);
1283 } 1579 }
1284 else if (w->repeat) 1580 else if (w->repeat)
1581 {
1582 w->at = w->repeat;
1285 ev_timer_start (EV_A_ w); 1583 ev_timer_start (EV_A_ w);
1584 }
1286} 1585}
1287 1586
1587#if EV_PERIODIC_ENABLE
1288void 1588void
1289ev_periodic_start (EV_P_ struct ev_periodic *w) 1589ev_periodic_start (EV_P_ ev_periodic *w)
1290{ 1590{
1291 if (ev_is_active (w)) 1591 if (expect_false (ev_is_active (w)))
1292 return; 1592 return;
1293 1593
1594 if (w->reschedule_cb)
1595 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1596 else if (w->interval)
1597 {
1294 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.));
1295
1296 /* 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 */
1297 if (w->interval)
1298 ((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 }
1299 1602
1300 ev_start (EV_A_ (W)w, ++periodiccnt); 1603 ev_start (EV_A_ (W)w, ++periodiccnt);
1301 array_needsize (periodics, periodicmax, periodiccnt, (void)); 1604 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1302 periodics [periodiccnt - 1] = w; 1605 periodics [periodiccnt - 1] = w;
1303 upheap ((WT *)periodics, periodiccnt - 1); 1606 upheap ((WT *)periodics, periodiccnt - 1);
1304 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
1305 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1618 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1306}
1307 1619
1308void 1620 {
1309ev_periodic_stop (EV_P_ struct ev_periodic *w) 1621 int active = ((W)w)->active;
1310{
1311 ev_clear_pending (EV_A_ (W)w);
1312 if (!ev_is_active (w))
1313 return;
1314 1622
1315 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1623 if (expect_true (--active < --periodiccnt))
1316
1317 if (((W)w)->active < periodiccnt--)
1318 { 1624 {
1319 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1625 periodics [active] = periodics [periodiccnt];
1320 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1626 adjustheap ((WT *)periodics, periodiccnt, active);
1321 } 1627 }
1628 }
1322 1629
1323 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1324} 1631}
1325 1632
1326void 1633void
1327ev_idle_start (EV_P_ struct ev_idle *w) 1634ev_periodic_again (EV_P_ ev_periodic *w)
1328{ 1635{
1329 if (ev_is_active (w)) 1636 /* TODO: use adjustheap and recalculation */
1330 return;
1331
1332 ev_start (EV_A_ (W)w, ++idlecnt);
1333 array_needsize (idles, idlemax, idlecnt, (void));
1334 idles [idlecnt - 1] = w;
1335}
1336
1337void
1338ev_idle_stop (EV_P_ struct ev_idle *w)
1339{
1340 ev_clear_pending (EV_A_ (W)w);
1341 if (ev_is_active (w))
1342 return;
1343
1344 idles [((W)w)->active - 1] = idles [--idlecnt];
1345 ev_stop (EV_A_ (W)w); 1637 ev_periodic_stop (EV_A_ w);
1638 ev_periodic_start (EV_A_ w);
1346} 1639}
1347 1640#endif
1348void
1349ev_prepare_start (EV_P_ struct ev_prepare *w)
1350{
1351 if (ev_is_active (w))
1352 return;
1353
1354 ev_start (EV_A_ (W)w, ++preparecnt);
1355 array_needsize (prepares, preparemax, preparecnt, (void));
1356 prepares [preparecnt - 1] = w;
1357}
1358
1359void
1360ev_prepare_stop (EV_P_ struct ev_prepare *w)
1361{
1362 ev_clear_pending (EV_A_ (W)w);
1363 if (ev_is_active (w))
1364 return;
1365
1366 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1367 ev_stop (EV_A_ (W)w);
1368}
1369
1370void
1371ev_check_start (EV_P_ struct ev_check *w)
1372{
1373 if (ev_is_active (w))
1374 return;
1375
1376 ev_start (EV_A_ (W)w, ++checkcnt);
1377 array_needsize (checks, checkmax, checkcnt, (void));
1378 checks [checkcnt - 1] = w;
1379}
1380
1381void
1382ev_check_stop (EV_P_ struct ev_check *w)
1383{
1384 ev_clear_pending (EV_A_ (W)w);
1385 if (ev_is_active (w))
1386 return;
1387
1388 checks [((W)w)->active - 1] = checks [--checkcnt];
1389 ev_stop (EV_A_ (W)w);
1390}
1391 1641
1392#ifndef SA_RESTART 1642#ifndef SA_RESTART
1393# define SA_RESTART 0 1643# define SA_RESTART 0
1394#endif 1644#endif
1395 1645
1396void 1646void
1397ev_signal_start (EV_P_ struct ev_signal *w) 1647ev_signal_start (EV_P_ ev_signal *w)
1398{ 1648{
1399#if EV_MULTIPLICITY 1649#if EV_MULTIPLICITY
1400 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));
1401#endif 1651#endif
1402 if (ev_is_active (w)) 1652 if (expect_false (ev_is_active (w)))
1403 return; 1653 return;
1404 1654
1405 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));
1406 1656
1407 ev_start (EV_A_ (W)w, 1); 1657 ev_start (EV_A_ (W)w, 1);
1408 array_needsize (signals, signalmax, w->signum, signals_init); 1658 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1659 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1410 1660
1411 if (!((WL)w)->next) 1661 if (!((WL)w)->next)
1412 { 1662 {
1413#if WIN32 1663#if _WIN32
1414 signal (w->signum, sighandler); 1664 signal (w->signum, sighandler);
1415#else 1665#else
1416 struct sigaction sa; 1666 struct sigaction sa;
1417 sa.sa_handler = sighandler; 1667 sa.sa_handler = sighandler;
1418 sigfillset (&sa.sa_mask); 1668 sigfillset (&sa.sa_mask);
1421#endif 1671#endif
1422 } 1672 }
1423} 1673}
1424 1674
1425void 1675void
1426ev_signal_stop (EV_P_ struct ev_signal *w) 1676ev_signal_stop (EV_P_ ev_signal *w)
1427{ 1677{
1428 ev_clear_pending (EV_A_ (W)w); 1678 ev_clear_pending (EV_A_ (W)w);
1429 if (!ev_is_active (w)) 1679 if (expect_false (!ev_is_active (w)))
1430 return; 1680 return;
1431 1681
1432 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1682 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1433 ev_stop (EV_A_ (W)w); 1683 ev_stop (EV_A_ (W)w);
1434 1684
1435 if (!signals [w->signum - 1].head) 1685 if (!signals [w->signum - 1].head)
1436 signal (w->signum, SIG_DFL); 1686 signal (w->signum, SIG_DFL);
1437} 1687}
1438 1688
1439void 1689void
1440ev_child_start (EV_P_ struct ev_child *w) 1690ev_child_start (EV_P_ ev_child *w)
1441{ 1691{
1442#if EV_MULTIPLICITY 1692#if EV_MULTIPLICITY
1443 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));
1444#endif 1694#endif
1445 if (ev_is_active (w)) 1695 if (expect_false (ev_is_active (w)))
1446 return; 1696 return;
1447 1697
1448 ev_start (EV_A_ (W)w, 1); 1698 ev_start (EV_A_ (W)w, 1);
1449 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1699 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1450} 1700}
1451 1701
1452void 1702void
1453ev_child_stop (EV_P_ struct ev_child *w) 1703ev_child_stop (EV_P_ ev_child *w)
1454{ 1704{
1455 ev_clear_pending (EV_A_ (W)w); 1705 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w)) 1706 if (expect_false (!ev_is_active (w)))
1457 return; 1707 return;
1458 1708
1459 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1709 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1460 ev_stop (EV_A_ (W)w); 1710 ev_stop (EV_A_ (W)w);
1461} 1711}
1462 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
1463/*****************************************************************************/ 2111/*****************************************************************************/
1464 2112
1465struct ev_once 2113struct ev_once
1466{ 2114{
1467 struct ev_io io; 2115 ev_io io;
1468 struct ev_timer to; 2116 ev_timer to;
1469 void (*cb)(int revents, void *arg); 2117 void (*cb)(int revents, void *arg);
1470 void *arg; 2118 void *arg;
1471}; 2119};
1472 2120
1473static void 2121static void
1482 2130
1483 cb (revents, arg); 2131 cb (revents, arg);
1484} 2132}
1485 2133
1486static void 2134static void
1487once_cb_io (EV_P_ struct ev_io *w, int revents) 2135once_cb_io (EV_P_ ev_io *w, int revents)
1488{ 2136{
1489 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);
1490} 2138}
1491 2139
1492static void 2140static void
1493once_cb_to (EV_P_ struct ev_timer *w, int revents) 2141once_cb_to (EV_P_ ev_timer *w, int revents)
1494{ 2142{
1495 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);
1496} 2144}
1497 2145
1498void 2146void
1499ev_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)
1500{ 2148{
1501 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 2149 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1502 2150
1503 if (!once) 2151 if (expect_false (!once))
2152 {
1504 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 2153 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1505 else 2154 return;
1506 { 2155 }
2156
1507 once->cb = cb; 2157 once->cb = cb;
1508 once->arg = arg; 2158 once->arg = arg;
1509 2159
1510 ev_watcher_init (&once->io, once_cb_io); 2160 ev_init (&once->io, once_cb_io);
1511 if (fd >= 0) 2161 if (fd >= 0)
1512 { 2162 {
1513 ev_io_set (&once->io, fd, events); 2163 ev_io_set (&once->io, fd, events);
1514 ev_io_start (EV_A_ &once->io); 2164 ev_io_start (EV_A_ &once->io);
1515 } 2165 }
1516 2166
1517 ev_watcher_init (&once->to, once_cb_to); 2167 ev_init (&once->to, once_cb_to);
1518 if (timeout >= 0.) 2168 if (timeout >= 0.)
1519 { 2169 {
1520 ev_timer_set (&once->to, timeout, 0.); 2170 ev_timer_set (&once->to, timeout, 0.);
1521 ev_timer_start (EV_A_ &once->to); 2171 ev_timer_start (EV_A_ &once->to);
1522 }
1523 } 2172 }
1524} 2173}
1525 2174
2175#ifdef __cplusplus
2176}
2177#endif
2178

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines