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

Comparing libev/ev.c (file contents):
Revision 1.69 by root, Tue Nov 6 00:10:04 2007 UTC vs.
Revision 1.122 by root, Sat Nov 17 02:00:48 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
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 44# define EV_USE_REALTIME 1
45# endif
37# endif 46# endif
38 47
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
40# define EV_USE_SELECT 1 49# define EV_USE_SELECT 1
41# endif 50# endif
42 51
43# if HAVE_POLL && HAVE_POLL_H 52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
44# define EV_USE_POLL 1 53# define EV_USE_POLL 1
45# endif 54# endif
46 55
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
48# define EV_USE_EPOLL 1 57# define EV_USE_EPOLL 1
49# endif 58# endif
50 59
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
52# define EV_USE_KQUEUE 1 61# define EV_USE_KQUEUE 1
53# endif 62# endif
54 63
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
66# endif
67
55#endif 68#endif
56 69
57#include <math.h> 70#include <math.h>
58#include <stdlib.h> 71#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 72#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 73#include <stddef.h>
63 74
64#include <stdio.h> 75#include <stdio.h>
65 76
66#include <assert.h> 77#include <assert.h>
67#include <errno.h> 78#include <errno.h>
68#include <sys/types.h> 79#include <sys/types.h>
80#include <time.h>
81
82#include <signal.h>
83
69#ifndef WIN32 84#ifndef _WIN32
85# include <unistd.h>
86# include <sys/time.h>
70# include <sys/wait.h> 87# include <sys/wait.h>
88#else
89# define WIN32_LEAN_AND_MEAN
90# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1
71#endif 93# endif
72#include <sys/time.h> 94#endif
73#include <time.h>
74 95
75/**/ 96/**/
76 97
77#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
79#endif 104#endif
80 105
81#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
83#endif 108#endif
84 109
85#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 111# ifdef _WIN32
112# define EV_USE_POLL 0
113# else
114# define EV_USE_POLL 1
115# endif
87#endif 116#endif
88 117
89#ifndef EV_USE_EPOLL 118#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 119# define EV_USE_EPOLL 0
91#endif 120#endif
92 121
93#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
95#endif 124#endif
96 125
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
103#endif
104
105#ifndef EV_USE_REALTIME 126#ifndef EV_USE_PORT
106# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
107#endif 128#endif
108 129
109/**/ 130/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
110 137
111#ifndef CLOCK_MONOTONIC 138#ifndef CLOCK_MONOTONIC
112# undef EV_USE_MONOTONIC 139# undef EV_USE_MONOTONIC
113# define EV_USE_MONOTONIC 0 140# define EV_USE_MONOTONIC 0
114#endif 141#endif
116#ifndef CLOCK_REALTIME 143#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 144# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 145# define EV_USE_REALTIME 0
119#endif 146#endif
120 147
148#if EV_SELECT_IS_WINSOCKET
149# include <winsock.h>
150#endif
151
121/**/ 152/**/
122 153
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 155#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 156#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127 158
159#ifdef EV_H
160# include EV_H
161#else
128#include "ev.h" 162# include "ev.h"
163#endif
129 164
130#if __GNUC__ >= 3 165#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 167# define inline inline
133#else 168#else
139#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
140 175
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 178
179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
181
144typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
145typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
147 185
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 186static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 187
150#if WIN32 188#ifdef _WIN32
151/* note: the comment below could not be substantiated, but what would I care */ 189# include "ev_win32.c"
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif 190#endif
155 191
156/*****************************************************************************/ 192/*****************************************************************************/
157 193
158static void (*syserr_cb)(void); 194static void (*syserr_cb)(const char *msg);
159 195
160void ev_set_syserr_cb (void (*cb)(void)) 196void ev_set_syserr_cb (void (*cb)(const char *msg))
161{ 197{
162 syserr_cb = cb; 198 syserr_cb = cb;
163} 199}
164 200
165static void 201static void
166syserr (void) 202syserr (const char *msg)
167{ 203{
204 if (!msg)
205 msg = "(libev) system error";
206
168 if (syserr_cb) 207 if (syserr_cb)
169 syserr_cb (); 208 syserr_cb (msg);
170 else 209 else
171 { 210 {
172 perror ("libev"); 211 perror (msg);
173 abort (); 212 abort ();
174 } 213 }
175} 214}
176 215
177static void *(*alloc)(void *ptr, long size); 216static void *(*alloc)(void *ptr, long size);
203typedef struct 242typedef struct
204{ 243{
205 WL head; 244 WL head;
206 unsigned char events; 245 unsigned char events;
207 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
208} ANFD; 250} ANFD;
209 251
210typedef struct 252typedef struct
211{ 253{
212 W w; 254 W w;
213 int events; 255 int events;
214} ANPENDING; 256} ANPENDING;
215 257
216#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
217 259
218struct ev_loop 260 struct ev_loop
219{ 261 {
262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
220# define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
221# include "ev_vars.h" 265 #include "ev_vars.h"
222};
223# undef VAR 266 #undef VAR
267 };
224# include "ev_wrap.h" 268 #include "ev_wrap.h"
269
270 static struct ev_loop default_loop_struct;
271 struct ev_loop *ev_default_loop_ptr;
225 272
226#else 273#else
227 274
275 ev_tstamp ev_rt_now;
228# define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
229# include "ev_vars.h" 277 #include "ev_vars.h"
230# undef VAR 278 #undef VAR
279
280 static int ev_default_loop_ptr;
231 281
232#endif 282#endif
233 283
234/*****************************************************************************/ 284/*****************************************************************************/
235 285
236inline ev_tstamp 286ev_tstamp
237ev_time (void) 287ev_time (void)
238{ 288{
239#if EV_USE_REALTIME 289#if EV_USE_REALTIME
240 struct timespec ts; 290 struct timespec ts;
241 clock_gettime (CLOCK_REALTIME, &ts); 291 clock_gettime (CLOCK_REALTIME, &ts);
260#endif 310#endif
261 311
262 return ev_time (); 312 return ev_time ();
263} 313}
264 314
315#if EV_MULTIPLICITY
265ev_tstamp 316ev_tstamp
266ev_now (EV_P) 317ev_now (EV_P)
267{ 318{
268 return rt_now; 319 return ev_rt_now;
269} 320}
321#endif
270 322
271#define array_roundsize(base,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
272 324
273#define array_needsize(base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
274 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
275 { \ 327 { \
276 int newcnt = cur; \ 328 int newcnt = cur; \
277 do \ 329 do \
278 { \ 330 { \
279 newcnt = array_roundsize (base, newcnt << 1); \ 331 newcnt = array_roundsize (type, newcnt << 1); \
280 } \ 332 } \
281 while ((cnt) > newcnt); \ 333 while ((cnt) > newcnt); \
282 \ 334 \
283 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 335 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
284 init (base + cur, newcnt - cur); \ 336 init (base + cur, newcnt - cur); \
285 cur = newcnt; \ 337 cur = newcnt; \
286 } 338 }
287 339
288#define array_slim(stem) \ 340#define array_slim(type,stem) \
289 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 341 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
290 { \ 342 { \
291 stem ## max = array_roundsize (stem ## cnt >> 1); \ 343 stem ## max = array_roundsize (stem ## cnt >> 1); \
292 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
293 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
294 } 346 }
295 347
296#define array_free(stem, idx) \ 348#define array_free(stem, idx) \
297 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 349 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
309 361
310 ++base; 362 ++base;
311 } 363 }
312} 364}
313 365
314static void 366void
315event (EV_P_ W w, int events) 367ev_feed_event (EV_P_ void *w, int revents)
316{ 368{
369 W w_ = (W)w;
370
317 if (w->pending) 371 if (w_->pending)
318 { 372 {
319 pendings [ABSPRI (w)][w->pending - 1].events |= events; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
320 return; 374 return;
321 } 375 }
322 376
323 w->pending = ++pendingcnt [ABSPRI (w)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
324 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
325 pendings [ABSPRI (w)][w->pending - 1].w = w; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
326 pendings [ABSPRI (w)][w->pending - 1].events = events; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
327} 381}
328 382
329static void 383static void
330queue_events (EV_P_ W *events, int eventcnt, int type) 384queue_events (EV_P_ W *events, int eventcnt, int type)
331{ 385{
332 int i; 386 int i;
333 387
334 for (i = 0; i < eventcnt; ++i) 388 for (i = 0; i < eventcnt; ++i)
335 event (EV_A_ events [i], type); 389 ev_feed_event (EV_A_ events [i], type);
336} 390}
337 391
338static void 392inline void
339fd_event (EV_P_ int fd, int events) 393fd_event (EV_P_ int fd, int revents)
340{ 394{
341 ANFD *anfd = anfds + fd; 395 ANFD *anfd = anfds + fd;
342 struct ev_io *w; 396 struct ev_io *w;
343 397
344 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 398 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
345 { 399 {
346 int ev = w->events & events; 400 int ev = w->events & revents;
347 401
348 if (ev) 402 if (ev)
349 event (EV_A_ (W)w, ev); 403 ev_feed_event (EV_A_ (W)w, ev);
350 } 404 }
405}
406
407void
408ev_feed_fd_event (EV_P_ int fd, int revents)
409{
410 fd_event (EV_A_ fd, revents);
351} 411}
352 412
353/*****************************************************************************/ 413/*****************************************************************************/
354 414
355static void 415static void
366 int events = 0; 426 int events = 0;
367 427
368 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 428 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
369 events |= w->events; 429 events |= w->events;
370 430
431#if EV_SELECT_IS_WINSOCKET
432 if (events)
433 {
434 unsigned long argp;
435 anfd->handle = _get_osfhandle (fd);
436 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
437 }
438#endif
439
371 anfd->reify = 0; 440 anfd->reify = 0;
372 441
373 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
374 anfd->events = events; 443 anfd->events = events;
375 } 444 }
378} 447}
379 448
380static void 449static void
381fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
382{ 451{
383 if (anfds [fd].reify || fdchangecnt < 0) 452 if (anfds [fd].reify)
384 return; 453 return;
385 454
386 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
387 456
388 ++fdchangecnt; 457 ++fdchangecnt;
389 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
390 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
391} 460}
392 461
393static void 462static void
394fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
396 struct ev_io *w; 465 struct ev_io *w;
397 466
398 while ((w = (struct ev_io *)anfds [fd].head)) 467 while ((w = (struct ev_io *)anfds [fd].head))
399 { 468 {
400 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
401 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
402 } 471 }
472}
473
474static int
475fd_valid (int fd)
476{
477#ifdef _WIN32
478 return _get_osfhandle (fd) != -1;
479#else
480 return fcntl (fd, F_GETFD) != -1;
481#endif
403} 482}
404 483
405/* called on EBADF to verify fds */ 484/* called on EBADF to verify fds */
406static void 485static void
407fd_ebadf (EV_P) 486fd_ebadf (EV_P)
408{ 487{
409 int fd; 488 int fd;
410 489
411 for (fd = 0; fd < anfdmax; ++fd) 490 for (fd = 0; fd < anfdmax; ++fd)
412 if (anfds [fd].events) 491 if (anfds [fd].events)
413 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 492 if (!fd_valid (fd) == -1 && errno == EBADF)
414 fd_kill (EV_A_ fd); 493 fd_kill (EV_A_ fd);
415} 494}
416 495
417/* called on ENOMEM in select/poll to kill some fds and retry */ 496/* called on ENOMEM in select/poll to kill some fds and retry */
418static void 497static void
426 fd_kill (EV_A_ fd); 505 fd_kill (EV_A_ fd);
427 return; 506 return;
428 } 507 }
429} 508}
430 509
431/* susually called after fork if method needs to re-arm all fds from scratch */ 510/* usually called after fork if method needs to re-arm all fds from scratch */
432static void 511static void
433fd_rearm_all (EV_P) 512fd_rearm_all (EV_P)
434{ 513{
435 int fd; 514 int fd;
436 515
484 563
485 heap [k] = w; 564 heap [k] = w;
486 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
487} 566}
488 567
568inline void
569adjustheap (WT *heap, int N, int k)
570{
571 upheap (heap, k);
572 downheap (heap, N, k);
573}
574
489/*****************************************************************************/ 575/*****************************************************************************/
490 576
491typedef struct 577typedef struct
492{ 578{
493 WL head; 579 WL head;
514} 600}
515 601
516static void 602static void
517sighandler (int signum) 603sighandler (int signum)
518{ 604{
519#if WIN32 605#if _WIN32
520 signal (signum, sighandler); 606 signal (signum, sighandler);
521#endif 607#endif
522 608
523 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
524 610
529 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
530 errno = old_errno; 616 errno = old_errno;
531 } 617 }
532} 618}
533 619
620void
621ev_feed_signal_event (EV_P_ int signum)
622{
623 WL w;
624
625#if EV_MULTIPLICITY
626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
627#endif
628
629 --signum;
630
631 if (signum < 0 || signum >= signalmax)
632 return;
633
634 signals [signum].gotsig = 0;
635
636 for (w = signals [signum].head; w; w = w->next)
637 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
638}
639
534static void 640static void
535sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
536{ 642{
537 WL w;
538 int signum; 643 int signum;
539 644
540 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
541 gotsig = 0; 646 gotsig = 0;
542 647
543 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
544 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
545 { 650 ev_feed_signal_event (EV_A_ signum + 1);
546 signals [signum].gotsig = 0; 651}
547 652
548 for (w = signals [signum].head; w; w = w->next) 653inline void
549 event (EV_A_ (W)w, EV_SIGNAL); 654fd_intern (int fd)
550 } 655{
656#ifdef _WIN32
657 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
659#else
660 fcntl (fd, F_SETFD, FD_CLOEXEC);
661 fcntl (fd, F_SETFL, O_NONBLOCK);
662#endif
551} 663}
552 664
553static void 665static void
554siginit (EV_P) 666siginit (EV_P)
555{ 667{
556#ifndef WIN32 668 fd_intern (sigpipe [0]);
557 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 fd_intern (sigpipe [1]);
558 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
559
560 /* rather than sort out wether we really need nb, set it */
561 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
562 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
563#endif
564 670
565 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
566 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
567 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
568} 674}
569 675
570/*****************************************************************************/ 676/*****************************************************************************/
571 677
572#ifndef WIN32
573
574static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
679
680#ifndef _WIN32
681
575static struct ev_signal childev; 682static struct ev_signal childev;
576 683
577#ifndef WCONTINUED 684#ifndef WCONTINUED
578# define WCONTINUED 0 685# define WCONTINUED 0
579#endif 686#endif
587 if (w->pid == pid || !w->pid) 694 if (w->pid == pid || !w->pid)
588 { 695 {
589 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 696 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
590 w->rpid = pid; 697 w->rpid = pid;
591 w->rstatus = status; 698 w->rstatus = status;
592 event (EV_A_ (W)w, EV_CHILD); 699 ev_feed_event (EV_A_ (W)w, EV_CHILD);
593 } 700 }
594} 701}
595 702
596static void 703static void
597childcb (EV_P_ struct ev_signal *sw, int revents) 704childcb (EV_P_ struct ev_signal *sw, int revents)
599 int pid, status; 706 int pid, status;
600 707
601 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
602 { 709 {
603 /* make sure we are called again until all childs have been reaped */ 710 /* make sure we are called again until all childs have been reaped */
604 event (EV_A_ (W)sw, EV_SIGNAL); 711 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
605 712
606 child_reap (EV_A_ sw, pid, pid, status); 713 child_reap (EV_A_ sw, pid, pid, status);
607 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 714 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
608 } 715 }
609} 716}
610 717
611#endif 718#endif
612 719
613/*****************************************************************************/ 720/*****************************************************************************/
614 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
615#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
616# include "ev_kqueue.c" 726# include "ev_kqueue.c"
617#endif 727#endif
618#if EV_USE_EPOLL 728#if EV_USE_EPOLL
619# include "ev_epoll.c" 729# include "ev_epoll.c"
639 749
640/* return true if we are running with elevated privileges and should ignore env variables */ 750/* return true if we are running with elevated privileges and should ignore env variables */
641static int 751static int
642enable_secure (void) 752enable_secure (void)
643{ 753{
644#ifdef WIN32 754#ifdef _WIN32
645 return 0; 755 return 0;
646#else 756#else
647 return getuid () != geteuid () 757 return getuid () != geteuid ()
648 || getgid () != getegid (); 758 || getgid () != getegid ();
649#endif 759#endif
650} 760}
651 761
652int 762unsigned int
653ev_method (EV_P) 763ev_method (EV_P)
654{ 764{
655 return method; 765 return method;
656} 766}
657 767
658static void 768static void
659loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
660{ 770{
661 if (!method) 771 if (!method)
662 { 772 {
663#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
664 { 774 {
666 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 776 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
667 have_monotonic = 1; 777 have_monotonic = 1;
668 } 778 }
669#endif 779#endif
670 780
671 rt_now = ev_time (); 781 ev_rt_now = ev_time ();
672 mn_now = get_clock (); 782 mn_now = get_clock ();
673 now_floor = mn_now; 783 now_floor = mn_now;
674 rtmn_diff = rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
675 785
676 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
677 if (!enable_secure () && getenv ("LIBEV_METHODS"))
678 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
679 else 788
680 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
681 791
682 method = 0; 792 method = 0;
683#if EV_USE_WIN32 793#if EV_USE_PORT
684 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
685#endif 795#endif
686#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
687 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
688#endif 798#endif
689#if EV_USE_EPOLL 799#if EV_USE_EPOLL
690 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
691#endif 801#endif
692#if EV_USE_POLL 802#if EV_USE_POLL
693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
694#endif 804#endif
695#if EV_USE_SELECT 805#if EV_USE_SELECT
696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
697#endif 807#endif
808
809 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI);
698 } 811 }
699} 812}
700 813
701void 814void
702loop_destroy (EV_P) 815loop_destroy (EV_P)
703{ 816{
704 int i; 817 int i;
705 818
706#if EV_USE_WIN32 819#if EV_USE_PORT
707 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
708#endif 821#endif
709#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
710 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
711#endif 824#endif
712#if EV_USE_EPOLL 825#if EV_USE_EPOLL
720#endif 833#endif
721 834
722 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
723 array_free (pending, [i]); 836 array_free (pending, [i]);
724 837
838 /* have to use the microsoft-never-gets-it-right macro */
725 array_free (fdchange, ); 839 array_free (fdchange, EMPTY0);
726 array_free (timer, ); 840 array_free (timer, EMPTY0);
841#if EV_PERIODICS
727 array_free (periodic, ); 842 array_free (periodic, EMPTY0);
843#endif
728 array_free (idle, ); 844 array_free (idle, EMPTY0);
729 array_free (prepare, ); 845 array_free (prepare, EMPTY0);
730 array_free (check, ); 846 array_free (check, EMPTY0);
731 847
732 method = 0; 848 method = 0;
733 /*TODO*/
734} 849}
735 850
736void 851static void
737loop_fork (EV_P) 852loop_fork (EV_P)
738{ 853{
739 /*TODO*/ 854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
740#if EV_USE_EPOLL 860#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
742#endif 862#endif
743#if EV_USE_KQUEUE 863
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 864 if (ev_is_active (&sigev))
745#endif 865 {
866 /* default loop */
867
868 ev_ref (EV_A);
869 ev_io_stop (EV_A_ &sigev);
870 close (sigpipe [0]);
871 close (sigpipe [1]);
872
873 while (pipe (sigpipe))
874 syserr ("(libev) error creating pipe");
875
876 siginit (EV_A);
877 }
878
879 postfork = 0;
746} 880}
747 881
748#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
749struct ev_loop * 883struct ev_loop *
750ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
751{ 885{
752 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 886 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
753 887
754 memset (loop, 0, sizeof (struct ev_loop)); 888 memset (loop, 0, sizeof (struct ev_loop));
755 889
756 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
757 891
758 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
759 return loop; 893 return loop;
760 894
761 return 0; 895 return 0;
769} 903}
770 904
771void 905void
772ev_loop_fork (EV_P) 906ev_loop_fork (EV_P)
773{ 907{
774 loop_fork (EV_A); 908 postfork = 1;
775} 909}
776 910
777#endif 911#endif
778 912
779#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
780struct ev_loop default_loop_struct;
781static struct ev_loop *default_loop;
782
783struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
784#else 916#else
785static int default_loop;
786
787int 917int
918ev_default_loop (unsigned int flags)
788#endif 919#endif
789ev_default_loop (int methods)
790{ 920{
791 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
792 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
793 return 0; 923 return 0;
794 924
795 if (!default_loop) 925 if (!ev_default_loop_ptr)
796 { 926 {
797#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
798 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
799#else 929#else
800 default_loop = 1; 930 ev_default_loop_ptr = 1;
801#endif 931#endif
802 932
803 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
804 934
805 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
806 { 936 {
807 ev_watcher_init (&sigev, sigcb);
808 ev_set_priority (&sigev, EV_MAXPRI);
809 siginit (EV_A); 937 siginit (EV_A);
810 938
811#ifndef WIN32 939#ifndef _WIN32
812 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
813 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
814 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
815 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
816#endif 944#endif
817 } 945 }
818 else 946 else
819 default_loop = 0; 947 ev_default_loop_ptr = 0;
820 } 948 }
821 949
822 return default_loop; 950 return ev_default_loop_ptr;
823} 951}
824 952
825void 953void
826ev_default_destroy (void) 954ev_default_destroy (void)
827{ 955{
828#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
829 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
830#endif 958#endif
831 959
960#ifndef _WIN32
832 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
963#endif
834 964
835 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev); 966 ev_io_stop (EV_A_ &sigev);
837 967
838 close (sigpipe [0]); sigpipe [0] = 0; 968 close (sigpipe [0]); sigpipe [0] = 0;
843 973
844void 974void
845ev_default_fork (void) 975ev_default_fork (void)
846{ 976{
847#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
849#endif 979#endif
850 980
851 loop_fork (EV_A); 981 if (method)
852 982 postfork = 1;
853 ev_io_stop (EV_A_ &sigev);
854 close (sigpipe [0]);
855 close (sigpipe [1]);
856 pipe (sigpipe);
857
858 ev_ref (EV_A); /* signal watcher */
859 siginit (EV_A);
860} 983}
861 984
862/*****************************************************************************/ 985/*****************************************************************************/
863 986
864static void 987static int
988any_pending (EV_P)
989{
990 int pri;
991
992 for (pri = NUMPRI; pri--; )
993 if (pendingcnt [pri])
994 return 1;
995
996 return 0;
997}
998
999inline void
865call_pending (EV_P) 1000call_pending (EV_P)
866{ 1001{
867 int pri; 1002 int pri;
868 1003
869 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
870 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
871 { 1006 {
872 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
873 1008
874 if (p->w) 1009 if (expect_true (p->w))
875 { 1010 {
876 p->w->pending = 0; 1011 p->w->pending = 0;
877 p->w->cb (EV_A_ p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
878 } 1013 }
879 } 1014 }
880} 1015}
881 1016
882static void 1017static void
890 1025
891 /* first reschedule or stop timer */ 1026 /* first reschedule or stop timer */
892 if (w->repeat) 1027 if (w->repeat)
893 { 1028 {
894 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1029 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1030
895 ((WT)w)->at = mn_now + w->repeat; 1031 ((WT)w)->at += w->repeat;
1032 if (((WT)w)->at < mn_now)
1033 ((WT)w)->at = mn_now;
1034
896 downheap ((WT *)timers, timercnt, 0); 1035 downheap ((WT *)timers, timercnt, 0);
897 } 1036 }
898 else 1037 else
899 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1038 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
900 1039
901 event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
902 } 1041 }
903} 1042}
904 1043
1044#if EV_PERIODICS
905static void 1045static void
906periodics_reify (EV_P) 1046periodics_reify (EV_P)
907{ 1047{
908 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
909 { 1049 {
910 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
911 1051
912 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
913 1053
914 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
915 if (w->interval) 1055 if (w->reschedule_cb)
916 { 1056 {
1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1059 downheap ((WT *)periodics, periodiccnt, 0);
1060 }
1061 else if (w->interval)
1062 {
917 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1063 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
918 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1064 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
919 downheap ((WT *)periodics, periodiccnt, 0); 1065 downheap ((WT *)periodics, periodiccnt, 0);
920 } 1066 }
921 else 1067 else
922 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1068 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
923 1069
924 event (EV_A_ (W)w, EV_PERIODIC); 1070 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
925 } 1071 }
926} 1072}
927 1073
928static void 1074static void
929periodics_reschedule (EV_P) 1075periodics_reschedule (EV_P)
933 /* adjust periodics after time jump */ 1079 /* adjust periodics after time jump */
934 for (i = 0; i < periodiccnt; ++i) 1080 for (i = 0; i < periodiccnt; ++i)
935 { 1081 {
936 struct ev_periodic *w = periodics [i]; 1082 struct ev_periodic *w = periodics [i];
937 1083
1084 if (w->reschedule_cb)
1085 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
938 if (w->interval) 1086 else if (w->interval)
939 {
940 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1087 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
941
942 if (fabs (diff) >= 1e-4)
943 {
944 ev_periodic_stop (EV_A_ w);
945 ev_periodic_start (EV_A_ w);
946
947 i = 0; /* restart loop, inefficient, but time jumps should be rare */
948 }
949 }
950 } 1088 }
1089
1090 /* now rebuild the heap */
1091 for (i = periodiccnt >> 1; i--; )
1092 downheap ((WT *)periodics, periodiccnt, i);
951} 1093}
1094#endif
952 1095
953inline int 1096inline int
954time_update_monotonic (EV_P) 1097time_update_monotonic (EV_P)
955{ 1098{
956 mn_now = get_clock (); 1099 mn_now = get_clock ();
957 1100
958 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1101 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
959 { 1102 {
960 rt_now = rtmn_diff + mn_now; 1103 ev_rt_now = rtmn_diff + mn_now;
961 return 0; 1104 return 0;
962 } 1105 }
963 else 1106 else
964 { 1107 {
965 now_floor = mn_now; 1108 now_floor = mn_now;
966 rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
967 return 1; 1110 return 1;
968 } 1111 }
969} 1112}
970 1113
971static void 1114static void
980 { 1123 {
981 ev_tstamp odiff = rtmn_diff; 1124 ev_tstamp odiff = rtmn_diff;
982 1125
983 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1126 for (i = 4; --i; ) /* loop a few times, before making important decisions */
984 { 1127 {
985 rtmn_diff = rt_now - mn_now; 1128 rtmn_diff = ev_rt_now - mn_now;
986 1129
987 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1130 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
988 return; /* all is well */ 1131 return; /* all is well */
989 1132
990 rt_now = ev_time (); 1133 ev_rt_now = ev_time ();
991 mn_now = get_clock (); 1134 mn_now = get_clock ();
992 now_floor = mn_now; 1135 now_floor = mn_now;
993 } 1136 }
994 1137
1138# if EV_PERIODICS
995 periodics_reschedule (EV_A); 1139 periodics_reschedule (EV_A);
1140# endif
996 /* no timer adjustment, as the monotonic clock doesn't jump */ 1141 /* no timer adjustment, as the monotonic clock doesn't jump */
997 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
998 } 1143 }
999 } 1144 }
1000 else 1145 else
1001#endif 1146#endif
1002 { 1147 {
1003 rt_now = ev_time (); 1148 ev_rt_now = ev_time ();
1004 1149
1005 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1150 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1006 { 1151 {
1152#if EV_PERIODICS
1007 periodics_reschedule (EV_A); 1153 periodics_reschedule (EV_A);
1154#endif
1008 1155
1009 /* adjust timers. this is easy, as the offset is the same for all */ 1156 /* adjust timers. this is easy, as the offset is the same for all */
1010 for (i = 0; i < timercnt; ++i) 1157 for (i = 0; i < timercnt; ++i)
1011 ((WT)timers [i])->at += rt_now - mn_now; 1158 ((WT)timers [i])->at += ev_rt_now - mn_now;
1012 } 1159 }
1013 1160
1014 mn_now = rt_now; 1161 mn_now = ev_rt_now;
1015 } 1162 }
1016} 1163}
1017 1164
1018void 1165void
1019ev_ref (EV_P) 1166ev_ref (EV_P)
1033ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
1034{ 1181{
1035 double block; 1182 double block;
1036 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
1037 1184
1038 do 1185 while (activecnt)
1039 { 1186 {
1040 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
1041 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
1042 { 1189 {
1043 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1044 call_pending (EV_A); 1191 call_pending (EV_A);
1045 } 1192 }
1046 1193
1194 /* we might have forked, so reify kernel state if necessary */
1195 if (expect_false (postfork))
1196 loop_fork (EV_A);
1197
1047 /* update fd-related kernel structures */ 1198 /* update fd-related kernel structures */
1048 fd_reify (EV_A); 1199 fd_reify (EV_A);
1049 1200
1050 /* calculate blocking time */ 1201 /* calculate blocking time */
1051 1202
1052 /* we only need this for !monotonic clockor timers, but as we basically 1203 /* we only need this for !monotonic clock or timers, but as we basically
1053 always have timers, we just calculate it always */ 1204 always have timers, we just calculate it always */
1054#if EV_USE_MONOTONIC 1205#if EV_USE_MONOTONIC
1055 if (expect_true (have_monotonic)) 1206 if (expect_true (have_monotonic))
1056 time_update_monotonic (EV_A); 1207 time_update_monotonic (EV_A);
1057 else 1208 else
1058#endif 1209#endif
1059 { 1210 {
1060 rt_now = ev_time (); 1211 ev_rt_now = ev_time ();
1061 mn_now = rt_now; 1212 mn_now = ev_rt_now;
1062 } 1213 }
1063 1214
1064 if (flags & EVLOOP_NONBLOCK || idlecnt) 1215 if (flags & EVLOOP_NONBLOCK || idlecnt)
1065 block = 0.; 1216 block = 0.;
1066 else 1217 else
1071 { 1222 {
1072 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1073 if (block > to) block = to; 1224 if (block > to) block = to;
1074 } 1225 }
1075 1226
1227#if EV_PERIODICS
1076 if (periodiccnt) 1228 if (periodiccnt)
1077 { 1229 {
1078 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1079 if (block > to) block = to; 1231 if (block > to) block = to;
1080 } 1232 }
1233#endif
1081 1234
1082 if (block < 0.) block = 0.; 1235 if (block < 0.) block = 0.;
1083 } 1236 }
1084 1237
1085 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1086 1239
1087 /* update rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
1088 time_update (EV_A); 1241 time_update (EV_A);
1089 1242
1090 /* queue pending timers and reschedule them */ 1243 /* queue pending timers and reschedule them */
1091 timers_reify (EV_A); /* relative timers called last */ 1244 timers_reify (EV_A); /* relative timers called last */
1245#if EV_PERIODICS
1092 periodics_reify (EV_A); /* absolute timers called first */ 1246 periodics_reify (EV_A); /* absolute timers called first */
1247#endif
1093 1248
1094 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1095 if (!pendingcnt) 1250 if (idlecnt && !any_pending (EV_A))
1096 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1097 1252
1098 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1099 if (checkcnt) 1254 if (checkcnt)
1100 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1101 1256
1102 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (loop_done)
1260 break;
1103 } 1261 }
1104 while (activecnt && !loop_done);
1105 1262
1106 if (loop_done != 2) 1263 if (loop_done != 2)
1107 loop_done = 0; 1264 loop_done = 0;
1108} 1265}
1109 1266
1175 return; 1332 return;
1176 1333
1177 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1178 1335
1179 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
1180 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1337 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1181 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1338 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1182 1339
1183 fd_change (EV_A_ fd); 1340 fd_change (EV_A_ fd);
1184} 1341}
1185 1342
1188{ 1345{
1189 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1190 if (!ev_is_active (w)) 1347 if (!ev_is_active (w))
1191 return; 1348 return;
1192 1349
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351
1193 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1194 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1195 1354
1196 fd_change (EV_A_ w->fd); 1355 fd_change (EV_A_ w->fd);
1197} 1356}
1205 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1206 1365
1207 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1208 1367
1209 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1210 array_needsize (timers, timermax, timercnt, ); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1211 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1212 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1213 1372
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1215} 1374}
1224 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1225 1384
1226 if (((W)w)->active < timercnt--) 1385 if (((W)w)->active < timercnt--)
1227 { 1386 {
1228 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1229 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1230 } 1389 }
1231 1390
1232 ((WT)w)->at = w->repeat; 1391 ((WT)w)->at -= mn_now;
1233 1392
1234 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
1235} 1394}
1236 1395
1237void 1396void
1240 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1241 { 1400 {
1242 if (w->repeat) 1401 if (w->repeat)
1243 { 1402 {
1244 ((WT)w)->at = mn_now + w->repeat; 1403 ((WT)w)->at = mn_now + w->repeat;
1245 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1246 } 1405 }
1247 else 1406 else
1248 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1249 } 1408 }
1250 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1251 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1252} 1414}
1253 1415
1416#if EV_PERIODICS
1254void 1417void
1255ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1256{ 1419{
1257 if (ev_is_active (w)) 1420 if (ev_is_active (w))
1258 return; 1421 return;
1259 1422
1423 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval)
1426 {
1260 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1427 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1261
1262 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* this formula differs from the one in periodic_reify because we do not always round up */
1263 if (w->interval)
1264 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1430 }
1265 1431
1266 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1267 array_needsize (periodics, periodicmax, periodiccnt, ); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1268 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1269 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1270 1436
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1272} 1438}
1281 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1282 1448
1283 if (((W)w)->active < periodiccnt--) 1449 if (((W)w)->active < periodiccnt--)
1284 { 1450 {
1285 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1286 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1287 } 1453 }
1288 1454
1289 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1290} 1456}
1291 1457
1292void 1458void
1459ev_periodic_again (EV_P_ struct ev_periodic *w)
1460{
1461 /* TODO: use adjustheap and recalculation */
1462 ev_periodic_stop (EV_A_ w);
1463 ev_periodic_start (EV_A_ w);
1464}
1465#endif
1466
1467void
1293ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1294{ 1469{
1295 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1296 return; 1471 return;
1297 1472
1298 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, ); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1300 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1301} 1476}
1302 1477
1303void 1478void
1304ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1305{ 1480{
1306 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1307 if (ev_is_active (w)) 1482 if (!ev_is_active (w))
1308 return; 1483 return;
1309 1484
1310 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1311 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1312} 1487}
1316{ 1491{
1317 if (ev_is_active (w)) 1492 if (ev_is_active (w))
1318 return; 1493 return;
1319 1494
1320 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, ); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1322 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1323} 1498}
1324 1499
1325void 1500void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1327{ 1502{
1328 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1329 if (ev_is_active (w)) 1504 if (!ev_is_active (w))
1330 return; 1505 return;
1331 1506
1332 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1333 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1334} 1509}
1338{ 1513{
1339 if (ev_is_active (w)) 1514 if (ev_is_active (w))
1340 return; 1515 return;
1341 1516
1342 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, ); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1344 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1345} 1520}
1346 1521
1347void 1522void
1348ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1349{ 1524{
1350 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1351 if (ev_is_active (w)) 1526 if (!ev_is_active (w))
1352 return; 1527 return;
1353 1528
1354 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1355 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1356} 1531}
1361 1536
1362void 1537void
1363ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1364{ 1539{
1365#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1366 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1367#endif 1542#endif
1368 if (ev_is_active (w)) 1543 if (ev_is_active (w))
1369 return; 1544 return;
1370 1545
1371 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1372 1547
1373 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
1374 array_needsize (signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1376 1551
1377 if (!((WL)w)->next) 1552 if (!((WL)w)->next)
1378 { 1553 {
1379#if WIN32 1554#if _WIN32
1380 signal (w->signum, sighandler); 1555 signal (w->signum, sighandler);
1381#else 1556#else
1382 struct sigaction sa; 1557 struct sigaction sa;
1383 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1384 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
1404 1579
1405void 1580void
1406ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1407{ 1582{
1408#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1409 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1410#endif 1585#endif
1411 if (ev_is_active (w)) 1586 if (ev_is_active (w))
1412 return; 1587 return;
1413 1588
1414 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
1417 1592
1418void 1593void
1419ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1420{ 1595{
1421 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1422 if (ev_is_active (w)) 1597 if (!ev_is_active (w))
1423 return; 1598 return;
1424 1599
1425 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1426 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1427} 1602}
1462} 1637}
1463 1638
1464void 1639void
1465ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1466{ 1641{
1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1468 1643
1469 if (!once) 1644 if (!once)
1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1471 else 1646 else
1472 { 1647 {
1473 once->cb = cb; 1648 once->cb = cb;
1474 once->arg = arg; 1649 once->arg = arg;
1475 1650
1476 ev_watcher_init (&once->io, once_cb_io); 1651 ev_init (&once->io, once_cb_io);
1477 if (fd >= 0) 1652 if (fd >= 0)
1478 { 1653 {
1479 ev_io_set (&once->io, fd, events); 1654 ev_io_set (&once->io, fd, events);
1480 ev_io_start (EV_A_ &once->io); 1655 ev_io_start (EV_A_ &once->io);
1481 } 1656 }
1482 1657
1483 ev_watcher_init (&once->to, once_cb_to); 1658 ev_init (&once->to, once_cb_to);
1484 if (timeout >= 0.) 1659 if (timeout >= 0.)
1485 { 1660 {
1486 ev_timer_set (&once->to, timeout, 0.); 1661 ev_timer_set (&once->to, timeout, 0.);
1487 ev_timer_start (EV_A_ &once->to); 1662 ev_timer_start (EV_A_ &once->to);
1488 } 1663 }
1489 } 1664 }
1490} 1665}
1491 1666
1667#ifdef __cplusplus
1668}
1669#endif
1670

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines