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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines