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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines