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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 2007 UTC vs.
Revision 1.107 by root, Mon Nov 12 01:20:25 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines