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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines