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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines