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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines