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

Comparing libev/ev.c (file contents):
Revision 1.266 by root, Fri Oct 24 08:15:33 2008 UTC vs.
Revision 1.287 by root, Mon Apr 20 19:45:58 2009 UTC

1/* 1/*
2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007,2008 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
47# include EV_CONFIG_H 47# include EV_CONFIG_H
48# else 48# else
49# include "config.h" 49# include "config.h"
50# endif 50# endif
51 51
52# if HAVE_CLOCK_SYSCALL
53# ifndef EV_USE_CLOCK_SYSCALL
54# define EV_USE_CLOCK_SYSCALL 1
55# ifndef EV_USE_REALTIME
56# define EV_USE_REALTIME 0
57# endif
58# ifndef EV_USE_MONOTONIC
59# define EV_USE_MONOTONIC 1
60# endif
61# endif
62# endif
63
52# if HAVE_CLOCK_GETTIME 64# if HAVE_CLOCK_GETTIME
53# ifndef EV_USE_MONOTONIC 65# ifndef EV_USE_MONOTONIC
54# define EV_USE_MONOTONIC 1 66# define EV_USE_MONOTONIC 1
55# endif 67# endif
56# ifndef EV_USE_REALTIME 68# ifndef EV_USE_REALTIME
57# define EV_USE_REALTIME 1 69# define EV_USE_REALTIME 0
58# endif 70# endif
59# else 71# else
60# ifndef EV_USE_MONOTONIC 72# ifndef EV_USE_MONOTONIC
61# define EV_USE_MONOTONIC 0 73# define EV_USE_MONOTONIC 0
62# endif 74# endif
164# endif 176# endif
165#endif 177#endif
166 178
167/* this block tries to deduce configuration from header-defined symbols and defaults */ 179/* this block tries to deduce configuration from header-defined symbols and defaults */
168 180
181#ifndef EV_USE_CLOCK_SYSCALL
182# if __linux && __GLIBC__ >= 2
183# define EV_USE_CLOCK_SYSCALL 1
184# else
185# define EV_USE_CLOCK_SYSCALL 0
186# endif
187#endif
188
169#ifndef EV_USE_MONOTONIC 189#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 190# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1 191# define EV_USE_MONOTONIC 1
172# else 192# else
173# define EV_USE_MONOTONIC 0 193# define EV_USE_MONOTONIC 0
174# endif 194# endif
175#endif 195#endif
176 196
177#ifndef EV_USE_REALTIME 197#ifndef EV_USE_REALTIME
178# define EV_USE_REALTIME 0 198# define EV_USE_REALTIME !EV_USE_CLOCK_SYSCALL
179#endif 199#endif
180 200
181#ifndef EV_USE_NANOSLEEP 201#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L 202# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1 203# define EV_USE_NANOSLEEP 1
287# endif 307# endif
288#endif 308#endif
289 309
290#if EV_USE_INOTIFY 310#if EV_USE_INOTIFY
291# include <sys/utsname.h> 311# include <sys/utsname.h>
312# include <sys/statfs.h>
292# include <sys/inotify.h> 313# include <sys/inotify.h>
293/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 314/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
294# ifndef IN_DONT_FOLLOW 315# ifndef IN_DONT_FOLLOW
295# undef EV_USE_INOTIFY 316# undef EV_USE_INOTIFY
296# define EV_USE_INOTIFY 0 317# define EV_USE_INOTIFY 0
297# endif 318# endif
298#endif 319#endif
299 320
300#if EV_SELECT_IS_WINSOCKET 321#if EV_SELECT_IS_WINSOCKET
301# include <winsock.h> 322# include <winsock.h>
323#endif
324
325/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
326/* which makes programs even slower. might work on other unices, too. */
327#if EV_USE_CLOCK_SYSCALL
328# include <syscall.h>
329# define clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
330# undef EV_USE_MONOTONIC
331# define EV_USE_MONOTONIC 1
302#endif 332#endif
303 333
304#if EV_USE_EVENTFD 334#if EV_USE_EVENTFD
305/* our minimum requirement is glibc 2.7 which has the stub, but not the header */ 335/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
306# include <stdint.h> 336# include <stdint.h>
367typedef ev_watcher_time *WT; 397typedef ev_watcher_time *WT;
368 398
369#define ev_active(w) ((W)(w))->active 399#define ev_active(w) ((W)(w))->active
370#define ev_at(w) ((WT)(w))->at 400#define ev_at(w) ((WT)(w))->at
371 401
372#if EV_USE_MONOTONIC 402#if EV_USE_REALTIME
373/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 403/* sig_atomic_t is used to avoid per-thread variables or locking but still */
374/* giving it a reasonably high chance of working on typical architetcures */ 404/* giving it a reasonably high chance of working on typical architetcures */
405static EV_ATOMIC_T have_realtime; /* did clock_gettime (CLOCK_REALTIME) work? */
406#endif
407
408#if EV_USE_MONOTONIC
375static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 409static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
376#endif 410#endif
377 411
378#ifdef _WIN32 412#ifdef _WIN32
379# include "ev_win32.c" 413# include "ev_win32.c"
388{ 422{
389 syserr_cb = cb; 423 syserr_cb = cb;
390} 424}
391 425
392static void noinline 426static void noinline
393syserr (const char *msg) 427ev_syserr (const char *msg)
394{ 428{
395 if (!msg) 429 if (!msg)
396 msg = "(libev) system error"; 430 msg = "(libev) system error";
397 431
398 if (syserr_cb) 432 if (syserr_cb)
450{ 484{
451 WL head; 485 WL head;
452 unsigned char events; 486 unsigned char events;
453 unsigned char reify; 487 unsigned char reify;
454 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 488 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
455 unsigned char unused; /* currently unused padding */ 489 unsigned char unused;
490#if EV_USE_EPOLL
491 unsigned int egen; /* generation counter to counter epoll bugs */
492#endif
456#if EV_SELECT_IS_WINSOCKET 493#if EV_SELECT_IS_WINSOCKET
457 SOCKET handle; 494 SOCKET handle;
458#endif 495#endif
459} ANFD; 496} ANFD;
460 497
520 557
521ev_tstamp 558ev_tstamp
522ev_time (void) 559ev_time (void)
523{ 560{
524#if EV_USE_REALTIME 561#if EV_USE_REALTIME
562 if (expect_true (have_realtime))
563 {
525 struct timespec ts; 564 struct timespec ts;
526 clock_gettime (CLOCK_REALTIME, &ts); 565 clock_gettime (CLOCK_REALTIME, &ts);
527 return ts.tv_sec + ts.tv_nsec * 1e-9; 566 return ts.tv_sec + ts.tv_nsec * 1e-9;
528#else 567 }
568#endif
569
529 struct timeval tv; 570 struct timeval tv;
530 gettimeofday (&tv, 0); 571 gettimeofday (&tv, 0);
531 return tv.tv_sec + tv.tv_usec * 1e-6; 572 return tv.tv_sec + tv.tv_usec * 1e-6;
532#endif
533} 573}
534 574
535ev_tstamp inline_size 575inline_size ev_tstamp
536get_clock (void) 576get_clock (void)
537{ 577{
538#if EV_USE_MONOTONIC 578#if EV_USE_MONOTONIC
539 if (expect_true (have_monotonic)) 579 if (expect_true (have_monotonic))
540 { 580 {
585 625
586/*****************************************************************************/ 626/*****************************************************************************/
587 627
588#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 628#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
589 629
590int inline_size 630inline_size int
591array_nextsize (int elem, int cur, int cnt) 631array_nextsize (int elem, int cur, int cnt)
592{ 632{
593 int ncur = cur + 1; 633 int ncur = cur + 1;
594 634
595 do 635 do
636 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 676 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
637 } 677 }
638#endif 678#endif
639 679
640#define array_free(stem, idx) \ 680#define array_free(stem, idx) \
641 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 681 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; stem ## s idx = 0
642 682
643/*****************************************************************************/ 683/*****************************************************************************/
644 684
645void noinline 685void noinline
646ev_feed_event (EV_P_ void *w, int revents) 686ev_feed_event (EV_P_ void *w, int revents)
657 pendings [pri][w_->pending - 1].w = w_; 697 pendings [pri][w_->pending - 1].w = w_;
658 pendings [pri][w_->pending - 1].events = revents; 698 pendings [pri][w_->pending - 1].events = revents;
659 } 699 }
660} 700}
661 701
662void inline_speed 702inline_speed void
703feed_reverse (EV_P_ W w)
704{
705 array_needsize (W, rfeeds, rfeedmax, rfeedcnt + 1, EMPTY2);
706 rfeeds [rfeedcnt++] = w;
707}
708
709inline_size void
710feed_reverse_done (EV_P_ int revents)
711{
712 do
713 ev_feed_event (EV_A_ rfeeds [--rfeedcnt], revents);
714 while (rfeedcnt);
715}
716
717inline_speed void
663queue_events (EV_P_ W *events, int eventcnt, int type) 718queue_events (EV_P_ W *events, int eventcnt, int type)
664{ 719{
665 int i; 720 int i;
666 721
667 for (i = 0; i < eventcnt; ++i) 722 for (i = 0; i < eventcnt; ++i)
668 ev_feed_event (EV_A_ events [i], type); 723 ev_feed_event (EV_A_ events [i], type);
669} 724}
670 725
671/*****************************************************************************/ 726/*****************************************************************************/
672 727
673void inline_speed 728inline_speed void
674fd_event (EV_P_ int fd, int revents) 729fd_event (EV_P_ int fd, int revents)
675{ 730{
676 ANFD *anfd = anfds + fd; 731 ANFD *anfd = anfds + fd;
677 ev_io *w; 732 ev_io *w;
678 733
690{ 745{
691 if (fd >= 0 && fd < anfdmax) 746 if (fd >= 0 && fd < anfdmax)
692 fd_event (EV_A_ fd, revents); 747 fd_event (EV_A_ fd, revents);
693} 748}
694 749
695void inline_size 750inline_size void
696fd_reify (EV_P) 751fd_reify (EV_P)
697{ 752{
698 int i; 753 int i;
699 754
700 for (i = 0; i < fdchangecnt; ++i) 755 for (i = 0; i < fdchangecnt; ++i)
715 #ifdef EV_FD_TO_WIN32_HANDLE 770 #ifdef EV_FD_TO_WIN32_HANDLE
716 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 771 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
717 #else 772 #else
718 anfd->handle = _get_osfhandle (fd); 773 anfd->handle = _get_osfhandle (fd);
719 #endif 774 #endif
720 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 775 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
721 } 776 }
722#endif 777#endif
723 778
724 { 779 {
725 unsigned char o_events = anfd->events; 780 unsigned char o_events = anfd->events;
726 unsigned char o_reify = anfd->reify; 781 unsigned char o_reify = anfd->reify;
727 782
728 anfd->reify = 0; 783 anfd->reify = 0;
729 anfd->events = events; 784 anfd->events = events;
730 785
731 if (o_events != events || o_reify & EV_IOFDSET) 786 if (o_events != events || o_reify & EV__IOFDSET)
732 backend_modify (EV_A_ fd, o_events, events); 787 backend_modify (EV_A_ fd, o_events, events);
733 } 788 }
734 } 789 }
735 790
736 fdchangecnt = 0; 791 fdchangecnt = 0;
737} 792}
738 793
739void inline_size 794inline_size void
740fd_change (EV_P_ int fd, int flags) 795fd_change (EV_P_ int fd, int flags)
741{ 796{
742 unsigned char reify = anfds [fd].reify; 797 unsigned char reify = anfds [fd].reify;
743 anfds [fd].reify |= flags; 798 anfds [fd].reify |= flags;
744 799
748 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 803 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
749 fdchanges [fdchangecnt - 1] = fd; 804 fdchanges [fdchangecnt - 1] = fd;
750 } 805 }
751} 806}
752 807
753void inline_speed 808inline_speed void
754fd_kill (EV_P_ int fd) 809fd_kill (EV_P_ int fd)
755{ 810{
756 ev_io *w; 811 ev_io *w;
757 812
758 while ((w = (ev_io *)anfds [fd].head)) 813 while ((w = (ev_io *)anfds [fd].head))
760 ev_io_stop (EV_A_ w); 815 ev_io_stop (EV_A_ w);
761 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 816 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
762 } 817 }
763} 818}
764 819
765int inline_size 820inline_size int
766fd_valid (int fd) 821fd_valid (int fd)
767{ 822{
768#ifdef _WIN32 823#ifdef _WIN32
769 return _get_osfhandle (fd) != -1; 824 return _get_osfhandle (fd) != -1;
770#else 825#else
806 861
807 for (fd = 0; fd < anfdmax; ++fd) 862 for (fd = 0; fd < anfdmax; ++fd)
808 if (anfds [fd].events) 863 if (anfds [fd].events)
809 { 864 {
810 anfds [fd].events = 0; 865 anfds [fd].events = 0;
866 anfds [fd].emask = 0;
811 fd_change (EV_A_ fd, EV_IOFDSET | 1); 867 fd_change (EV_A_ fd, EV__IOFDSET | 1);
812 } 868 }
813} 869}
814 870
815/*****************************************************************************/ 871/*****************************************************************************/
816 872
832#define HEAP0 (DHEAP - 1) /* index of first element in heap */ 888#define HEAP0 (DHEAP - 1) /* index of first element in heap */
833#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0) 889#define HPARENT(k) ((((k) - HEAP0 - 1) / DHEAP) + HEAP0)
834#define UPHEAP_DONE(p,k) ((p) == (k)) 890#define UPHEAP_DONE(p,k) ((p) == (k))
835 891
836/* away from the root */ 892/* away from the root */
837void inline_speed 893inline_speed void
838downheap (ANHE *heap, int N, int k) 894downheap (ANHE *heap, int N, int k)
839{ 895{
840 ANHE he = heap [k]; 896 ANHE he = heap [k];
841 ANHE *E = heap + N + HEAP0; 897 ANHE *E = heap + N + HEAP0;
842 898
882#define HEAP0 1 938#define HEAP0 1
883#define HPARENT(k) ((k) >> 1) 939#define HPARENT(k) ((k) >> 1)
884#define UPHEAP_DONE(p,k) (!(p)) 940#define UPHEAP_DONE(p,k) (!(p))
885 941
886/* away from the root */ 942/* away from the root */
887void inline_speed 943inline_speed void
888downheap (ANHE *heap, int N, int k) 944downheap (ANHE *heap, int N, int k)
889{ 945{
890 ANHE he = heap [k]; 946 ANHE he = heap [k];
891 947
892 for (;;) 948 for (;;)
912 ev_active (ANHE_w (he)) = k; 968 ev_active (ANHE_w (he)) = k;
913} 969}
914#endif 970#endif
915 971
916/* towards the root */ 972/* towards the root */
917void inline_speed 973inline_speed void
918upheap (ANHE *heap, int k) 974upheap (ANHE *heap, int k)
919{ 975{
920 ANHE he = heap [k]; 976 ANHE he = heap [k];
921 977
922 for (;;) 978 for (;;)
933 989
934 heap [k] = he; 990 heap [k] = he;
935 ev_active (ANHE_w (he)) = k; 991 ev_active (ANHE_w (he)) = k;
936} 992}
937 993
938void inline_size 994inline_size void
939adjustheap (ANHE *heap, int N, int k) 995adjustheap (ANHE *heap, int N, int k)
940{ 996{
941 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k])) 997 if (k > HEAP0 && ANHE_at (heap [HPARENT (k)]) >= ANHE_at (heap [k]))
942 upheap (heap, k); 998 upheap (heap, k);
943 else 999 else
944 downheap (heap, N, k); 1000 downheap (heap, N, k);
945} 1001}
946 1002
947/* rebuild the heap: this function is used only once and executed rarely */ 1003/* rebuild the heap: this function is used only once and executed rarely */
948void inline_size 1004inline_size void
949reheap (ANHE *heap, int N) 1005reheap (ANHE *heap, int N)
950{ 1006{
951 int i; 1007 int i;
952 1008
953 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */ 1009 /* we don't use floyds algorithm, upheap is simpler and is more cache-efficient */
969 1025
970static EV_ATOMIC_T gotsig; 1026static EV_ATOMIC_T gotsig;
971 1027
972/*****************************************************************************/ 1028/*****************************************************************************/
973 1029
974void inline_speed 1030inline_speed void
975fd_intern (int fd) 1031fd_intern (int fd)
976{ 1032{
977#ifdef _WIN32 1033#ifdef _WIN32
978 unsigned long arg = 1; 1034 unsigned long arg = 1;
979 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 1035 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
997 } 1053 }
998 else 1054 else
999#endif 1055#endif
1000 { 1056 {
1001 while (pipe (evpipe)) 1057 while (pipe (evpipe))
1002 syserr ("(libev) error creating signal/async pipe"); 1058 ev_syserr ("(libev) error creating signal/async pipe");
1003 1059
1004 fd_intern (evpipe [0]); 1060 fd_intern (evpipe [0]);
1005 fd_intern (evpipe [1]); 1061 fd_intern (evpipe [1]);
1006 ev_io_set (&pipeev, evpipe [0], EV_READ); 1062 ev_io_set (&pipeev, evpipe [0], EV_READ);
1007 } 1063 }
1009 ev_io_start (EV_A_ &pipeev); 1065 ev_io_start (EV_A_ &pipeev);
1010 ev_unref (EV_A); /* watcher should not keep loop alive */ 1066 ev_unref (EV_A); /* watcher should not keep loop alive */
1011 } 1067 }
1012} 1068}
1013 1069
1014void inline_size 1070inline_size void
1015evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1071evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1016{ 1072{
1017 if (!*flag) 1073 if (!*flag)
1018 { 1074 {
1019 int old_errno = errno; /* save errno because write might clobber it */ 1075 int old_errno = errno; /* save errno because write might clobber it */
1097ev_feed_signal_event (EV_P_ int signum) 1153ev_feed_signal_event (EV_P_ int signum)
1098{ 1154{
1099 WL w; 1155 WL w;
1100 1156
1101#if EV_MULTIPLICITY 1157#if EV_MULTIPLICITY
1102 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr)); 1158 assert (("libev: feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
1103#endif 1159#endif
1104 1160
1105 --signum; 1161 --signum;
1106 1162
1107 if (signum < 0 || signum >= signalmax) 1163 if (signum < 0 || signum >= signalmax)
1123 1179
1124#ifndef WIFCONTINUED 1180#ifndef WIFCONTINUED
1125# define WIFCONTINUED(status) 0 1181# define WIFCONTINUED(status) 0
1126#endif 1182#endif
1127 1183
1128void inline_speed 1184inline_speed void
1129child_reap (EV_P_ int chain, int pid, int status) 1185child_reap (EV_P_ int chain, int pid, int status)
1130{ 1186{
1131 ev_child *w; 1187 ev_child *w;
1132 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1188 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
1133 1189
1236 /* kqueue is borked on everything but netbsd apparently */ 1292 /* kqueue is borked on everything but netbsd apparently */
1237 /* it usually doesn't work correctly on anything but sockets and pipes */ 1293 /* it usually doesn't work correctly on anything but sockets and pipes */
1238 flags &= ~EVBACKEND_KQUEUE; 1294 flags &= ~EVBACKEND_KQUEUE;
1239#endif 1295#endif
1240#ifdef __APPLE__ 1296#ifdef __APPLE__
1241 // flags &= ~EVBACKEND_KQUEUE; for documentation 1297 /* only select works correctly on that "unix-certified" platform */
1242 flags &= ~EVBACKEND_POLL; 1298 flags &= ~EVBACKEND_KQUEUE; /* horribly broken, even for sockets */
1299 flags &= ~EVBACKEND_POLL; /* poll is based on kqueue from 10.5 onwards */
1243#endif 1300#endif
1244 1301
1245 return flags; 1302 return flags;
1246} 1303}
1247 1304
1284static void noinline 1341static void noinline
1285loop_init (EV_P_ unsigned int flags) 1342loop_init (EV_P_ unsigned int flags)
1286{ 1343{
1287 if (!backend) 1344 if (!backend)
1288 { 1345 {
1346#if EV_USE_REALTIME
1347 if (!have_realtime)
1348 {
1349 struct timespec ts;
1350
1351 if (!clock_gettime (CLOCK_REALTIME, &ts))
1352 have_realtime = 1;
1353 }
1354#endif
1355
1289#if EV_USE_MONOTONIC 1356#if EV_USE_MONOTONIC
1357 if (!have_monotonic)
1290 { 1358 {
1291 struct timespec ts; 1359 struct timespec ts;
1360
1292 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 1361 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
1293 have_monotonic = 1; 1362 have_monotonic = 1;
1294 } 1363 }
1295#endif 1364#endif
1296 1365
1297 ev_rt_now = ev_time (); 1366 ev_rt_now = ev_time ();
1298 mn_now = get_clock (); 1367 mn_now = get_clock ();
1299 now_floor = mn_now; 1368 now_floor = mn_now;
1398 } 1467 }
1399 1468
1400 ev_free (anfds); anfdmax = 0; 1469 ev_free (anfds); anfdmax = 0;
1401 1470
1402 /* have to use the microsoft-never-gets-it-right macro */ 1471 /* have to use the microsoft-never-gets-it-right macro */
1472 array_free (rfeed, EMPTY);
1403 array_free (fdchange, EMPTY); 1473 array_free (fdchange, EMPTY);
1404 array_free (timer, EMPTY); 1474 array_free (timer, EMPTY);
1405#if EV_PERIODIC_ENABLE 1475#if EV_PERIODIC_ENABLE
1406 array_free (periodic, EMPTY); 1476 array_free (periodic, EMPTY);
1407#endif 1477#endif
1416 1486
1417 backend = 0; 1487 backend = 0;
1418} 1488}
1419 1489
1420#if EV_USE_INOTIFY 1490#if EV_USE_INOTIFY
1421void inline_size infy_fork (EV_P); 1491inline_size void infy_fork (EV_P);
1422#endif 1492#endif
1423 1493
1424void inline_size 1494inline_size void
1425loop_fork (EV_P) 1495loop_fork (EV_P)
1426{ 1496{
1427#if EV_USE_PORT 1497#if EV_USE_PORT
1428 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1498 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
1429#endif 1499#endif
1500 1570
1501#if EV_VERIFY 1571#if EV_VERIFY
1502static void noinline 1572static void noinline
1503verify_watcher (EV_P_ W w) 1573verify_watcher (EV_P_ W w)
1504{ 1574{
1505 assert (("watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 1575 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1506 1576
1507 if (w->pending) 1577 if (w->pending)
1508 assert (("pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 1578 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1509} 1579}
1510 1580
1511static void noinline 1581static void noinline
1512verify_heap (EV_P_ ANHE *heap, int N) 1582verify_heap (EV_P_ ANHE *heap, int N)
1513{ 1583{
1514 int i; 1584 int i;
1515 1585
1516 for (i = HEAP0; i < N + HEAP0; ++i) 1586 for (i = HEAP0; i < N + HEAP0; ++i)
1517 { 1587 {
1518 assert (("active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i)); 1588 assert (("libev: active index mismatch in heap", ev_active (ANHE_w (heap [i])) == i));
1519 assert (("heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i]))); 1589 assert (("libev: heap condition violated", i == HEAP0 || ANHE_at (heap [HPARENT (i)]) <= ANHE_at (heap [i])));
1520 assert (("heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i])))); 1590 assert (("libev: heap at cache mismatch", ANHE_at (heap [i]) == ev_at (ANHE_w (heap [i]))));
1521 1591
1522 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 1592 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1523 } 1593 }
1524} 1594}
1525 1595
1526static void noinline 1596static void noinline
1527array_verify (EV_P_ W *ws, int cnt) 1597array_verify (EV_P_ W *ws, int cnt)
1528{ 1598{
1529 while (cnt--) 1599 while (cnt--)
1530 { 1600 {
1531 assert (("active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 1601 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1532 verify_watcher (EV_A_ ws [cnt]); 1602 verify_watcher (EV_A_ ws [cnt]);
1533 } 1603 }
1534} 1604}
1535#endif 1605#endif
1536 1606
1543 1613
1544 assert (activecnt >= -1); 1614 assert (activecnt >= -1);
1545 1615
1546 assert (fdchangemax >= fdchangecnt); 1616 assert (fdchangemax >= fdchangecnt);
1547 for (i = 0; i < fdchangecnt; ++i) 1617 for (i = 0; i < fdchangecnt; ++i)
1548 assert (("negative fd in fdchanges", fdchanges [i] >= 0)); 1618 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
1549 1619
1550 assert (anfdmax >= 0); 1620 assert (anfdmax >= 0);
1551 for (i = 0; i < anfdmax; ++i) 1621 for (i = 0; i < anfdmax; ++i)
1552 for (w = anfds [i].head; w; w = w->next) 1622 for (w = anfds [i].head; w; w = w->next)
1553 { 1623 {
1554 verify_watcher (EV_A_ (W)w); 1624 verify_watcher (EV_A_ (W)w);
1555 assert (("inactive fd watcher on anfd list", ev_active (w) == 1)); 1625 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
1556 assert (("fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 1626 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
1557 } 1627 }
1558 1628
1559 assert (timermax >= timercnt); 1629 assert (timermax >= timercnt);
1560 verify_heap (EV_A_ timers, timercnt); 1630 verify_heap (EV_A_ timers, timercnt);
1561 1631
1655{ 1725{
1656#if EV_MULTIPLICITY 1726#if EV_MULTIPLICITY
1657 struct ev_loop *loop = ev_default_loop_ptr; 1727 struct ev_loop *loop = ev_default_loop_ptr;
1658#endif 1728#endif
1659 1729
1660 if (backend)
1661 postfork = 1; /* must be in line with ev_loop_fork */ 1730 postfork = 1; /* must be in line with ev_loop_fork */
1662} 1731}
1663 1732
1664/*****************************************************************************/ 1733/*****************************************************************************/
1665 1734
1666void 1735void
1667ev_invoke (EV_P_ void *w, int revents) 1736ev_invoke (EV_P_ void *w, int revents)
1668{ 1737{
1669 EV_CB_INVOKE ((W)w, revents); 1738 EV_CB_INVOKE ((W)w, revents);
1670} 1739}
1671 1740
1672void inline_speed 1741inline_speed void
1673call_pending (EV_P) 1742call_pending (EV_P)
1674{ 1743{
1675 int pri; 1744 int pri;
1676 1745
1677 for (pri = NUMPRI; pri--; ) 1746 for (pri = NUMPRI; pri--; )
1679 { 1748 {
1680 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1749 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1681 1750
1682 if (expect_true (p->w)) 1751 if (expect_true (p->w))
1683 { 1752 {
1684 /*assert (("non-pending watcher on pending list", p->w->pending));*/ 1753 /*assert (("libev: non-pending watcher on pending list", p->w->pending));*/
1685 1754
1686 p->w->pending = 0; 1755 p->w->pending = 0;
1687 EV_CB_INVOKE (p->w, p->events); 1756 EV_CB_INVOKE (p->w, p->events);
1688 EV_FREQUENT_CHECK; 1757 EV_FREQUENT_CHECK;
1689 } 1758 }
1690 } 1759 }
1691} 1760}
1692 1761
1693#if EV_IDLE_ENABLE 1762#if EV_IDLE_ENABLE
1694void inline_size 1763inline_size void
1695idle_reify (EV_P) 1764idle_reify (EV_P)
1696{ 1765{
1697 if (expect_false (idleall)) 1766 if (expect_false (idleall))
1698 { 1767 {
1699 int pri; 1768 int pri;
1711 } 1780 }
1712 } 1781 }
1713} 1782}
1714#endif 1783#endif
1715 1784
1716void inline_size 1785inline_size void
1717timers_reify (EV_P) 1786timers_reify (EV_P)
1718{ 1787{
1719 EV_FREQUENT_CHECK; 1788 EV_FREQUENT_CHECK;
1720 1789
1721 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now) 1790 if (timercnt && ANHE_at (timers [HEAP0]) < mn_now)
1722 { 1791 {
1723 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]); 1792 do
1724
1725 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1726
1727 /* first reschedule or stop timer */
1728 if (w->repeat)
1729 { 1793 {
1794 ev_timer *w = (ev_timer *)ANHE_w (timers [HEAP0]);
1795
1796 /*assert (("libev: inactive timer on timer heap detected", ev_is_active (w)));*/
1797
1798 /* first reschedule or stop timer */
1799 if (w->repeat)
1800 {
1730 ev_at (w) += w->repeat; 1801 ev_at (w) += w->repeat;
1731 if (ev_at (w) < mn_now) 1802 if (ev_at (w) < mn_now)
1732 ev_at (w) = mn_now; 1803 ev_at (w) = mn_now;
1733 1804
1734 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1805 assert (("libev: negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1735 1806
1736 ANHE_at_cache (timers [HEAP0]); 1807 ANHE_at_cache (timers [HEAP0]);
1737 downheap (timers, timercnt, HEAP0); 1808 downheap (timers, timercnt, HEAP0);
1809 }
1810 else
1811 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1812
1813 EV_FREQUENT_CHECK;
1814 feed_reverse (EV_A_ (W)w);
1738 } 1815 }
1739 else 1816 while (timercnt && ANHE_at (timers [HEAP0]) < mn_now);
1740 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1741 1817
1742 EV_FREQUENT_CHECK;
1743 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1818 feed_reverse_done (EV_A_ EV_TIMEOUT);
1744 } 1819 }
1745} 1820}
1746 1821
1747#if EV_PERIODIC_ENABLE 1822#if EV_PERIODIC_ENABLE
1748void inline_size 1823inline_size void
1749periodics_reify (EV_P) 1824periodics_reify (EV_P)
1750{ 1825{
1751 EV_FREQUENT_CHECK; 1826 EV_FREQUENT_CHECK;
1752 1827
1753 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now) 1828 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now)
1754 { 1829 {
1755 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]); 1830 int feed_count = 0;
1756 1831
1757 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1832 do
1758
1759 /* first reschedule or stop timer */
1760 if (w->reschedule_cb)
1761 { 1833 {
1834 ev_periodic *w = (ev_periodic *)ANHE_w (periodics [HEAP0]);
1835
1836 /*assert (("libev: inactive timer on periodic heap detected", ev_is_active (w)));*/
1837
1838 /* first reschedule or stop timer */
1839 if (w->reschedule_cb)
1840 {
1762 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 1841 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1763 1842
1764 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now)); 1843 assert (("libev: ev_periodic reschedule callback returned time in the past", ev_at (w) >= ev_rt_now));
1765 1844
1766 ANHE_at_cache (periodics [HEAP0]); 1845 ANHE_at_cache (periodics [HEAP0]);
1767 downheap (periodics, periodiccnt, HEAP0); 1846 downheap (periodics, periodiccnt, HEAP0);
1847 }
1848 else if (w->interval)
1849 {
1850 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1851 /* if next trigger time is not sufficiently in the future, put it there */
1852 /* this might happen because of floating point inexactness */
1853 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1854 {
1855 ev_at (w) += w->interval;
1856
1857 /* if interval is unreasonably low we might still have a time in the past */
1858 /* so correct this. this will make the periodic very inexact, but the user */
1859 /* has effectively asked to get triggered more often than possible */
1860 if (ev_at (w) < ev_rt_now)
1861 ev_at (w) = ev_rt_now;
1862 }
1863
1864 ANHE_at_cache (periodics [HEAP0]);
1865 downheap (periodics, periodiccnt, HEAP0);
1866 }
1867 else
1868 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1869
1870 EV_FREQUENT_CHECK;
1871 feed_reverse (EV_A_ (W)w);
1768 } 1872 }
1769 else if (w->interval) 1873 while (periodiccnt && ANHE_at (periodics [HEAP0]) < ev_rt_now);
1770 {
1771 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1772 /* if next trigger time is not sufficiently in the future, put it there */
1773 /* this might happen because of floating point inexactness */
1774 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
1775 {
1776 ev_at (w) += w->interval;
1777 1874
1778 /* if interval is unreasonably low we might still have a time in the past */
1779 /* so correct this. this will make the periodic very inexact, but the user */
1780 /* has effectively asked to get triggered more often than possible */
1781 if (ev_at (w) < ev_rt_now)
1782 ev_at (w) = ev_rt_now;
1783 }
1784
1785 ANHE_at_cache (periodics [HEAP0]);
1786 downheap (periodics, periodiccnt, HEAP0);
1787 }
1788 else
1789 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1790
1791 EV_FREQUENT_CHECK;
1792 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1875 feed_reverse_done (EV_A_ EV_PERIODIC);
1793 } 1876 }
1794} 1877}
1795 1878
1796static void noinline 1879static void noinline
1797periodics_reschedule (EV_P) 1880periodics_reschedule (EV_P)
1813 1896
1814 reheap (periodics, periodiccnt); 1897 reheap (periodics, periodiccnt);
1815} 1898}
1816#endif 1899#endif
1817 1900
1818void inline_speed 1901static void noinline
1902timers_reschedule (EV_P_ ev_tstamp adjust)
1903{
1904 int i;
1905
1906 for (i = 0; i < timercnt; ++i)
1907 {
1908 ANHE *he = timers + i + HEAP0;
1909 ANHE_w (*he)->at += adjust;
1910 ANHE_at_cache (*he);
1911 }
1912}
1913
1914inline_speed void
1819time_update (EV_P_ ev_tstamp max_block) 1915time_update (EV_P_ ev_tstamp max_block)
1820{ 1916{
1821 int i; 1917 int i;
1822 1918
1823#if EV_USE_MONOTONIC 1919#if EV_USE_MONOTONIC
1856 ev_rt_now = ev_time (); 1952 ev_rt_now = ev_time ();
1857 mn_now = get_clock (); 1953 mn_now = get_clock ();
1858 now_floor = mn_now; 1954 now_floor = mn_now;
1859 } 1955 }
1860 1956
1957 /* no timer adjustment, as the monotonic clock doesn't jump */
1958 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1861# if EV_PERIODIC_ENABLE 1959# if EV_PERIODIC_ENABLE
1862 periodics_reschedule (EV_A); 1960 periodics_reschedule (EV_A);
1863# endif 1961# endif
1864 /* no timer adjustment, as the monotonic clock doesn't jump */
1865 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1866 } 1962 }
1867 else 1963 else
1868#endif 1964#endif
1869 { 1965 {
1870 ev_rt_now = ev_time (); 1966 ev_rt_now = ev_time ();
1871 1967
1872 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP)) 1968 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1873 { 1969 {
1970 /* adjust timers. this is easy, as the offset is the same for all of them */
1971 timers_reschedule (EV_A_ ev_rt_now - mn_now);
1874#if EV_PERIODIC_ENABLE 1972#if EV_PERIODIC_ENABLE
1875 periodics_reschedule (EV_A); 1973 periodics_reschedule (EV_A);
1876#endif 1974#endif
1877 /* adjust timers. this is easy, as the offset is the same for all of them */
1878 for (i = 0; i < timercnt; ++i)
1879 {
1880 ANHE *he = timers + i + HEAP0;
1881 ANHE_w (*he)->at += ev_rt_now - mn_now;
1882 ANHE_at_cache (*he);
1883 }
1884 } 1975 }
1885 1976
1886 mn_now = ev_rt_now; 1977 mn_now = ev_rt_now;
1887 } 1978 }
1888}
1889
1890void
1891ev_ref (EV_P)
1892{
1893 ++activecnt;
1894}
1895
1896void
1897ev_unref (EV_P)
1898{
1899 --activecnt;
1900}
1901
1902void
1903ev_now_update (EV_P)
1904{
1905 time_update (EV_A_ 1e100);
1906} 1979}
1907 1980
1908static int loop_done; 1981static int loop_done;
1909 1982
1910void 1983void
1944 { 2017 {
1945 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 2018 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1946 call_pending (EV_A); 2019 call_pending (EV_A);
1947 } 2020 }
1948 2021
1949 if (expect_false (!activecnt))
1950 break;
1951
1952 /* we might have forked, so reify kernel state if necessary */ 2022 /* we might have forked, so reify kernel state if necessary */
1953 if (expect_false (postfork)) 2023 if (expect_false (postfork))
1954 loop_fork (EV_A); 2024 loop_fork (EV_A);
1955 2025
1956 /* update fd-related kernel structures */ 2026 /* update fd-related kernel structures */
2035ev_unloop (EV_P_ int how) 2105ev_unloop (EV_P_ int how)
2036{ 2106{
2037 loop_done = how; 2107 loop_done = how;
2038} 2108}
2039 2109
2110void
2111ev_ref (EV_P)
2112{
2113 ++activecnt;
2114}
2115
2116void
2117ev_unref (EV_P)
2118{
2119 --activecnt;
2120}
2121
2122void
2123ev_now_update (EV_P)
2124{
2125 time_update (EV_A_ 1e100);
2126}
2127
2128void
2129ev_suspend (EV_P)
2130{
2131 ev_now_update (EV_A);
2132}
2133
2134void
2135ev_resume (EV_P)
2136{
2137 ev_tstamp mn_prev = mn_now;
2138
2139 ev_now_update (EV_A);
2140 timers_reschedule (EV_A_ mn_now - mn_prev);
2141#if EV_PERIODIC_ENABLE
2142 periodics_reschedule (EV_A);
2143#endif
2144}
2145
2040/*****************************************************************************/ 2146/*****************************************************************************/
2041 2147
2042void inline_size 2148inline_size void
2043wlist_add (WL *head, WL elem) 2149wlist_add (WL *head, WL elem)
2044{ 2150{
2045 elem->next = *head; 2151 elem->next = *head;
2046 *head = elem; 2152 *head = elem;
2047} 2153}
2048 2154
2049void inline_size 2155inline_size void
2050wlist_del (WL *head, WL elem) 2156wlist_del (WL *head, WL elem)
2051{ 2157{
2052 while (*head) 2158 while (*head)
2053 { 2159 {
2054 if (*head == elem) 2160 if (*head == elem)
2059 2165
2060 head = &(*head)->next; 2166 head = &(*head)->next;
2061 } 2167 }
2062} 2168}
2063 2169
2064void inline_speed 2170inline_speed void
2065clear_pending (EV_P_ W w) 2171clear_pending (EV_P_ W w)
2066{ 2172{
2067 if (w->pending) 2173 if (w->pending)
2068 { 2174 {
2069 pendings [ABSPRI (w)][w->pending - 1].w = 0; 2175 pendings [ABSPRI (w)][w->pending - 1].w = 0;
2086 } 2192 }
2087 else 2193 else
2088 return 0; 2194 return 0;
2089} 2195}
2090 2196
2091void inline_size 2197inline_size void
2092pri_adjust (EV_P_ W w) 2198pri_adjust (EV_P_ W w)
2093{ 2199{
2094 int pri = w->priority; 2200 int pri = w->priority;
2095 pri = pri < EV_MINPRI ? EV_MINPRI : pri; 2201 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
2096 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri; 2202 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
2097 w->priority = pri; 2203 w->priority = pri;
2098} 2204}
2099 2205
2100void inline_speed 2206inline_speed void
2101ev_start (EV_P_ W w, int active) 2207ev_start (EV_P_ W w, int active)
2102{ 2208{
2103 pri_adjust (EV_A_ w); 2209 pri_adjust (EV_A_ w);
2104 w->active = active; 2210 w->active = active;
2105 ev_ref (EV_A); 2211 ev_ref (EV_A);
2106} 2212}
2107 2213
2108void inline_size 2214inline_size void
2109ev_stop (EV_P_ W w) 2215ev_stop (EV_P_ W w)
2110{ 2216{
2111 ev_unref (EV_A); 2217 ev_unref (EV_A);
2112 w->active = 0; 2218 w->active = 0;
2113} 2219}
2120 int fd = w->fd; 2226 int fd = w->fd;
2121 2227
2122 if (expect_false (ev_is_active (w))) 2228 if (expect_false (ev_is_active (w)))
2123 return; 2229 return;
2124 2230
2125 assert (("ev_io_start called with negative fd", fd >= 0)); 2231 assert (("libev: ev_io_start called with negative fd", fd >= 0));
2126 assert (("ev_io start called with illegal event mask", !(w->events & ~(EV_IOFDSET | EV_READ | EV_WRITE)))); 2232 assert (("libev: ev_io start called with illegal event mask", !(w->events & ~(EV__IOFDSET | EV_READ | EV_WRITE))));
2127 2233
2128 EV_FREQUENT_CHECK; 2234 EV_FREQUENT_CHECK;
2129 2235
2130 ev_start (EV_A_ (W)w, 1); 2236 ev_start (EV_A_ (W)w, 1);
2131 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 2237 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
2132 wlist_add (&anfds[fd].head, (WL)w); 2238 wlist_add (&anfds[fd].head, (WL)w);
2133 2239
2134 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1); 2240 fd_change (EV_A_ fd, w->events & EV__IOFDSET | 1);
2135 w->events &= ~EV_IOFDSET; 2241 w->events &= ~EV__IOFDSET;
2136 2242
2137 EV_FREQUENT_CHECK; 2243 EV_FREQUENT_CHECK;
2138} 2244}
2139 2245
2140void noinline 2246void noinline
2142{ 2248{
2143 clear_pending (EV_A_ (W)w); 2249 clear_pending (EV_A_ (W)w);
2144 if (expect_false (!ev_is_active (w))) 2250 if (expect_false (!ev_is_active (w)))
2145 return; 2251 return;
2146 2252
2147 assert (("ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 2253 assert (("libev: ev_io_stop called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
2148 2254
2149 EV_FREQUENT_CHECK; 2255 EV_FREQUENT_CHECK;
2150 2256
2151 wlist_del (&anfds[w->fd].head, (WL)w); 2257 wlist_del (&anfds[w->fd].head, (WL)w);
2152 ev_stop (EV_A_ (W)w); 2258 ev_stop (EV_A_ (W)w);
2162 if (expect_false (ev_is_active (w))) 2268 if (expect_false (ev_is_active (w)))
2163 return; 2269 return;
2164 2270
2165 ev_at (w) += mn_now; 2271 ev_at (w) += mn_now;
2166 2272
2167 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 2273 assert (("libev: ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
2168 2274
2169 EV_FREQUENT_CHECK; 2275 EV_FREQUENT_CHECK;
2170 2276
2171 ++timercnt; 2277 ++timercnt;
2172 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1); 2278 ev_start (EV_A_ (W)w, timercnt + HEAP0 - 1);
2175 ANHE_at_cache (timers [ev_active (w)]); 2281 ANHE_at_cache (timers [ev_active (w)]);
2176 upheap (timers, ev_active (w)); 2282 upheap (timers, ev_active (w));
2177 2283
2178 EV_FREQUENT_CHECK; 2284 EV_FREQUENT_CHECK;
2179 2285
2180 /*assert (("internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/ 2286 /*assert (("libev: internal timer heap corruption", timers [ev_active (w)] == (WT)w));*/
2181} 2287}
2182 2288
2183void noinline 2289void noinline
2184ev_timer_stop (EV_P_ ev_timer *w) 2290ev_timer_stop (EV_P_ ev_timer *w)
2185{ 2291{
2190 EV_FREQUENT_CHECK; 2296 EV_FREQUENT_CHECK;
2191 2297
2192 { 2298 {
2193 int active = ev_active (w); 2299 int active = ev_active (w);
2194 2300
2195 assert (("internal timer heap corruption", ANHE_w (timers [active]) == (WT)w)); 2301 assert (("libev: internal timer heap corruption", ANHE_w (timers [active]) == (WT)w));
2196 2302
2197 --timercnt; 2303 --timercnt;
2198 2304
2199 if (expect_true (active < timercnt + HEAP0)) 2305 if (expect_true (active < timercnt + HEAP0))
2200 { 2306 {
2244 2350
2245 if (w->reschedule_cb) 2351 if (w->reschedule_cb)
2246 ev_at (w) = w->reschedule_cb (w, ev_rt_now); 2352 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
2247 else if (w->interval) 2353 else if (w->interval)
2248 { 2354 {
2249 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 2355 assert (("libev: ev_periodic_start called with negative interval value", w->interval >= 0.));
2250 /* this formula differs from the one in periodic_reify because we do not always round up */ 2356 /* this formula differs from the one in periodic_reify because we do not always round up */
2251 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2357 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
2252 } 2358 }
2253 else 2359 else
2254 ev_at (w) = w->offset; 2360 ev_at (w) = w->offset;
2262 ANHE_at_cache (periodics [ev_active (w)]); 2368 ANHE_at_cache (periodics [ev_active (w)]);
2263 upheap (periodics, ev_active (w)); 2369 upheap (periodics, ev_active (w));
2264 2370
2265 EV_FREQUENT_CHECK; 2371 EV_FREQUENT_CHECK;
2266 2372
2267 /*assert (("internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/ 2373 /*assert (("libev: internal periodic heap corruption", ANHE_w (periodics [ev_active (w)]) == (WT)w));*/
2268} 2374}
2269 2375
2270void noinline 2376void noinline
2271ev_periodic_stop (EV_P_ ev_periodic *w) 2377ev_periodic_stop (EV_P_ ev_periodic *w)
2272{ 2378{
2277 EV_FREQUENT_CHECK; 2383 EV_FREQUENT_CHECK;
2278 2384
2279 { 2385 {
2280 int active = ev_active (w); 2386 int active = ev_active (w);
2281 2387
2282 assert (("internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w)); 2388 assert (("libev: internal periodic heap corruption", ANHE_w (periodics [active]) == (WT)w));
2283 2389
2284 --periodiccnt; 2390 --periodiccnt;
2285 2391
2286 if (expect_true (active < periodiccnt + HEAP0)) 2392 if (expect_true (active < periodiccnt + HEAP0))
2287 { 2393 {
2310 2416
2311void noinline 2417void noinline
2312ev_signal_start (EV_P_ ev_signal *w) 2418ev_signal_start (EV_P_ ev_signal *w)
2313{ 2419{
2314#if EV_MULTIPLICITY 2420#if EV_MULTIPLICITY
2315 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2421 assert (("libev: signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2316#endif 2422#endif
2317 if (expect_false (ev_is_active (w))) 2423 if (expect_false (ev_is_active (w)))
2318 return; 2424 return;
2319 2425
2320 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 2426 assert (("libev: ev_signal_start called with illegal signal number", w->signum > 0));
2321 2427
2322 evpipe_init (EV_A); 2428 evpipe_init (EV_A);
2323 2429
2324 EV_FREQUENT_CHECK; 2430 EV_FREQUENT_CHECK;
2325 2431
2376 2482
2377void 2483void
2378ev_child_start (EV_P_ ev_child *w) 2484ev_child_start (EV_P_ ev_child *w)
2379{ 2485{
2380#if EV_MULTIPLICITY 2486#if EV_MULTIPLICITY
2381 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr)); 2487 assert (("libev: child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
2382#endif 2488#endif
2383 if (expect_false (ev_is_active (w))) 2489 if (expect_false (ev_is_active (w)))
2384 return; 2490 return;
2385 2491
2386 EV_FREQUENT_CHECK; 2492 EV_FREQUENT_CHECK;
2411# ifdef _WIN32 2517# ifdef _WIN32
2412# undef lstat 2518# undef lstat
2413# define lstat(a,b) _stati64 (a,b) 2519# define lstat(a,b) _stati64 (a,b)
2414# endif 2520# endif
2415 2521
2416#define DEF_STAT_INTERVAL 5.0074891 2522#define DEF_STAT_INTERVAL 5.0074891
2523#define NFS_STAT_INTERVAL 30.1074891 /* for filesystems potentially failing inotify */
2417#define MIN_STAT_INTERVAL 0.1074891 2524#define MIN_STAT_INTERVAL 0.1074891
2418 2525
2419static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents); 2526static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
2420 2527
2421#if EV_USE_INOTIFY 2528#if EV_USE_INOTIFY
2422# define EV_INOTIFY_BUFSIZE 8192 2529# define EV_INOTIFY_BUFSIZE 8192
2426{ 2533{
2427 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD); 2534 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
2428 2535
2429 if (w->wd < 0) 2536 if (w->wd < 0)
2430 { 2537 {
2538 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
2431 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2539 ev_timer_again (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2432 2540
2433 /* monitor some parent directory for speedup hints */ 2541 /* monitor some parent directory for speedup hints */
2434 /* note that exceeding the hardcoded limit is not a correctness issue, */ 2542 /* note that exceeding the hardcoded path limit is not a correctness issue, */
2435 /* but an efficiency issue only */ 2543 /* but an efficiency issue only */
2436 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2544 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2437 { 2545 {
2438 char path [4096]; 2546 char path [4096];
2439 strcpy (path, w->path); 2547 strcpy (path, w->path);
2443 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF 2551 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
2444 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO); 2552 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
2445 2553
2446 char *pend = strrchr (path, '/'); 2554 char *pend = strrchr (path, '/');
2447 2555
2448 if (!pend) 2556 if (!pend || pend == path)
2449 break; /* whoops, no '/', complain to your admin */ 2557 break;
2450 2558
2451 *pend = 0; 2559 *pend = 0;
2452 w->wd = inotify_add_watch (fs_fd, path, mask); 2560 w->wd = inotify_add_watch (fs_fd, path, mask);
2453 } 2561 }
2454 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 2562 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
2455 } 2563 }
2456 } 2564 }
2457 else
2458 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
2459 2565
2460 if (w->wd >= 0) 2566 if (w->wd >= 0)
2567 {
2461 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w); 2568 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2569
2570 /* now local changes will be tracked by inotify, but remote changes won't */
2571 /* unless the filesystem it known to be local, we therefore still poll */
2572 /* also do poll on <2.6.25, but with normal frequency */
2573 struct statfs sfs;
2574
2575 if (fs_2625 && !statfs (w->path, &sfs))
2576 if (sfs.f_type == 0x1373 /* devfs */
2577 || sfs.f_type == 0xEF53 /* ext2/3 */
2578 || sfs.f_type == 0x3153464a /* jfs */
2579 || sfs.f_type == 0x52654973 /* reiser3 */
2580 || sfs.f_type == 0x01021994 /* tempfs */
2581 || sfs.f_type == 0x58465342 /* xfs */)
2582 return;
2583
2584 w->timer.repeat = w->interval ? w->interval : fs_2625 ? NFS_STAT_INTERVAL : DEF_STAT_INTERVAL;
2585 ev_timer_again (EV_A_ &w->timer);
2586 }
2462} 2587}
2463 2588
2464static void noinline 2589static void noinline
2465infy_del (EV_P_ ev_stat *w) 2590infy_del (EV_P_ ev_stat *w)
2466{ 2591{
2496 2621
2497 if (w->wd == wd || wd == -1) 2622 if (w->wd == wd || wd == -1)
2498 { 2623 {
2499 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF)) 2624 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
2500 { 2625 {
2626 wlist_del (&fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
2501 w->wd = -1; 2627 w->wd = -1;
2502 infy_add (EV_A_ w); /* re-add, no matter what */ 2628 infy_add (EV_A_ w); /* re-add, no matter what */
2503 } 2629 }
2504 2630
2505 stat_timer_cb (EV_A_ &w->timer, 0); 2631 stat_timer_cb (EV_A_ &w->timer, 0);
2518 2644
2519 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len) 2645 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
2520 infy_wd (EV_A_ ev->wd, ev->wd, ev); 2646 infy_wd (EV_A_ ev->wd, ev->wd, ev);
2521} 2647}
2522 2648
2523void inline_size 2649inline_size void
2524infy_init (EV_P) 2650check_2625 (EV_P)
2525{ 2651{
2526 if (fs_fd != -2)
2527 return;
2528
2529 /* kernels < 2.6.25 are borked 2652 /* kernels < 2.6.25 are borked
2530 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 2653 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
2531 */ 2654 */
2532 {
2533 struct utsname buf; 2655 struct utsname buf;
2534 int major, minor, micro; 2656 int major, minor, micro;
2535 2657
2536 fs_fd = -1;
2537
2538 if (uname (&buf)) 2658 if (uname (&buf))
2539 return; 2659 return;
2540 2660
2541 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3) 2661 if (sscanf (buf.release, "%d.%d.%d", &major, &minor, &micro) != 3)
2542 return; 2662 return;
2543 2663
2544 if (major < 2 2664 if (major < 2
2545 || (major == 2 && minor < 6) 2665 || (major == 2 && minor < 6)
2546 || (major == 2 && minor == 6 && micro < 25)) 2666 || (major == 2 && minor == 6 && micro < 25))
2547 return; 2667 return;
2548 } 2668
2669 fs_2625 = 1;
2670}
2671
2672inline_size void
2673infy_init (EV_P)
2674{
2675 if (fs_fd != -2)
2676 return;
2677
2678 fs_fd = -1;
2679
2680 check_2625 (EV_A);
2549 2681
2550 fs_fd = inotify_init (); 2682 fs_fd = inotify_init ();
2551 2683
2552 if (fs_fd >= 0) 2684 if (fs_fd >= 0)
2553 { 2685 {
2555 ev_set_priority (&fs_w, EV_MAXPRI); 2687 ev_set_priority (&fs_w, EV_MAXPRI);
2556 ev_io_start (EV_A_ &fs_w); 2688 ev_io_start (EV_A_ &fs_w);
2557 } 2689 }
2558} 2690}
2559 2691
2560void inline_size 2692inline_size void
2561infy_fork (EV_P) 2693infy_fork (EV_P)
2562{ 2694{
2563 int slot; 2695 int slot;
2564 2696
2565 if (fs_fd < 0) 2697 if (fs_fd < 0)
2581 w->wd = -1; 2713 w->wd = -1;
2582 2714
2583 if (fs_fd >= 0) 2715 if (fs_fd >= 0)
2584 infy_add (EV_A_ w); /* re-add, no matter what */ 2716 infy_add (EV_A_ w); /* re-add, no matter what */
2585 else 2717 else
2586 ev_timer_start (EV_A_ &w->timer); 2718 ev_timer_again (EV_A_ &w->timer);
2587 } 2719 }
2588 } 2720 }
2589} 2721}
2590 2722
2591#endif 2723#endif
2646ev_stat_start (EV_P_ ev_stat *w) 2778ev_stat_start (EV_P_ ev_stat *w)
2647{ 2779{
2648 if (expect_false (ev_is_active (w))) 2780 if (expect_false (ev_is_active (w)))
2649 return; 2781 return;
2650 2782
2651 /* since we use memcmp, we need to clear any padding data etc. */
2652 memset (&w->prev, 0, sizeof (ev_statdata));
2653 memset (&w->attr, 0, sizeof (ev_statdata));
2654
2655 ev_stat_stat (EV_A_ w); 2783 ev_stat_stat (EV_A_ w);
2656 2784
2785 if (w->interval < MIN_STAT_INTERVAL && w->interval)
2657 if (w->interval < MIN_STAT_INTERVAL) 2786 w->interval = MIN_STAT_INTERVAL;
2658 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2659 2787
2660 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval); 2788 ev_timer_init (&w->timer, stat_timer_cb, 0., w->interval ? w->interval : DEF_STAT_INTERVAL);
2661 ev_set_priority (&w->timer, ev_priority (w)); 2789 ev_set_priority (&w->timer, ev_priority (w));
2662 2790
2663#if EV_USE_INOTIFY 2791#if EV_USE_INOTIFY
2664 infy_init (EV_A); 2792 infy_init (EV_A);
2665 2793
2666 if (fs_fd >= 0) 2794 if (fs_fd >= 0)
2667 infy_add (EV_A_ w); 2795 infy_add (EV_A_ w);
2668 else 2796 else
2669#endif 2797#endif
2670 ev_timer_start (EV_A_ &w->timer); 2798 ev_timer_again (EV_A_ &w->timer);
2671 2799
2672 ev_start (EV_A_ (W)w, 1); 2800 ev_start (EV_A_ (W)w, 1);
2673 2801
2674 EV_FREQUENT_CHECK; 2802 EV_FREQUENT_CHECK;
2675} 2803}
2850static void 2978static void
2851embed_fork_cb (EV_P_ ev_fork *fork_w, int revents) 2979embed_fork_cb (EV_P_ ev_fork *fork_w, int revents)
2852{ 2980{
2853 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork)); 2981 ev_embed *w = (ev_embed *)(((char *)fork_w) - offsetof (ev_embed, fork));
2854 2982
2983 ev_embed_stop (EV_A_ w);
2984
2855 { 2985 {
2856 struct ev_loop *loop = w->other; 2986 struct ev_loop *loop = w->other;
2857 2987
2858 ev_loop_fork (EV_A); 2988 ev_loop_fork (EV_A);
2989 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2859 } 2990 }
2991
2992 ev_embed_start (EV_A_ w);
2860} 2993}
2861 2994
2862#if 0 2995#if 0
2863static void 2996static void
2864embed_idle_cb (EV_P_ ev_idle *idle, int revents) 2997embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2873 if (expect_false (ev_is_active (w))) 3006 if (expect_false (ev_is_active (w)))
2874 return; 3007 return;
2875 3008
2876 { 3009 {
2877 struct ev_loop *loop = w->other; 3010 struct ev_loop *loop = w->other;
2878 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 3011 assert (("libev: loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2879 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ); 3012 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2880 } 3013 }
2881 3014
2882 EV_FREQUENT_CHECK; 3015 EV_FREQUENT_CHECK;
2883 3016
3066 ev_timer_set (&once->to, timeout, 0.); 3199 ev_timer_set (&once->to, timeout, 0.);
3067 ev_timer_start (EV_A_ &once->to); 3200 ev_timer_start (EV_A_ &once->to);
3068 } 3201 }
3069} 3202}
3070 3203
3204/*****************************************************************************/
3205
3206#if 0
3207void
3208ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3209{
3210 int i, j;
3211 ev_watcher_list *wl, *wn;
3212
3213 if (types & (EV_IO | EV_EMBED))
3214 for (i = 0; i < anfdmax; ++i)
3215 for (wl = anfds [i].head; wl; )
3216 {
3217 wn = wl->next;
3218
3219#if EV_EMBED_ENABLE
3220 if (ev_cb ((ev_io *)wl) == embed_io_cb)
3221 {
3222 if (types & EV_EMBED)
3223 cb (EV_A_ EV_EMBED, ((char *)wl) - offsetof (struct ev_embed, io));
3224 }
3225 else
3226#endif
3227#if EV_USE_INOTIFY
3228 if (ev_cb ((ev_io *)wl) == infy_cb)
3229 ;
3230 else
3231#endif
3232 if ((ev_io *)wl != &pipeev)
3233 if (types & EV_IO)
3234 cb (EV_A_ EV_IO, wl);
3235
3236 wl = wn;
3237 }
3238
3239 if (types & (EV_TIMER | EV_STAT))
3240 for (i = timercnt + HEAP0; i-- > HEAP0; )
3241#if EV_STAT_ENABLE
3242 /*TODO: timer is not always active*/
3243 if (ev_cb ((ev_timer *)ANHE_w (timers [i])) == stat_timer_cb)
3244 {
3245 if (types & EV_STAT)
3246 cb (EV_A_ EV_STAT, ((char *)ANHE_w (timers [i])) - offsetof (struct ev_stat, timer));
3247 }
3248 else
3249#endif
3250 if (types & EV_TIMER)
3251 cb (EV_A_ EV_TIMER, ANHE_w (timers [i]));
3252
3253#if EV_PERIODIC_ENABLE
3254 if (types & EV_PERIODIC)
3255 for (i = periodiccnt + HEAP0; i-- > HEAP0; )
3256 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
3257#endif
3258
3259#if EV_IDLE_ENABLE
3260 if (types & EV_IDLE)
3261 for (j = NUMPRI; i--; )
3262 for (i = idlecnt [j]; i--; )
3263 cb (EV_A_ EV_IDLE, idles [j][i]);
3264#endif
3265
3266#if EV_FORK_ENABLE
3267 if (types & EV_FORK)
3268 for (i = forkcnt; i--; )
3269 if (ev_cb (forks [i]) != embed_fork_cb)
3270 cb (EV_A_ EV_FORK, forks [i]);
3271#endif
3272
3273#if EV_ASYNC_ENABLE
3274 if (types & EV_ASYNC)
3275 for (i = asynccnt; i--; )
3276 cb (EV_A_ EV_ASYNC, asyncs [i]);
3277#endif
3278
3279 if (types & EV_PREPARE)
3280 for (i = preparecnt; i--; )
3281#if EV_EMBED_ENABLE
3282 if (ev_cb (prepares [i]) != embed_prepare_cb)
3283#endif
3284 cb (EV_A_ EV_PREPARE, prepares [i]);
3285
3286 if (types & EV_CHECK)
3287 for (i = checkcnt; i--; )
3288 cb (EV_A_ EV_CHECK, checks [i]);
3289
3290 if (types & EV_SIGNAL)
3291 for (i = 0; i < signalmax; ++i)
3292 for (wl = signals [i].head; wl; )
3293 {
3294 wn = wl->next;
3295 cb (EV_A_ EV_SIGNAL, wl);
3296 wl = wn;
3297 }
3298
3299 if (types & EV_CHILD)
3300 for (i = EV_PID_HASHSIZE; i--; )
3301 for (wl = childs [i]; wl; )
3302 {
3303 wn = wl->next;
3304 cb (EV_A_ EV_CHILD, wl);
3305 wl = wn;
3306 }
3307/* EV_STAT 0x00001000 /* stat data changed */
3308/* EV_EMBED 0x00010000 /* embedded event loop needs sweep */
3309}
3310#endif
3311
3071#if EV_MULTIPLICITY 3312#if EV_MULTIPLICITY
3072 #include "ev_wrap.h" 3313 #include "ev_wrap.h"
3073#endif 3314#endif
3074 3315
3075#ifdef __cplusplus 3316#ifdef __cplusplus

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines