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.75 by root, Tue Nov 6 19:29:20 2007 UTC

… …
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#ifndef EV_STANDALONE 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33
34# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1
37# endif
38
39# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1
41# endif
42
43# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1
45# endif
46
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1
49# endif
50
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1
53# endif
54
33#endif 55#endif
34 56
35#include <math.h> 57#include <math.h>
36#include <stdlib.h> 58#include <stdlib.h>
37#include <unistd.h>
38#include <fcntl.h> 59#include <fcntl.h>
39#include <signal.h>
40#include <stddef.h> 60#include <stddef.h>
41 61
42#include <stdio.h> 62#include <stdio.h>
43 63
44#include <assert.h> 64#include <assert.h>
45#include <errno.h> 65#include <errno.h>
46#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
47#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
48# include <sys/wait.h> 74# include <sys/wait.h>
49#endif 75#endif
50#include <sys/time.h>
51#include <time.h>
52
53/**/ 76/**/
54 77
55#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
56# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
57#endif 80#endif
… …
68# define EV_USE_EPOLL 0 91# define EV_USE_EPOLL 0
69#endif 92#endif
70 93
71#ifndef EV_USE_KQUEUE 94#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
73#endif 106#endif
74 107
75#ifndef EV_USE_REALTIME 108#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 109# define EV_USE_REALTIME 1
77#endif 110#endif
… …
115typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
117 150
118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
119 152
153#include "ev_win32.c"
154
120/*****************************************************************************/ 155/*****************************************************************************/
121 156
157static void (*syserr_cb)(const char *msg);
158
159void ev_set_syserr_cb (void (*cb)(const char *msg))
160{
161 syserr_cb = cb;
162}
163
164static void
165syserr (const char *msg)
166{
167 if (!msg)
168 msg = "(libev) system error";
169
170 if (syserr_cb)
171 syserr_cb (msg);
172 else
173 {
174 perror (msg);
175 abort ();
176 }
177}
178
179static void *(*alloc)(void *ptr, long size);
180
181void ev_set_allocator (void *(*cb)(void *ptr, long size))
182{
183 alloc = cb;
184}
185
186static void *
187ev_realloc (void *ptr, long size)
188{
189 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
190
191 if (!ptr && size)
192 {
193 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
194 abort ();
195 }
196
197 return ptr;
198}
199
200#define ev_malloc(size) ev_realloc (0, (size))
201#define ev_free(ptr) ev_realloc ((ptr), 0)
202
203/*****************************************************************************/
204
122typedef struct 205typedef struct
123{ 206{
124 struct ev_watcher_list *head; 207 WL head;
125 unsigned char events; 208 unsigned char events;
126 unsigned char reify; 209 unsigned char reify;
127} ANFD; 210} ANFD;
128 211
129typedef struct 212typedef struct
… …
185ev_now (EV_P) 268ev_now (EV_P)
186{ 269{
187 return rt_now; 270 return rt_now;
188} 271}
189 272
190#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
191 274
192#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
193 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
194 { \ 277 { \
195 int newcnt = cur; \ 278 int newcnt = cur; \
196 do \ 279 do \
197 { \ 280 { \
198 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
199 } \ 282 } \
200 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
201 \ 284 \
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
203 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 287 cur = newcnt; \
205 } 288 }
289
290#define array_slim(type,stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 }
297
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
302
303#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
206 305
207/*****************************************************************************/ 306/*****************************************************************************/
208 307
209static void 308static void
210anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
227 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
228 return; 327 return;
229 } 328 }
230 329
231 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
233 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
234 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
235} 334}
236 335
237static void 336static void
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 376 events |= w->events;
278 377
279 anfd->reify = 0; 378 anfd->reify = 0;
280 379
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 380 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 381 anfd->events = events;
285 }
286 } 382 }
287 383
288 fdchangecnt = 0; 384 fdchangecnt = 0;
289} 385}
290 386
291static void 387static void
292fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
293{ 389{
294 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
295 return; 391 return;
296 392
297 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
298 394
299 ++fdchangecnt; 395 ++fdchangecnt;
300 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
301 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
302} 398}
303 399
304static void 400static void
305fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
311 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 } 409 }
314} 410}
315 411
412static int
413fd_valid (int fd)
414{
415#ifdef WIN32
416 return !!win32_get_osfhandle (fd);
417#else
418 return fcntl (fd, F_GETFD) != -1;
419#endif
420}
421
316/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
317static void 423static void
318fd_ebadf (EV_P) 424fd_ebadf (EV_P)
319{ 425{
320 int fd; 426 int fd;
321 427
322 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
323 if (anfds [fd].events) 429 if (anfds [fd].events)
324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
325 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
326} 432}
327 433
328/* called on ENOMEM in select/poll to kill some fds and retry */ 434/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 435static void
330fd_enomem (EV_P) 436fd_enomem (EV_P)
331{ 437{
332 int fd = anfdmax; 438 int fd;
333 439
334 while (fd--) 440 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 441 if (anfds [fd].events)
336 { 442 {
337 close (fd);
338 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
339 return; 444 return;
340 } 445 }
341} 446}
342 447
343/* susually called after fork if method needs to re-arm all fds from scratch */ 448/* usually called after fork if method needs to re-arm all fds from scratch */
344static void 449static void
345fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
346{ 451{
347 int fd; 452 int fd;
348 453
349 /* this should be highly optimised to not do anything but set a flag */ 454 /* this should be highly optimised to not do anything but set a flag */
350 for (fd = 0; fd < anfdmax; ++fd) 455 for (fd = 0; fd < anfdmax; ++fd)
351 if (anfds [fd].events) 456 if (anfds [fd].events)
352 { 457 {
353 anfds [fd].events = 0; 458 anfds [fd].events = 0;
354 fd_change (fd); 459 fd_change (EV_A_ fd);
355 } 460 }
356} 461}
357 462
358/*****************************************************************************/ 463/*****************************************************************************/
359 464
… …
363 WT w = heap [k]; 468 WT w = heap [k];
364 469
365 while (k && heap [k >> 1]->at > w->at) 470 while (k && heap [k >> 1]->at > w->at)
366 { 471 {
367 heap [k] = heap [k >> 1]; 472 heap [k] = heap [k >> 1];
368 heap [k]->active = k + 1; 473 ((W)heap [k])->active = k + 1;
369 k >>= 1; 474 k >>= 1;
370 } 475 }
371 476
372 heap [k] = w; 477 heap [k] = w;
373 heap [k]->active = k + 1; 478 ((W)heap [k])->active = k + 1;
374 479
375} 480}
376 481
377static void 482static void
378downheap (WT *heap, int N, int k) 483downheap (WT *heap, int N, int k)
… …
388 493
389 if (w->at <= heap [j]->at) 494 if (w->at <= heap [j]->at)
390 break; 495 break;
391 496
392 heap [k] = heap [j]; 497 heap [k] = heap [j];
393 heap [k]->active = k + 1; 498 ((W)heap [k])->active = k + 1;
394 k = j; 499 k = j;
395 } 500 }
396 501
397 heap [k] = w; 502 heap [k] = w;
398 heap [k]->active = k + 1; 503 ((W)heap [k])->active = k + 1;
399} 504}
400 505
401/*****************************************************************************/ 506/*****************************************************************************/
402 507
403typedef struct 508typedef struct
404{ 509{
405 struct ev_watcher_list *head; 510 WL head;
406 sig_atomic_t volatile gotsig; 511 sig_atomic_t volatile gotsig;
407} ANSIG; 512} ANSIG;
408 513
409static ANSIG *signals; 514static ANSIG *signals;
410static int signalmax; 515static int signalmax;
… …
426} 531}
427 532
428static void 533static void
429sighandler (int signum) 534sighandler (int signum)
430{ 535{
536#if WIN32
537 signal (signum, sighandler);
538#endif
539
431 signals [signum - 1].gotsig = 1; 540 signals [signum - 1].gotsig = 1;
432 541
433 if (!gotsig) 542 if (!gotsig)
434 { 543 {
435 int old_errno = errno; 544 int old_errno = errno;
436 gotsig = 1; 545 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
437 write (sigpipe [1], &signum, 1); 549 write (sigpipe [1], &signum, 1);
550#endif
438 errno = old_errno; 551 errno = old_errno;
439 } 552 }
440} 553}
441 554
442static void 555static void
443sigcb (EV_P_ struct ev_io *iow, int revents) 556sigcb (EV_P_ struct ev_io *iow, int revents)
444{ 557{
445 struct ev_watcher_list *w; 558 WL w;
446 int signum; 559 int signum;
447 560
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
448 read (sigpipe [0], &revents, 1); 564 read (sigpipe [0], &revents, 1);
565#endif
449 gotsig = 0; 566 gotsig = 0;
450 567
451 for (signum = signalmax; signum--; ) 568 for (signum = signalmax; signum--; )
452 if (signals [signum].gotsig) 569 if (signals [signum].gotsig)
453 { 570 {
… …
475 ev_unref (EV_A); /* child watcher should not keep loop alive */ 592 ev_unref (EV_A); /* child watcher should not keep loop alive */
476} 593}
477 594
478/*****************************************************************************/ 595/*****************************************************************************/
479 596
597static struct ev_child *childs [PID_HASHSIZE];
598
480#ifndef WIN32 599#ifndef WIN32
481 600
482static struct ev_child *childs [PID_HASHSIZE];
483static struct ev_signal childev; 601static struct ev_signal childev;
484 602
485#ifndef WCONTINUED 603#ifndef WCONTINUED
486# define WCONTINUED 0 604# define WCONTINUED 0
487#endif 605#endif
… …
492 struct ev_child *w; 610 struct ev_child *w;
493 611
494 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 612 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) 613 if (w->pid == pid || !w->pid)
496 { 614 {
497 w->priority = sw->priority; /* need to do it *now* */ 615 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
498 w->rpid = pid; 616 w->rpid = pid;
499 w->rstatus = status; 617 w->rstatus = status;
500 event (EV_A_ (W)w, EV_CHILD); 618 event (EV_A_ (W)w, EV_CHILD);
501 } 619 }
502} 620}
503 621
504static void 622static void
… …
586 methods = atoi (getenv ("LIBEV_METHODS")); 704 methods = atoi (getenv ("LIBEV_METHODS"));
587 else 705 else
588 methods = EVMETHOD_ANY; 706 methods = EVMETHOD_ANY;
589 707
590 method = 0; 708 method = 0;
709#if EV_USE_WIN32
710 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
711#endif
591#if EV_USE_KQUEUE 712#if EV_USE_KQUEUE
592 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 713 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
593#endif 714#endif
594#if EV_USE_EPOLL 715#if EV_USE_EPOLL
595 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 716 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
598 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
599#endif 720#endif
600#if EV_USE_SELECT 721#if EV_USE_SELECT
601 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
602#endif 723#endif
724
725 ev_watcher_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI);
603 } 727 }
604} 728}
605 729
606void 730void
607loop_destroy (EV_P) 731loop_destroy (EV_P)
608{ 732{
733 int i;
734
735#if EV_USE_WIN32
736 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
737#endif
609#if EV_USE_KQUEUE 738#if EV_USE_KQUEUE
610 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 739 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
611#endif 740#endif
612#if EV_USE_EPOLL 741#if EV_USE_EPOLL
613 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 742 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
617#endif 746#endif
618#if EV_USE_SELECT 747#if EV_USE_SELECT
619 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 748 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
620#endif 749#endif
621 750
751 for (i = NUMPRI; i--; )
752 array_free (pending, [i]);
753
754 /* have to use the microsoft-never-gets-it-right macro */
755 array_free_microshit (fdchange);
756 array_free_microshit (timer);
757 array_free_microshit (periodic);
758 array_free_microshit (idle);
759 array_free_microshit (prepare);
760 array_free_microshit (check);
761
622 method = 0; 762 method = 0;
623 /*TODO*/
624} 763}
625 764
626void 765static void
627loop_fork (EV_P) 766loop_fork (EV_P)
628{ 767{
629 /*TODO*/
630#if EV_USE_EPOLL 768#if EV_USE_EPOLL
631 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
632#endif 770#endif
633#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
634 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
635#endif 773#endif
774
775 if (ev_is_active (&sigev))
776 {
777 /* default loop */
778
779 ev_ref (EV_A);
780 ev_io_stop (EV_A_ &sigev);
781 close (sigpipe [0]);
782 close (sigpipe [1]);
783
784 while (pipe (sigpipe))
785 syserr ("(libev) error creating pipe");
786
787 siginit (EV_A);
788 }
789
790 postfork = 0;
636} 791}
637 792
638#if EV_MULTIPLICITY 793#if EV_MULTIPLICITY
639struct ev_loop * 794struct ev_loop *
640ev_loop_new (int methods) 795ev_loop_new (int methods)
641{ 796{
642 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 797 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
798
799 memset (loop, 0, sizeof (struct ev_loop));
643 800
644 loop_init (EV_A_ methods); 801 loop_init (EV_A_ methods);
645 802
646 if (ev_methods (EV_A)) 803 if (ev_method (EV_A))
647 return loop; 804 return loop;
648 805
649 return 0; 806 return 0;
650} 807}
651 808
652void 809void
653ev_loop_destroy (EV_P) 810ev_loop_destroy (EV_P)
654{ 811{
655 loop_destroy (EV_A); 812 loop_destroy (EV_A);
656 free (loop); 813 ev_free (loop);
657} 814}
658 815
659void 816void
660ev_loop_fork (EV_P) 817ev_loop_fork (EV_P)
661{ 818{
662 loop_fork (EV_A); 819 postfork = 1;
663} 820}
664 821
665#endif 822#endif
666 823
667#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
… …
690 847
691 loop_init (EV_A_ methods); 848 loop_init (EV_A_ methods);
692 849
693 if (ev_method (EV_A)) 850 if (ev_method (EV_A))
694 { 851 {
695 ev_watcher_init (&sigev, sigcb);
696 ev_set_priority (&sigev, EV_MAXPRI);
697 siginit (EV_A); 852 siginit (EV_A);
698 853
699#ifndef WIN32 854#ifndef WIN32
700 ev_signal_init (&childev, childcb, SIGCHLD); 855 ev_signal_init (&childev, childcb, SIGCHLD);
701 ev_set_priority (&childev, EV_MAXPRI); 856 ev_set_priority (&childev, EV_MAXPRI);
… …
715{ 870{
716#if EV_MULTIPLICITY 871#if EV_MULTIPLICITY
717 struct ev_loop *loop = default_loop; 872 struct ev_loop *loop = default_loop;
718#endif 873#endif
719 874
875#ifndef WIN32
720 ev_ref (EV_A); /* child watcher */ 876 ev_ref (EV_A); /* child watcher */
721 ev_signal_stop (EV_A_ &childev); 877 ev_signal_stop (EV_A_ &childev);
878#endif
722 879
723 ev_ref (EV_A); /* signal watcher */ 880 ev_ref (EV_A); /* signal watcher */
724 ev_io_stop (EV_A_ &sigev); 881 ev_io_stop (EV_A_ &sigev);
725 882
726 close (sigpipe [0]); sigpipe [0] = 0; 883 close (sigpipe [0]); sigpipe [0] = 0;
… …
728 885
729 loop_destroy (EV_A); 886 loop_destroy (EV_A);
730} 887}
731 888
732void 889void
733ev_default_fork (EV_P) 890ev_default_fork (void)
734{ 891{
735 loop_fork (EV_A); 892#if EV_MULTIPLICITY
893 struct ev_loop *loop = default_loop;
894#endif
736 895
737 ev_io_stop (EV_A_ &sigev); 896 if (method)
738 close (sigpipe [0]); 897 postfork = 1;
739 close (sigpipe [1]);
740 pipe (sigpipe);
741
742 ev_ref (EV_A); /* signal watcher */
743 siginit (EV_A);
744} 898}
745 899
746/*****************************************************************************/ 900/*****************************************************************************/
747 901
748static void 902static void
… …
764} 918}
765 919
766static void 920static void
767timers_reify (EV_P) 921timers_reify (EV_P)
768{ 922{
769 while (timercnt && timers [0]->at <= mn_now) 923 while (timercnt && ((WT)timers [0])->at <= mn_now)
770 { 924 {
771 struct ev_timer *w = timers [0]; 925 struct ev_timer *w = timers [0];
926
927 assert (("inactive timer on timer heap detected", ev_is_active (w)));
772 928
773 /* first reschedule or stop timer */ 929 /* first reschedule or stop timer */
774 if (w->repeat) 930 if (w->repeat)
775 { 931 {
776 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 932 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
777 w->at = mn_now + w->repeat; 933 ((WT)w)->at = mn_now + w->repeat;
778 downheap ((WT *)timers, timercnt, 0); 934 downheap ((WT *)timers, timercnt, 0);
779 } 935 }
780 else 936 else
781 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 937 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
782 938
… …
785} 941}
786 942
787static void 943static void
788periodics_reify (EV_P) 944periodics_reify (EV_P)
789{ 945{
790 while (periodiccnt && periodics [0]->at <= rt_now) 946 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
791 { 947 {
792 struct ev_periodic *w = periodics [0]; 948 struct ev_periodic *w = periodics [0];
949
950 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
793 951
794 /* first reschedule or stop timer */ 952 /* first reschedule or stop timer */
795 if (w->interval) 953 if (w->interval)
796 { 954 {
797 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 955 ((WT)w)->at += floor ((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)); 956 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
799 downheap ((WT *)periodics, periodiccnt, 0); 957 downheap ((WT *)periodics, periodiccnt, 0);
800 } 958 }
801 else 959 else
802 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 960 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
803 961
… …
815 { 973 {
816 struct ev_periodic *w = periodics [i]; 974 struct ev_periodic *w = periodics [i];
817 975
818 if (w->interval) 976 if (w->interval)
819 { 977 {
820 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 978 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
821 979
822 if (fabs (diff) >= 1e-4) 980 if (fabs (diff) >= 1e-4)
823 { 981 {
824 ev_periodic_stop (EV_A_ w); 982 ev_periodic_stop (EV_A_ w);
825 ev_periodic_start (EV_A_ w); 983 ev_periodic_start (EV_A_ w);
… …
886 { 1044 {
887 periodics_reschedule (EV_A); 1045 periodics_reschedule (EV_A);
888 1046
889 /* adjust timers. this is easy, as the offset is the same for all */ 1047 /* adjust timers. this is easy, as the offset is the same for all */
890 for (i = 0; i < timercnt; ++i) 1048 for (i = 0; i < timercnt; ++i)
891 timers [i]->at += rt_now - mn_now; 1049 ((WT)timers [i])->at += rt_now - mn_now;
892 } 1050 }
893 1051
894 mn_now = rt_now; 1052 mn_now = rt_now;
895 } 1053 }
896} 1054}
… …
922 { 1080 {
923 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1081 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
924 call_pending (EV_A); 1082 call_pending (EV_A);
925 } 1083 }
926 1084
1085 /* we might have forked, so reify kernel state if necessary */
1086 if (expect_false (postfork))
1087 loop_fork (EV_A);
1088
927 /* update fd-related kernel structures */ 1089 /* update fd-related kernel structures */
928 fd_reify (EV_A); 1090 fd_reify (EV_A);
929 1091
930 /* calculate blocking time */ 1092 /* calculate blocking time */
931 1093
… …
947 { 1109 {
948 block = MAX_BLOCKTIME; 1110 block = MAX_BLOCKTIME;
949 1111
950 if (timercnt) 1112 if (timercnt)
951 { 1113 {
952 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1114 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
953 if (block > to) block = to; 1115 if (block > to) block = to;
954 } 1116 }
955 1117
956 if (periodiccnt) 1118 if (periodiccnt)
957 { 1119 {
958 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1120 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
959 if (block > to) block = to; 1121 if (block > to) block = to;
960 } 1122 }
961 1123
962 if (block < 0.) block = 0.; 1124 if (block < 0.) block = 0.;
963 } 1125 }
… …
1055 return; 1217 return;
1056 1218
1057 assert (("ev_io_start called with negative fd", fd >= 0)); 1219 assert (("ev_io_start called with negative fd", fd >= 0));
1058 1220
1059 ev_start (EV_A_ (W)w, 1); 1221 ev_start (EV_A_ (W)w, 1);
1060 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1222 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1061 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1223 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1062 1224
1063 fd_change (EV_A_ fd); 1225 fd_change (EV_A_ fd);
1064} 1226}
1065 1227
… …
1080ev_timer_start (EV_P_ struct ev_timer *w) 1242ev_timer_start (EV_P_ struct ev_timer *w)
1081{ 1243{
1082 if (ev_is_active (w)) 1244 if (ev_is_active (w))
1083 return; 1245 return;
1084 1246
1085 w->at += mn_now; 1247 ((WT)w)->at += mn_now;
1086 1248
1087 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1249 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1088 1250
1089 ev_start (EV_A_ (W)w, ++timercnt); 1251 ev_start (EV_A_ (W)w, ++timercnt);
1090 array_needsize (timers, timermax, timercnt, ); 1252 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1091 timers [timercnt - 1] = w; 1253 timers [timercnt - 1] = w;
1092 upheap ((WT *)timers, timercnt - 1); 1254 upheap ((WT *)timers, timercnt - 1);
1255
1256 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1093} 1257}
1094 1258
1095void 1259void
1096ev_timer_stop (EV_P_ struct ev_timer *w) 1260ev_timer_stop (EV_P_ struct ev_timer *w)
1097{ 1261{
1098 ev_clear_pending (EV_A_ (W)w); 1262 ev_clear_pending (EV_A_ (W)w);
1099 if (!ev_is_active (w)) 1263 if (!ev_is_active (w))
1100 return; 1264 return;
1101 1265
1266 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1267
1102 if (w->active < timercnt--) 1268 if (((W)w)->active < timercnt--)
1103 { 1269 {
1104 timers [w->active - 1] = timers [timercnt]; 1270 timers [((W)w)->active - 1] = timers [timercnt];
1105 downheap ((WT *)timers, timercnt, w->active - 1); 1271 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1106 } 1272 }
1107 1273
1108 w->at = w->repeat; 1274 ((WT)w)->at = w->repeat;
1109 1275
1110 ev_stop (EV_A_ (W)w); 1276 ev_stop (EV_A_ (W)w);
1111} 1277}
1112 1278
1113void 1279void
… …
1115{ 1281{
1116 if (ev_is_active (w)) 1282 if (ev_is_active (w))
1117 { 1283 {
1118 if (w->repeat) 1284 if (w->repeat)
1119 { 1285 {
1120 w->at = mn_now + w->repeat; 1286 ((WT)w)->at = mn_now + w->repeat;
1121 downheap ((WT *)timers, timercnt, w->active - 1); 1287 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1122 } 1288 }
1123 else 1289 else
1124 ev_timer_stop (EV_A_ w); 1290 ev_timer_stop (EV_A_ w);
1125 } 1291 }
1126 else if (w->repeat) 1292 else if (w->repeat)
… …
1135 1301
1136 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1302 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1137 1303
1138 /* this formula differs from the one in periodic_reify because we do not always round up */ 1304 /* this formula differs from the one in periodic_reify because we do not always round up */
1139 if (w->interval) 1305 if (w->interval)
1140 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1306 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1141 1307
1142 ev_start (EV_A_ (W)w, ++periodiccnt); 1308 ev_start (EV_A_ (W)w, ++periodiccnt);
1143 array_needsize (periodics, periodicmax, periodiccnt, ); 1309 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1144 periodics [periodiccnt - 1] = w; 1310 periodics [periodiccnt - 1] = w;
1145 upheap ((WT *)periodics, periodiccnt - 1); 1311 upheap ((WT *)periodics, periodiccnt - 1);
1312
1313 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1146} 1314}
1147 1315
1148void 1316void
1149ev_periodic_stop (EV_P_ struct ev_periodic *w) 1317ev_periodic_stop (EV_P_ struct ev_periodic *w)
1150{ 1318{
1151 ev_clear_pending (EV_A_ (W)w); 1319 ev_clear_pending (EV_A_ (W)w);
1152 if (!ev_is_active (w)) 1320 if (!ev_is_active (w))
1153 return; 1321 return;
1154 1322
1323 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1324
1155 if (w->active < periodiccnt--) 1325 if (((W)w)->active < periodiccnt--)
1156 { 1326 {
1157 periodics [w->active - 1] = periodics [periodiccnt]; 1327 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1158 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1328 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1159 } 1329 }
1160 1330
1161 ev_stop (EV_A_ (W)w); 1331 ev_stop (EV_A_ (W)w);
1162} 1332}
1163 1333
… …
1166{ 1336{
1167 if (ev_is_active (w)) 1337 if (ev_is_active (w))
1168 return; 1338 return;
1169 1339
1170 ev_start (EV_A_ (W)w, ++idlecnt); 1340 ev_start (EV_A_ (W)w, ++idlecnt);
1171 array_needsize (idles, idlemax, idlecnt, ); 1341 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1172 idles [idlecnt - 1] = w; 1342 idles [idlecnt - 1] = w;
1173} 1343}
1174 1344
1175void 1345void
1176ev_idle_stop (EV_P_ struct ev_idle *w) 1346ev_idle_stop (EV_P_ struct ev_idle *w)
1177{ 1347{
1178 ev_clear_pending (EV_A_ (W)w); 1348 ev_clear_pending (EV_A_ (W)w);
1179 if (ev_is_active (w)) 1349 if (ev_is_active (w))
1180 return; 1350 return;
1181 1351
1182 idles [w->active - 1] = idles [--idlecnt]; 1352 idles [((W)w)->active - 1] = idles [--idlecnt];
1183 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1184} 1354}
1185 1355
1186void 1356void
1187ev_prepare_start (EV_P_ struct ev_prepare *w) 1357ev_prepare_start (EV_P_ struct ev_prepare *w)
1188{ 1358{
1189 if (ev_is_active (w)) 1359 if (ev_is_active (w))
1190 return; 1360 return;
1191 1361
1192 ev_start (EV_A_ (W)w, ++preparecnt); 1362 ev_start (EV_A_ (W)w, ++preparecnt);
1193 array_needsize (prepares, preparemax, preparecnt, ); 1363 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1194 prepares [preparecnt - 1] = w; 1364 prepares [preparecnt - 1] = w;
1195} 1365}
1196 1366
1197void 1367void
1198ev_prepare_stop (EV_P_ struct ev_prepare *w) 1368ev_prepare_stop (EV_P_ struct ev_prepare *w)
1199{ 1369{
1200 ev_clear_pending (EV_A_ (W)w); 1370 ev_clear_pending (EV_A_ (W)w);
1201 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1202 return; 1372 return;
1203 1373
1204 prepares [w->active - 1] = prepares [--preparecnt]; 1374 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1205 ev_stop (EV_A_ (W)w); 1375 ev_stop (EV_A_ (W)w);
1206} 1376}
1207 1377
1208void 1378void
1209ev_check_start (EV_P_ struct ev_check *w) 1379ev_check_start (EV_P_ struct ev_check *w)
1210{ 1380{
1211 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1212 return; 1382 return;
1213 1383
1214 ev_start (EV_A_ (W)w, ++checkcnt); 1384 ev_start (EV_A_ (W)w, ++checkcnt);
1215 array_needsize (checks, checkmax, checkcnt, ); 1385 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1216 checks [checkcnt - 1] = w; 1386 checks [checkcnt - 1] = w;
1217} 1387}
1218 1388
1219void 1389void
1220ev_check_stop (EV_P_ struct ev_check *w) 1390ev_check_stop (EV_P_ struct ev_check *w)
1221{ 1391{
1222 ev_clear_pending (EV_A_ (W)w); 1392 ev_clear_pending (EV_A_ (W)w);
1223 if (ev_is_active (w)) 1393 if (ev_is_active (w))
1224 return; 1394 return;
1225 1395
1226 checks [w->active - 1] = checks [--checkcnt]; 1396 checks [((W)w)->active - 1] = checks [--checkcnt];
1227 ev_stop (EV_A_ (W)w); 1397 ev_stop (EV_A_ (W)w);
1228} 1398}
1229 1399
1230#ifndef SA_RESTART 1400#ifndef SA_RESTART
1231# define SA_RESTART 0 1401# define SA_RESTART 0
… …
1241 return; 1411 return;
1242 1412
1243 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1413 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1244 1414
1245 ev_start (EV_A_ (W)w, 1); 1415 ev_start (EV_A_ (W)w, 1);
1246 array_needsize (signals, signalmax, w->signum, signals_init); 1416 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1247 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1417 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1248 1418
1249 if (!w->next) 1419 if (!((WL)w)->next)
1250 { 1420 {
1421#if WIN32
1422 signal (w->signum, sighandler);
1423#else
1251 struct sigaction sa; 1424 struct sigaction sa;
1252 sa.sa_handler = sighandler; 1425 sa.sa_handler = sighandler;
1253 sigfillset (&sa.sa_mask); 1426 sigfillset (&sa.sa_mask);
1254 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1427 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1255 sigaction (w->signum, &sa, 0); 1428 sigaction (w->signum, &sa, 0);
1429#endif
1256 } 1430 }
1257} 1431}
1258 1432
1259void 1433void
1260ev_signal_stop (EV_P_ struct ev_signal *w) 1434ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1310 void (*cb)(int revents, void *arg) = once->cb; 1484 void (*cb)(int revents, void *arg) = once->cb;
1311 void *arg = once->arg; 1485 void *arg = once->arg;
1312 1486
1313 ev_io_stop (EV_A_ &once->io); 1487 ev_io_stop (EV_A_ &once->io);
1314 ev_timer_stop (EV_A_ &once->to); 1488 ev_timer_stop (EV_A_ &once->to);
1315 free (once); 1489 ev_free (once);
1316 1490
1317 cb (revents, arg); 1491 cb (revents, arg);
1318} 1492}
1319 1493
1320static void 1494static void
… …
1330} 1504}
1331 1505
1332void 1506void
1333ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1507ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1334{ 1508{
1335 struct ev_once *once = malloc (sizeof (struct ev_once)); 1509 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1336 1510
1337 if (!once) 1511 if (!once)
1338 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1512 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1339 else 1513 else
1340 { 1514 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines