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

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

Diff Legend

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