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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines