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

Comparing libev/ev.c (file contents):
Revision 1.57 by root, Sun Nov 4 16:43:53 2007 UTC vs.
Revision 1.113 by root, Mon Nov 12 08:00:05 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_USEV_POLL 103#ifndef EV_USE_POLL
64# define EV_USEV_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;
411 577
412static int sigpipe [2]; 578static int sigpipe [2];
413static sig_atomic_t volatile gotsig; 579static sig_atomic_t volatile gotsig;
580static struct ev_io sigev;
414 581
415static void 582static void
416signals_init (ANSIG *base, int count) 583signals_init (ANSIG *base, int count)
417{ 584{
418 while (count--) 585 while (count--)
425} 592}
426 593
427static void 594static void
428sighandler (int signum) 595sighandler (int signum)
429{ 596{
597#if _WIN32
598 signal (signum, sighandler);
599#endif
600
430 signals [signum - 1].gotsig = 1; 601 signals [signum - 1].gotsig = 1;
431 602
432 if (!gotsig) 603 if (!gotsig)
433 { 604 {
434 int old_errno = errno; 605 int old_errno = errno;
436 write (sigpipe [1], &signum, 1); 607 write (sigpipe [1], &signum, 1);
437 errno = old_errno; 608 errno = old_errno;
438 } 609 }
439} 610}
440 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
441static void 632static void
442sigcb (EV_P_ struct ev_io *iow, int revents) 633sigcb (EV_P_ struct ev_io *iow, int revents)
443{ 634{
444 struct ev_watcher_list *w;
445 int signum; 635 int signum;
446 636
447 read (sigpipe [0], &revents, 1); 637 read (sigpipe [0], &revents, 1);
448 gotsig = 0; 638 gotsig = 0;
449 639
450 for (signum = signalmax; signum--; ) 640 for (signum = signalmax; signum--; )
451 if (signals [signum].gotsig) 641 if (signals [signum].gotsig)
452 { 642 ev_feed_signal_event (EV_A_ signum + 1);
453 signals [signum].gotsig = 0; 643}
454 644
455 for (w = signals [signum].head; w; w = w->next) 645inline void
456 event (EV_A_ (W)w, EV_SIGNAL); 646fd_intern (int fd)
457 } 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
458} 655}
459 656
460static void 657static void
461siginit (EV_P) 658siginit (EV_P)
462{ 659{
463#ifndef WIN32 660 fd_intern (sigpipe [0]);
464 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 661 fd_intern (sigpipe [1]);
465 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
466
467 /* rather than sort out wether we really need nb, set it */
468 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
469 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
470#endif
471 662
472 ev_io_set (&sigev, sigpipe [0], EV_READ); 663 ev_io_set (&sigev, sigpipe [0], EV_READ);
473 ev_io_start (EV_A_ &sigev); 664 ev_io_start (EV_A_ &sigev);
474 ev_unref (EV_A); /* child watcher should not keep loop alive */ 665 ev_unref (EV_A); /* child watcher should not keep loop alive */
475} 666}
476 667
477/*****************************************************************************/ 668/*****************************************************************************/
478 669
670static struct ev_child *childs [PID_HASHSIZE];
671
479#ifndef WIN32 672#ifndef _WIN32
673
674static struct ev_signal childev;
480 675
481#ifndef WCONTINUED 676#ifndef WCONTINUED
482# define WCONTINUED 0 677# define WCONTINUED 0
483#endif 678#endif
484 679
488 struct ev_child *w; 683 struct ev_child *w;
489 684
490 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)
491 if (w->pid == pid || !w->pid) 686 if (w->pid == pid || !w->pid)
492 { 687 {
493 w->priority = sw->priority; /* need to do it *now* */ 688 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
494 w->rpid = pid; 689 w->rpid = pid;
495 w->rstatus = status; 690 w->rstatus = status;
496 event (EV_A_ (W)w, EV_CHILD); 691 ev_feed_event (EV_A_ (W)w, EV_CHILD);
497 } 692 }
498} 693}
499 694
500static void 695static void
501childcb (EV_P_ struct ev_signal *sw, int revents) 696childcb (EV_P_ struct ev_signal *sw, int revents)
503 int pid, status; 698 int pid, status;
504 699
505 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 700 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
506 { 701 {
507 /* 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 */
508 event (EV_A_ (W)sw, EV_SIGNAL); 703 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
509 704
510 child_reap (EV_A_ sw, pid, pid, status); 705 child_reap (EV_A_ sw, pid, pid, status);
511 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 */
512 } 707 }
513} 708}
520# include "ev_kqueue.c" 715# include "ev_kqueue.c"
521#endif 716#endif
522#if EV_USE_EPOLL 717#if EV_USE_EPOLL
523# include "ev_epoll.c" 718# include "ev_epoll.c"
524#endif 719#endif
525#if EV_USEV_POLL 720#if EV_USE_POLL
526# include "ev_poll.c" 721# include "ev_poll.c"
527#endif 722#endif
528#if EV_USE_SELECT 723#if EV_USE_SELECT
529# include "ev_select.c" 724# include "ev_select.c"
530#endif 725#endif
543 738
544/* 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 */
545static int 740static int
546enable_secure (void) 741enable_secure (void)
547{ 742{
548#ifdef WIN32 743#ifdef _WIN32
549 return 0; 744 return 0;
550#else 745#else
551 return getuid () != geteuid () 746 return getuid () != geteuid ()
552 || getgid () != getegid (); 747 || getgid () != getegid ();
553#endif 748#endif
554} 749}
555 750
556int 751unsigned int
557ev_method (EV_P) 752ev_method (EV_P)
558{ 753{
559 return method; 754 return method;
560} 755}
561 756
562static void 757static void
563loop_init (EV_P_ int methods) 758loop_init (EV_P_ unsigned int flags)
564{ 759{
565 if (!method) 760 if (!method)
566 { 761 {
567#if EV_USE_MONOTONIC 762#if EV_USE_MONOTONIC
568 { 763 {
570 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 765 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
571 have_monotonic = 1; 766 have_monotonic = 1;
572 } 767 }
573#endif 768#endif
574 769
575 rt_now = ev_time (); 770 ev_rt_now = ev_time ();
576 mn_now = get_clock (); 771 mn_now = get_clock ();
577 now_floor = mn_now; 772 now_floor = mn_now;
578 rtmn_diff = rt_now - mn_now; 773 rtmn_diff = ev_rt_now - mn_now;
579 774
580 if (methods == EVMETHOD_AUTO) 775 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
581 if (!enable_secure () && getenv ("LIBEV_METHODS"))
582 methods = atoi (getenv ("LIBEV_METHODS")); 776 flags = atoi (getenv ("LIBEV_FLAGS"));
583 else 777
584 methods = EVMETHOD_ANY; 778 if (!(flags & 0x0000ffff))
779 flags |= 0x0000ffff;
585 780
586 method = 0; 781 method = 0;
587#if EV_USE_KQUEUE 782#if EV_USE_KQUEUE
588 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 783 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
589#endif 784#endif
590#if EV_USE_EPOLL 785#if EV_USE_EPOLL
591 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 786 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
592#endif 787#endif
593#if EV_USEV_POLL 788#if EV_USE_POLL
594 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 789 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
595#endif 790#endif
596#if EV_USE_SELECT 791#if EV_USE_SELECT
597 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 792 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
598#endif 793#endif
794
795 ev_init (&sigev, sigcb);
796 ev_set_priority (&sigev, EV_MAXPRI);
599 } 797 }
600} 798}
601 799
602void 800void
603loop_destroy (EV_P) 801loop_destroy (EV_P)
604{ 802{
803 int i;
804
605#if EV_USE_KQUEUE 805#if EV_USE_KQUEUE
606 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 806 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
607#endif 807#endif
608#if EV_USE_EPOLL 808#if EV_USE_EPOLL
609 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 809 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
610#endif 810#endif
611#if EV_USEV_POLL 811#if EV_USE_POLL
612 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 812 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
613#endif 813#endif
614#if EV_USE_SELECT 814#if EV_USE_SELECT
615 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 815 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
616#endif 816#endif
617 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
618 method = 0; 831 method = 0;
619 /*TODO*/
620} 832}
621 833
622void 834static void
623loop_fork (EV_P) 835loop_fork (EV_P)
624{ 836{
625 /*TODO*/
626#if EV_USE_EPOLL 837#if EV_USE_EPOLL
627 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 838 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
628#endif 839#endif
629#if EV_USE_KQUEUE 840#if EV_USE_KQUEUE
630 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 841 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
631#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;
632} 860}
633 861
634#if EV_MULTIPLICITY 862#if EV_MULTIPLICITY
635struct ev_loop * 863struct ev_loop *
636ev_loop_new (int methods) 864ev_loop_new (unsigned int flags)
637{ 865{
638 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));
639 867
868 memset (loop, 0, sizeof (struct ev_loop));
869
640 loop_init (EV_A_ methods); 870 loop_init (EV_A_ flags);
641 871
642 if (ev_methods (EV_A)) 872 if (ev_method (EV_A))
643 return loop; 873 return loop;
644 874
645 return 0; 875 return 0;
646} 876}
647 877
648void 878void
649ev_loop_destroy (EV_P) 879ev_loop_destroy (EV_P)
650{ 880{
651 loop_destroy (EV_A); 881 loop_destroy (EV_A);
652 free (loop); 882 ev_free (loop);
653} 883}
654 884
655void 885void
656ev_loop_fork (EV_P) 886ev_loop_fork (EV_P)
657{ 887{
658 loop_fork (EV_A); 888 postfork = 1;
659} 889}
660 890
661#endif 891#endif
662 892
663#if EV_MULTIPLICITY 893#if EV_MULTIPLICITY
664struct ev_loop default_loop_struct;
665static struct ev_loop *default_loop;
666
667struct ev_loop * 894struct ev_loop *
668#else 895#else
669static int default_loop;
670
671int 896int
672#endif 897#endif
673ev_default_loop (int methods) 898ev_default_loop (unsigned int flags)
674{ 899{
675 if (sigpipe [0] == sigpipe [1]) 900 if (sigpipe [0] == sigpipe [1])
676 if (pipe (sigpipe)) 901 if (pipe (sigpipe))
677 return 0; 902 return 0;
678 903
682 struct ev_loop *loop = default_loop = &default_loop_struct; 907 struct ev_loop *loop = default_loop = &default_loop_struct;
683#else 908#else
684 default_loop = 1; 909 default_loop = 1;
685#endif 910#endif
686 911
687 loop_init (EV_A_ methods); 912 loop_init (EV_A_ flags);
688 913
689 if (ev_method (EV_A)) 914 if (ev_method (EV_A))
690 { 915 {
691 ev_watcher_init (&sigev, sigcb);
692 ev_set_priority (&sigev, EV_MAXPRI);
693 siginit (EV_A); 916 siginit (EV_A);
694 917
695#ifndef WIN32 918#ifndef _WIN32
696 ev_signal_init (&childev, childcb, SIGCHLD); 919 ev_signal_init (&childev, childcb, SIGCHLD);
697 ev_set_priority (&childev, EV_MAXPRI); 920 ev_set_priority (&childev, EV_MAXPRI);
698 ev_signal_start (EV_A_ &childev); 921 ev_signal_start (EV_A_ &childev);
699 ev_unref (EV_A); /* child watcher should not keep loop alive */ 922 ev_unref (EV_A); /* child watcher should not keep loop alive */
700#endif 923#endif
711{ 934{
712#if EV_MULTIPLICITY 935#if EV_MULTIPLICITY
713 struct ev_loop *loop = default_loop; 936 struct ev_loop *loop = default_loop;
714#endif 937#endif
715 938
939#ifndef _WIN32
716 ev_ref (EV_A); /* child watcher */ 940 ev_ref (EV_A); /* child watcher */
717 ev_signal_stop (EV_A_ &childev); 941 ev_signal_stop (EV_A_ &childev);
942#endif
718 943
719 ev_ref (EV_A); /* signal watcher */ 944 ev_ref (EV_A); /* signal watcher */
720 ev_io_stop (EV_A_ &sigev); 945 ev_io_stop (EV_A_ &sigev);
721 946
722 close (sigpipe [0]); sigpipe [0] = 0; 947 close (sigpipe [0]); sigpipe [0] = 0;
724 949
725 loop_destroy (EV_A); 950 loop_destroy (EV_A);
726} 951}
727 952
728void 953void
729ev_default_fork (EV_P) 954ev_default_fork (void)
730{ 955{
731 loop_fork (EV_A); 956#if EV_MULTIPLICITY
957 struct ev_loop *loop = default_loop;
958#endif
732 959
733 ev_io_stop (EV_A_ &sigev); 960 if (method)
734 close (sigpipe [0]); 961 postfork = 1;
735 close (sigpipe [1]);
736 pipe (sigpipe);
737
738 ev_ref (EV_A); /* signal watcher */
739 siginit (EV_A);
740} 962}
741 963
742/*****************************************************************************/ 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}
743 977
744static void 978static void
745call_pending (EV_P) 979call_pending (EV_P)
746{ 980{
747 int pri; 981 int pri;
752 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 986 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
753 987
754 if (p->w) 988 if (p->w)
755 { 989 {
756 p->w->pending = 0; 990 p->w->pending = 0;
757 p->w->cb (EV_A_ p->w, p->events); 991 EV_CB_INVOKE (p->w, p->events);
758 } 992 }
759 } 993 }
760} 994}
761 995
762static void 996static void
763timers_reify (EV_P) 997timers_reify (EV_P)
764{ 998{
765 while (timercnt && timers [0]->at <= mn_now) 999 while (timercnt && ((WT)timers [0])->at <= mn_now)
766 { 1000 {
767 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)));
768 1004
769 /* first reschedule or stop timer */ 1005 /* first reschedule or stop timer */
770 if (w->repeat) 1006 if (w->repeat)
771 { 1007 {
772 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
773 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
774 downheap ((WT *)timers, timercnt, 0); 1014 downheap ((WT *)timers, timercnt, 0);
775 } 1015 }
776 else 1016 else
777 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1017 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
778 1018
779 event (EV_A_ (W)w, EV_TIMEOUT); 1019 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
780 } 1020 }
781} 1021}
782 1022
1023#if EV_PERIODICS
783static void 1024static void
784periodics_reify (EV_P) 1025periodics_reify (EV_P)
785{ 1026{
786 while (periodiccnt && periodics [0]->at <= rt_now) 1027 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
787 { 1028 {
788 struct ev_periodic *w = periodics [0]; 1029 struct ev_periodic *w = periodics [0];
789 1030
1031 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1032
790 /* first reschedule or stop timer */ 1033 /* first reschedule or stop timer */
791 if (w->interval) 1034 if (w->reschedule_cb)
792 { 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 {
793 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;
794 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));
795 downheap ((WT *)periodics, periodiccnt, 0); 1044 downheap ((WT *)periodics, periodiccnt, 0);
796 } 1045 }
797 else 1046 else
798 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1047 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
799 1048
800 event (EV_A_ (W)w, EV_PERIODIC); 1049 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
801 } 1050 }
802} 1051}
803 1052
804static void 1053static void
805periodics_reschedule (EV_P) 1054periodics_reschedule (EV_P)
809 /* adjust periodics after time jump */ 1058 /* adjust periodics after time jump */
810 for (i = 0; i < periodiccnt; ++i) 1059 for (i = 0; i < periodiccnt; ++i)
811 { 1060 {
812 struct ev_periodic *w = periodics [i]; 1061 struct ev_periodic *w = periodics [i];
813 1062
1063 if (w->reschedule_cb)
1064 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
814 if (w->interval) 1065 else if (w->interval)
815 {
816 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;
817
818 if (fabs (diff) >= 1e-4)
819 {
820 ev_periodic_stop (EV_A_ w);
821 ev_periodic_start (EV_A_ w);
822
823 i = 0; /* restart loop, inefficient, but time jumps should be rare */
824 }
825 }
826 } 1067 }
1068
1069 /* now rebuild the heap */
1070 for (i = periodiccnt >> 1; i--; )
1071 downheap ((WT *)periodics, periodiccnt, i);
827} 1072}
1073#endif
828 1074
829inline int 1075inline int
830time_update_monotonic (EV_P) 1076time_update_monotonic (EV_P)
831{ 1077{
832 mn_now = get_clock (); 1078 mn_now = get_clock ();
833 1079
834 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1080 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
835 { 1081 {
836 rt_now = rtmn_diff + mn_now; 1082 ev_rt_now = rtmn_diff + mn_now;
837 return 0; 1083 return 0;
838 } 1084 }
839 else 1085 else
840 { 1086 {
841 now_floor = mn_now; 1087 now_floor = mn_now;
842 rt_now = ev_time (); 1088 ev_rt_now = ev_time ();
843 return 1; 1089 return 1;
844 } 1090 }
845} 1091}
846 1092
847static void 1093static void
856 { 1102 {
857 ev_tstamp odiff = rtmn_diff; 1103 ev_tstamp odiff = rtmn_diff;
858 1104
859 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 */
860 { 1106 {
861 rtmn_diff = rt_now - mn_now; 1107 rtmn_diff = ev_rt_now - mn_now;
862 1108
863 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1109 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
864 return; /* all is well */ 1110 return; /* all is well */
865 1111
866 rt_now = ev_time (); 1112 ev_rt_now = ev_time ();
867 mn_now = get_clock (); 1113 mn_now = get_clock ();
868 now_floor = mn_now; 1114 now_floor = mn_now;
869 } 1115 }
870 1116
1117# if EV_PERIODICS
871 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119# endif
872 /* no timer adjustment, as the monotonic clock doesn't jump */ 1120 /* no timer adjustment, as the monotonic clock doesn't jump */
873 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1121 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
874 } 1122 }
875 } 1123 }
876 else 1124 else
877#endif 1125#endif
878 { 1126 {
879 rt_now = ev_time (); 1127 ev_rt_now = ev_time ();
880 1128
881 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))
882 { 1130 {
1131#if EV_PERIODICS
883 periodics_reschedule (EV_A); 1132 periodics_reschedule (EV_A);
1133#endif
884 1134
885 /* 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 */
886 for (i = 0; i < timercnt; ++i) 1136 for (i = 0; i < timercnt; ++i)
887 timers [i]->at += rt_now - mn_now; 1137 ((WT)timers [i])->at += ev_rt_now - mn_now;
888 } 1138 }
889 1139
890 mn_now = rt_now; 1140 mn_now = ev_rt_now;
891 } 1141 }
892} 1142}
893 1143
894void 1144void
895ev_ref (EV_P) 1145ev_ref (EV_P)
918 { 1168 {
919 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1169 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
920 call_pending (EV_A); 1170 call_pending (EV_A);
921 } 1171 }
922 1172
1173 /* we might have forked, so reify kernel state if necessary */
1174 if (expect_false (postfork))
1175 loop_fork (EV_A);
1176
923 /* update fd-related kernel structures */ 1177 /* update fd-related kernel structures */
924 fd_reify (EV_A); 1178 fd_reify (EV_A);
925 1179
926 /* calculate blocking time */ 1180 /* calculate blocking time */
927 1181
928 /* 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
929 always have timers, we just calculate it always */ 1183 always have timers, we just calculate it always */
930#if EV_USE_MONOTONIC 1184#if EV_USE_MONOTONIC
931 if (expect_true (have_monotonic)) 1185 if (expect_true (have_monotonic))
932 time_update_monotonic (EV_A); 1186 time_update_monotonic (EV_A);
933 else 1187 else
934#endif 1188#endif
935 { 1189 {
936 rt_now = ev_time (); 1190 ev_rt_now = ev_time ();
937 mn_now = rt_now; 1191 mn_now = ev_rt_now;
938 } 1192 }
939 1193
940 if (flags & EVLOOP_NONBLOCK || idlecnt) 1194 if (flags & EVLOOP_NONBLOCK || idlecnt)
941 block = 0.; 1195 block = 0.;
942 else 1196 else
943 { 1197 {
944 block = MAX_BLOCKTIME; 1198 block = MAX_BLOCKTIME;
945 1199
946 if (timercnt) 1200 if (timercnt)
947 { 1201 {
948 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1202 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
949 if (block > to) block = to; 1203 if (block > to) block = to;
950 } 1204 }
951 1205
1206#if EV_PERIODICS
952 if (periodiccnt) 1207 if (periodiccnt)
953 { 1208 {
954 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1209 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
955 if (block > to) block = to; 1210 if (block > to) block = to;
956 } 1211 }
1212#endif
957 1213
958 if (block < 0.) block = 0.; 1214 if (block < 0.) block = 0.;
959 } 1215 }
960 1216
961 method_poll (EV_A_ block); 1217 method_poll (EV_A_ block);
962 1218
963 /* update rt_now, do magic */ 1219 /* update ev_rt_now, do magic */
964 time_update (EV_A); 1220 time_update (EV_A);
965 1221
966 /* queue pending timers and reschedule them */ 1222 /* queue pending timers and reschedule them */
967 timers_reify (EV_A); /* relative timers called last */ 1223 timers_reify (EV_A); /* relative timers called last */
1224#if EV_PERIODICS
968 periodics_reify (EV_A); /* absolute timers called first */ 1225 periodics_reify (EV_A); /* absolute timers called first */
1226#endif
969 1227
970 /* queue idle watchers unless io or timers are pending */ 1228 /* queue idle watchers unless io or timers are pending */
971 if (!pendingcnt) 1229 if (idlecnt && !any_pending (EV_A))
972 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1230 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
973 1231
974 /* queue check watchers, to be executed first */ 1232 /* queue check watchers, to be executed first */
975 if (checkcnt) 1233 if (checkcnt)
976 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1234 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1051 return; 1309 return;
1052 1310
1053 assert (("ev_io_start called with negative fd", fd >= 0)); 1311 assert (("ev_io_start called with negative fd", fd >= 0));
1054 1312
1055 ev_start (EV_A_ (W)w, 1); 1313 ev_start (EV_A_ (W)w, 1);
1056 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1314 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1057 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1315 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1058 1316
1059 fd_change (EV_A_ fd); 1317 fd_change (EV_A_ fd);
1060} 1318}
1061 1319
1064{ 1322{
1065 ev_clear_pending (EV_A_ (W)w); 1323 ev_clear_pending (EV_A_ (W)w);
1066 if (!ev_is_active (w)) 1324 if (!ev_is_active (w))
1067 return; 1325 return;
1068 1326
1327 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1328
1069 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1329 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1070 ev_stop (EV_A_ (W)w); 1330 ev_stop (EV_A_ (W)w);
1071 1331
1072 fd_change (EV_A_ w->fd); 1332 fd_change (EV_A_ w->fd);
1073} 1333}
1076ev_timer_start (EV_P_ struct ev_timer *w) 1336ev_timer_start (EV_P_ struct ev_timer *w)
1077{ 1337{
1078 if (ev_is_active (w)) 1338 if (ev_is_active (w))
1079 return; 1339 return;
1080 1340
1081 w->at += mn_now; 1341 ((WT)w)->at += mn_now;
1082 1342
1083 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.));
1084 1344
1085 ev_start (EV_A_ (W)w, ++timercnt); 1345 ev_start (EV_A_ (W)w, ++timercnt);
1086 array_needsize (timers, timermax, timercnt, ); 1346 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1087 timers [timercnt - 1] = w; 1347 timers [timercnt - 1] = w;
1088 upheap ((WT *)timers, timercnt - 1); 1348 upheap ((WT *)timers, timercnt - 1);
1349
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1089} 1351}
1090 1352
1091void 1353void
1092ev_timer_stop (EV_P_ struct ev_timer *w) 1354ev_timer_stop (EV_P_ struct ev_timer *w)
1093{ 1355{
1094 ev_clear_pending (EV_A_ (W)w); 1356 ev_clear_pending (EV_A_ (W)w);
1095 if (!ev_is_active (w)) 1357 if (!ev_is_active (w))
1096 return; 1358 return;
1097 1359
1360 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1361
1098 if (w->active < timercnt--) 1362 if (((W)w)->active < timercnt--)
1099 { 1363 {
1100 timers [w->active - 1] = timers [timercnt]; 1364 timers [((W)w)->active - 1] = timers [timercnt];
1101 downheap ((WT *)timers, timercnt, w->active - 1); 1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1102 } 1366 }
1103 1367
1104 w->at = w->repeat; 1368 ((WT)w)->at -= mn_now;
1105 1369
1106 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1107} 1371}
1108 1372
1109void 1373void
1111{ 1375{
1112 if (ev_is_active (w)) 1376 if (ev_is_active (w))
1113 { 1377 {
1114 if (w->repeat) 1378 if (w->repeat)
1115 { 1379 {
1116 w->at = mn_now + w->repeat; 1380 ((WT)w)->at = mn_now + w->repeat;
1117 downheap ((WT *)timers, timercnt, w->active - 1); 1381 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1118 } 1382 }
1119 else 1383 else
1120 ev_timer_stop (EV_A_ w); 1384 ev_timer_stop (EV_A_ w);
1121 } 1385 }
1122 else if (w->repeat) 1386 else if (w->repeat)
1387 {
1388 w->at = w->repeat;
1123 ev_timer_start (EV_A_ w); 1389 ev_timer_start (EV_A_ w);
1390 }
1124} 1391}
1125 1392
1393#if EV_PERIODICS
1126void 1394void
1127ev_periodic_start (EV_P_ struct ev_periodic *w) 1395ev_periodic_start (EV_P_ struct ev_periodic *w)
1128{ 1396{
1129 if (ev_is_active (w)) 1397 if (ev_is_active (w))
1130 return; 1398 return;
1131 1399
1400 if (w->reschedule_cb)
1401 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1402 else if (w->interval)
1403 {
1132 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1404 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1133
1134 /* this formula differs from the one in periodic_reify because we do not always round up */ 1405 /* this formula differs from the one in periodic_reify because we do not always round up */
1135 if (w->interval)
1136 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1406 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1407 }
1137 1408
1138 ev_start (EV_A_ (W)w, ++periodiccnt); 1409 ev_start (EV_A_ (W)w, ++periodiccnt);
1139 array_needsize (periodics, periodicmax, periodiccnt, ); 1410 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1140 periodics [periodiccnt - 1] = w; 1411 periodics [periodiccnt - 1] = w;
1141 upheap ((WT *)periodics, periodiccnt - 1); 1412 upheap ((WT *)periodics, periodiccnt - 1);
1413
1414 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1142} 1415}
1143 1416
1144void 1417void
1145ev_periodic_stop (EV_P_ struct ev_periodic *w) 1418ev_periodic_stop (EV_P_ struct ev_periodic *w)
1146{ 1419{
1147 ev_clear_pending (EV_A_ (W)w); 1420 ev_clear_pending (EV_A_ (W)w);
1148 if (!ev_is_active (w)) 1421 if (!ev_is_active (w))
1149 return; 1422 return;
1150 1423
1424 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1425
1151 if (w->active < periodiccnt--) 1426 if (((W)w)->active < periodiccnt--)
1152 { 1427 {
1153 periodics [w->active - 1] = periodics [periodiccnt]; 1428 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1154 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1429 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1155 } 1430 }
1156 1431
1157 ev_stop (EV_A_ (W)w); 1432 ev_stop (EV_A_ (W)w);
1158} 1433}
1159 1434
1160void 1435void
1436ev_periodic_again (EV_P_ struct ev_periodic *w)
1437{
1438 /* TODO: use adjustheap and recalculation */
1439 ev_periodic_stop (EV_A_ w);
1440 ev_periodic_start (EV_A_ w);
1441}
1442#endif
1443
1444void
1161ev_idle_start (EV_P_ struct ev_idle *w) 1445ev_idle_start (EV_P_ struct ev_idle *w)
1162{ 1446{
1163 if (ev_is_active (w)) 1447 if (ev_is_active (w))
1164 return; 1448 return;
1165 1449
1166 ev_start (EV_A_ (W)w, ++idlecnt); 1450 ev_start (EV_A_ (W)w, ++idlecnt);
1167 array_needsize (idles, idlemax, idlecnt, ); 1451 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1168 idles [idlecnt - 1] = w; 1452 idles [idlecnt - 1] = w;
1169} 1453}
1170 1454
1171void 1455void
1172ev_idle_stop (EV_P_ struct ev_idle *w) 1456ev_idle_stop (EV_P_ struct ev_idle *w)
1173{ 1457{
1174 ev_clear_pending (EV_A_ (W)w); 1458 ev_clear_pending (EV_A_ (W)w);
1459 if (!ev_is_active (w))
1460 return;
1461
1462 idles [((W)w)->active - 1] = idles [--idlecnt];
1463 ev_stop (EV_A_ (W)w);
1464}
1465
1466void
1467ev_prepare_start (EV_P_ struct ev_prepare *w)
1468{
1175 if (ev_is_active (w)) 1469 if (ev_is_active (w))
1176 return; 1470 return;
1177 1471
1178 idles [w->active - 1] = idles [--idlecnt]; 1472 ev_start (EV_A_ (W)w, ++preparecnt);
1473 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1474 prepares [preparecnt - 1] = w;
1475}
1476
1477void
1478ev_prepare_stop (EV_P_ struct ev_prepare *w)
1479{
1480 ev_clear_pending (EV_A_ (W)w);
1481 if (!ev_is_active (w))
1482 return;
1483
1484 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1179 ev_stop (EV_A_ (W)w); 1485 ev_stop (EV_A_ (W)w);
1180} 1486}
1181 1487
1182void 1488void
1183ev_prepare_start (EV_P_ struct ev_prepare *w) 1489ev_check_start (EV_P_ struct ev_check *w)
1184{ 1490{
1185 if (ev_is_active (w)) 1491 if (ev_is_active (w))
1186 return; 1492 return;
1187 1493
1188 ev_start (EV_A_ (W)w, ++preparecnt); 1494 ev_start (EV_A_ (W)w, ++checkcnt);
1189 array_needsize (prepares, preparemax, preparecnt, ); 1495 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1190 prepares [preparecnt - 1] = w; 1496 checks [checkcnt - 1] = w;
1191} 1497}
1192 1498
1193void 1499void
1194ev_prepare_stop (EV_P_ struct ev_prepare *w) 1500ev_check_stop (EV_P_ struct ev_check *w)
1195{ 1501{
1196 ev_clear_pending (EV_A_ (W)w); 1502 ev_clear_pending (EV_A_ (W)w);
1197 if (ev_is_active (w)) 1503 if (!ev_is_active (w))
1198 return; 1504 return;
1199 1505
1200 prepares [w->active - 1] = prepares [--preparecnt];
1201 ev_stop (EV_A_ (W)w);
1202}
1203
1204void
1205ev_check_start (EV_P_ struct ev_check *w)
1206{
1207 if (ev_is_active (w))
1208 return;
1209
1210 ev_start (EV_A_ (W)w, ++checkcnt);
1211 array_needsize (checks, checkmax, checkcnt, );
1212 checks [checkcnt - 1] = w;
1213}
1214
1215void
1216ev_check_stop (EV_P_ struct ev_check *w)
1217{
1218 ev_clear_pending (EV_A_ (W)w);
1219 if (ev_is_active (w))
1220 return;
1221
1222 checks [w->active - 1] = checks [--checkcnt]; 1506 checks [((W)w)->active - 1] = checks [--checkcnt];
1223 ev_stop (EV_A_ (W)w); 1507 ev_stop (EV_A_ (W)w);
1224} 1508}
1225 1509
1226#ifndef SA_RESTART 1510#ifndef SA_RESTART
1227# define SA_RESTART 0 1511# define SA_RESTART 0
1237 return; 1521 return;
1238 1522
1239 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1523 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1240 1524
1241 ev_start (EV_A_ (W)w, 1); 1525 ev_start (EV_A_ (W)w, 1);
1242 array_needsize (signals, signalmax, w->signum, signals_init); 1526 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1243 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1527 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1244 1528
1245 if (!w->next) 1529 if (!((WL)w)->next)
1246 { 1530 {
1531#if _WIN32
1532 signal (w->signum, sighandler);
1533#else
1247 struct sigaction sa; 1534 struct sigaction sa;
1248 sa.sa_handler = sighandler; 1535 sa.sa_handler = sighandler;
1249 sigfillset (&sa.sa_mask); 1536 sigfillset (&sa.sa_mask);
1250 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1537 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1251 sigaction (w->signum, &sa, 0); 1538 sigaction (w->signum, &sa, 0);
1539#endif
1252 } 1540 }
1253} 1541}
1254 1542
1255void 1543void
1256ev_signal_stop (EV_P_ struct ev_signal *w) 1544ev_signal_stop (EV_P_ struct ev_signal *w)
1281 1569
1282void 1570void
1283ev_child_stop (EV_P_ struct ev_child *w) 1571ev_child_stop (EV_P_ struct ev_child *w)
1284{ 1572{
1285 ev_clear_pending (EV_A_ (W)w); 1573 ev_clear_pending (EV_A_ (W)w);
1286 if (ev_is_active (w)) 1574 if (!ev_is_active (w))
1287 return; 1575 return;
1288 1576
1289 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1577 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1290 ev_stop (EV_A_ (W)w); 1578 ev_stop (EV_A_ (W)w);
1291} 1579}
1306 void (*cb)(int revents, void *arg) = once->cb; 1594 void (*cb)(int revents, void *arg) = once->cb;
1307 void *arg = once->arg; 1595 void *arg = once->arg;
1308 1596
1309 ev_io_stop (EV_A_ &once->io); 1597 ev_io_stop (EV_A_ &once->io);
1310 ev_timer_stop (EV_A_ &once->to); 1598 ev_timer_stop (EV_A_ &once->to);
1311 free (once); 1599 ev_free (once);
1312 1600
1313 cb (revents, arg); 1601 cb (revents, arg);
1314} 1602}
1315 1603
1316static void 1604static void
1326} 1614}
1327 1615
1328void 1616void
1329ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1617ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1330{ 1618{
1331 struct ev_once *once = malloc (sizeof (struct ev_once)); 1619 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1332 1620
1333 if (!once) 1621 if (!once)
1334 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1622 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1335 else 1623 else
1336 { 1624 {
1337 once->cb = cb; 1625 once->cb = cb;
1338 once->arg = arg; 1626 once->arg = arg;
1339 1627
1340 ev_watcher_init (&once->io, once_cb_io); 1628 ev_init (&once->io, once_cb_io);
1341 if (fd >= 0) 1629 if (fd >= 0)
1342 { 1630 {
1343 ev_io_set (&once->io, fd, events); 1631 ev_io_set (&once->io, fd, events);
1344 ev_io_start (EV_A_ &once->io); 1632 ev_io_start (EV_A_ &once->io);
1345 } 1633 }
1346 1634
1347 ev_watcher_init (&once->to, once_cb_to); 1635 ev_init (&once->to, once_cb_to);
1348 if (timeout >= 0.) 1636 if (timeout >= 0.)
1349 { 1637 {
1350 ev_timer_set (&once->to, timeout, 0.); 1638 ev_timer_set (&once->to, timeout, 0.);
1351 ev_timer_start (EV_A_ &once->to); 1639 ev_timer_start (EV_A_ &once->to);
1352 } 1640 }
1353 } 1641 }
1354} 1642}
1355 1643
1644#ifdef __cplusplus
1645}
1646#endif
1647

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines