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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines