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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines