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

Comparing libev/ev.c (file contents):
Revision 1.211 by root, Tue Feb 19 17:09:28 2008 UTC vs.
Revision 1.234 by root, Tue May 6 23:42:16 2008 UTC

… …
39 39
40#ifdef __cplusplus 40#ifdef __cplusplus
41extern "C" { 41extern "C" {
42#endif 42#endif
43 43
44/* this big block deduces configuration from config.h */
44#ifndef EV_STANDALONE 45#ifndef EV_STANDALONE
45# ifdef EV_CONFIG_H 46# ifdef EV_CONFIG_H
46# include EV_CONFIG_H 47# include EV_CONFIG_H
47# else 48# else
48# include "config.h" 49# include "config.h"
… …
118# else 119# else
119# define EV_USE_INOTIFY 0 120# define EV_USE_INOTIFY 0
120# endif 121# endif
121# endif 122# endif
122 123
124# ifndef EV_USE_EVENTFD
125# if HAVE_EVENTFD
126# define EV_USE_EVENTFD 1
127# else
128# define EV_USE_EVENTFD 0
129# endif
130# endif
131
123#endif 132#endif
124 133
125#include <math.h> 134#include <math.h>
126#include <stdlib.h> 135#include <stdlib.h>
127#include <fcntl.h> 136#include <fcntl.h>
… …
152# ifndef EV_SELECT_IS_WINSOCKET 161# ifndef EV_SELECT_IS_WINSOCKET
153# define EV_SELECT_IS_WINSOCKET 1 162# define EV_SELECT_IS_WINSOCKET 1
154# endif 163# endif
155#endif 164#endif
156 165
157/**/ 166/* this block tries to deduce configuration from header-defined symbols and defaults */
158 167
159#ifndef EV_USE_MONOTONIC 168#ifndef EV_USE_MONOTONIC
160# define EV_USE_MONOTONIC 0 169# define EV_USE_MONOTONIC 0
161#endif 170#endif
162 171
… …
179# define EV_USE_POLL 1 188# define EV_USE_POLL 1
180# endif 189# endif
181#endif 190#endif
182 191
183#ifndef EV_USE_EPOLL 192#ifndef EV_USE_EPOLL
193# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
194# define EV_USE_EPOLL 1
195# else
184# define EV_USE_EPOLL 0 196# define EV_USE_EPOLL 0
197# endif
185#endif 198#endif
186 199
187#ifndef EV_USE_KQUEUE 200#ifndef EV_USE_KQUEUE
188# define EV_USE_KQUEUE 0 201# define EV_USE_KQUEUE 0
189#endif 202#endif
… …
191#ifndef EV_USE_PORT 204#ifndef EV_USE_PORT
192# define EV_USE_PORT 0 205# define EV_USE_PORT 0
193#endif 206#endif
194 207
195#ifndef EV_USE_INOTIFY 208#ifndef EV_USE_INOTIFY
209# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 4))
210# define EV_USE_INOTIFY 1
211# else
196# define EV_USE_INOTIFY 0 212# define EV_USE_INOTIFY 0
213# endif
197#endif 214#endif
198 215
199#ifndef EV_PID_HASHSIZE 216#ifndef EV_PID_HASHSIZE
200# if EV_MINIMAL 217# if EV_MINIMAL
201# define EV_PID_HASHSIZE 1 218# define EV_PID_HASHSIZE 1
… …
210# else 227# else
211# define EV_INOTIFY_HASHSIZE 16 228# define EV_INOTIFY_HASHSIZE 16
212# endif 229# endif
213#endif 230#endif
214 231
215/**/ 232#ifndef EV_USE_EVENTFD
233# if __linux && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7))
234# define EV_USE_EVENTFD 1
235# else
236# define EV_USE_EVENTFD 0
237# endif
238#endif
239
240/* this block fixes any misconfiguration where we know we run into trouble otherwise */
216 241
217#ifndef CLOCK_MONOTONIC 242#ifndef CLOCK_MONOTONIC
218# undef EV_USE_MONOTONIC 243# undef EV_USE_MONOTONIC
219# define EV_USE_MONOTONIC 0 244# define EV_USE_MONOTONIC 0
220#endif 245#endif
… …
239# include <sys/inotify.h> 264# include <sys/inotify.h>
240#endif 265#endif
241 266
242#if EV_SELECT_IS_WINSOCKET 267#if EV_SELECT_IS_WINSOCKET
243# include <winsock.h> 268# include <winsock.h>
269#endif
270
271#if EV_USE_EVENTFD
272/* our minimum requirement is glibc 2.7 which has the stub, but not the header */
273# include <stdint.h>
274# ifdef __cplusplus
275extern "C" {
276# endif
277int eventfd (unsigned int initval, int flags);
278# ifdef __cplusplus
279}
280# endif
244#endif 281#endif
245 282
246/**/ 283/**/
247 284
248/* 285/*
… …
263# define expect(expr,value) __builtin_expect ((expr),(value)) 300# define expect(expr,value) __builtin_expect ((expr),(value))
264# define noinline __attribute__ ((noinline)) 301# define noinline __attribute__ ((noinline))
265#else 302#else
266# define expect(expr,value) (expr) 303# define expect(expr,value) (expr)
267# define noinline 304# define noinline
268# if __STDC_VERSION__ < 199901L 305# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
269# define inline 306# define inline
270# endif 307# endif
271#endif 308#endif
272 309
273#define expect_false(expr) expect ((expr) != 0, 0) 310#define expect_false(expr) expect ((expr) != 0, 0)
… …
288 325
289typedef ev_watcher *W; 326typedef ev_watcher *W;
290typedef ev_watcher_list *WL; 327typedef ev_watcher_list *WL;
291typedef ev_watcher_time *WT; 328typedef ev_watcher_time *WT;
292 329
330#define ev_active(w) ((W)(w))->active
331#define ev_at(w) ((WT)(w))->at
332
293#if EV_USE_MONOTONIC 333#if EV_USE_MONOTONIC
294/* sig_atomic_t is used to avoid per-thread variables or locking but still */ 334/* sig_atomic_t is used to avoid per-thread variables or locking but still */
295/* giving it a reasonably high chance of working on typical architetcures */ 335/* giving it a reasonably high chance of working on typical architetcures */
296static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 336static EV_ATOMIC_T have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif 337#endif
… …
323 perror (msg); 363 perror (msg);
324 abort (); 364 abort ();
325 } 365 }
326} 366}
327 367
368static void *
369ev_realloc_emul (void *ptr, long size)
370{
371 /* some systems, notably openbsd and darwin, fail to properly
372 * implement realloc (x, 0) (as required by both ansi c-98 and
373 * the single unix specification, so work around them here.
374 */
375
376 if (size)
377 return realloc (ptr, size);
378
379 free (ptr);
380 return 0;
381}
382
328static void *(*alloc)(void *ptr, long size); 383static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
329 384
330void 385void
331ev_set_allocator (void *(*cb)(void *ptr, long size)) 386ev_set_allocator (void *(*cb)(void *ptr, long size))
332{ 387{
333 alloc = cb; 388 alloc = cb;
334} 389}
335 390
336inline_speed void * 391inline_speed void *
337ev_realloc (void *ptr, long size) 392ev_realloc (void *ptr, long size)
338{ 393{
339 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 394 ptr = alloc (ptr, size);
340 395
341 if (!ptr && size) 396 if (!ptr && size)
342 { 397 {
343 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 398 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
344 abort (); 399 abort ();
… …
451 ts.tv_sec = (time_t)delay; 506 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9); 507 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453 508
454 nanosleep (&ts, 0); 509 nanosleep (&ts, 0);
455#elif defined(_WIN32) 510#elif defined(_WIN32)
456 Sleep (delay * 1e3); 511 Sleep ((unsigned long)(delay * 1e3));
457#else 512#else
458 struct timeval tv; 513 struct timeval tv;
459 514
460 tv.tv_sec = (time_t)delay; 515 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 516 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
… …
464#endif 519#endif
465 } 520 }
466} 521}
467 522
468/*****************************************************************************/ 523/*****************************************************************************/
524
525#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
469 526
470int inline_size 527int inline_size
471array_nextsize (int elem, int cur, int cnt) 528array_nextsize (int elem, int cur, int cnt)
472{ 529{
473 int ncur = cur + 1; 530 int ncur = cur + 1;
474 531
475 do 532 do
476 ncur <<= 1; 533 ncur <<= 1;
477 while (cnt > ncur); 534 while (cnt > ncur);
478 535
479 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */ 536 /* if size is large, round to MALLOC_ROUND - 4 * longs to accomodate malloc overhead */
480 if (elem * ncur > 4096) 537 if (elem * ncur > MALLOC_ROUND - sizeof (void *) * 4)
481 { 538 {
482 ncur *= elem; 539 ncur *= elem;
483 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095; 540 ncur = (ncur + elem + (MALLOC_ROUND - 1) + sizeof (void *) * 4) & ~(MALLOC_ROUND - 1);
484 ncur = ncur - sizeof (void *) * 4; 541 ncur = ncur - sizeof (void *) * 4;
485 ncur /= elem; 542 ncur /= elem;
486 } 543 }
487 544
488 return ncur; 545 return ncur;
… …
702 } 759 }
703} 760}
704 761
705/*****************************************************************************/ 762/*****************************************************************************/
706 763
764/* towards the root */
707void inline_speed 765void inline_speed
708upheap (WT *heap, int k) 766upheap (WT *heap, int k)
709{ 767{
710 WT w = heap [k]; 768 WT w = heap [k];
711 769
712 while (k) 770 for (;;)
713 { 771 {
714 int p = (k - 1) >> 1; 772 int p = k >> 1;
715 773
774 /* maybe we could use a dummy element at heap [0]? */
716 if (heap [p]->at <= w->at) 775 if (!p || heap [p]->at <= w->at)
717 break; 776 break;
718 777
719 heap [k] = heap [p]; 778 heap [k] = heap [p];
720 ((W)heap [k])->active = k + 1; 779 ev_active (heap [k]) = k;
721 k = p; 780 k = p;
722 } 781 }
723 782
724 heap [k] = w; 783 heap [k] = w;
725 ((W)heap [k])->active = k + 1; 784 ev_active (heap [k]) = k;
726} 785}
727 786
787/* away from the root */
728void inline_speed 788void inline_speed
729downheap (WT *heap, int N, int k) 789downheap (WT *heap, int N, int k)
730{ 790{
731 WT w = heap [k]; 791 WT w = heap [k];
732 792
733 for (;;) 793 for (;;)
734 { 794 {
735 int c = (k << 1) + 1; 795 int c = k << 1;
736 796
737 if (c >= N) 797 if (c > N)
738 break; 798 break;
739 799
740 c += c + 1 < N && heap [c]->at > heap [c + 1]->at 800 c += c < N && heap [c]->at > heap [c + 1]->at
741 ? 1 : 0; 801 ? 1 : 0;
742 802
743 if (w->at <= heap [c]->at) 803 if (w->at <= heap [c]->at)
744 break; 804 break;
745 805
746 heap [k] = heap [c]; 806 heap [k] = heap [c];
747 ((W)heap [k])->active = k + 1; 807 ev_active (heap [k]) = k;
748 808
749 k = c; 809 k = c;
750 } 810 }
751 811
752 heap [k] = w; 812 heap [k] = w;
753 ((W)heap [k])->active = k + 1; 813 ev_active (heap [k]) = k;
754} 814}
755 815
756void inline_size 816void inline_size
757adjustheap (WT *heap, int N, int k) 817adjustheap (WT *heap, int N, int k)
758{ 818{
… …
802static void noinline 862static void noinline
803evpipe_init (EV_P) 863evpipe_init (EV_P)
804{ 864{
805 if (!ev_is_active (&pipeev)) 865 if (!ev_is_active (&pipeev))
806 { 866 {
867#if EV_USE_EVENTFD
868 if ((evfd = eventfd (0, 0)) >= 0)
869 {
870 evpipe [0] = -1;
871 fd_intern (evfd);
872 ev_io_set (&pipeev, evfd, EV_READ);
873 }
874 else
875#endif
876 {
807 while (pipe (evpipe)) 877 while (pipe (evpipe))
808 syserr ("(libev) error creating signal/async pipe"); 878 syserr ("(libev) error creating signal/async pipe");
809 879
810 fd_intern (evpipe [0]); 880 fd_intern (evpipe [0]);
811 fd_intern (evpipe [1]); 881 fd_intern (evpipe [1]);
812
813 ev_io_set (&pipeev, evpipe [0], EV_READ); 882 ev_io_set (&pipeev, evpipe [0], EV_READ);
883 }
884
814 ev_io_start (EV_A_ &pipeev); 885 ev_io_start (EV_A_ &pipeev);
815 ev_unref (EV_A); /* watcher should not keep loop alive */ 886 ev_unref (EV_A); /* watcher should not keep loop alive */
816
817 /* in case we received the signal before we had the chance of installing a handler */
818 ev_feed_event (EV_A_ &pipeev, 0);
819 } 887 }
820} 888}
821 889
822void inline_size 890void inline_size
823evpipe_write (EV_P_ int sig, int async) 891evpipe_write (EV_P_ EV_ATOMIC_T *flag)
824{ 892{
825 if (!(gotasync || gotsig)) 893 if (!*flag)
826 { 894 {
827 int old_errno = errno; /* save errno becaue write might clobber it */ 895 int old_errno = errno; /* save errno because write might clobber it */
828 896
829 if (sig) gotsig = 1; 897 *flag = 1;
830 if (async) gotasync = 1;
831 898
899#if EV_USE_EVENTFD
900 if (evfd >= 0)
901 {
902 uint64_t counter = 1;
903 write (evfd, &counter, sizeof (uint64_t));
904 }
905 else
906#endif
832 write (evpipe [1], &old_errno, 1); 907 write (evpipe [1], &old_errno, 1);
833 908
834 errno = old_errno; 909 errno = old_errno;
835 } 910 }
836} 911}
837 912
838static void 913static void
839pipecb (EV_P_ ev_io *iow, int revents) 914pipecb (EV_P_ ev_io *iow, int revents)
840{ 915{
916#if EV_USE_EVENTFD
917 if (evfd >= 0)
841 { 918 {
842 int dummy; 919 uint64_t counter;
920 read (evfd, &counter, sizeof (uint64_t));
921 }
922 else
923#endif
924 {
925 char dummy;
843 read (evpipe [0], &dummy, 1); 926 read (evpipe [0], &dummy, 1);
844 } 927 }
845 928
846 if (gotsig && ev_is_default_loop (EV_A)) 929 if (gotsig && ev_is_default_loop (EV_A))
847 { 930 {
848 int signum; 931 int signum;
849 gotsig = 0; 932 gotsig = 0;
… …
870} 953}
871 954
872/*****************************************************************************/ 955/*****************************************************************************/
873 956
874static void 957static void
875sighandler (int signum) 958ev_sighandler (int signum)
876{ 959{
877#if EV_MULTIPLICITY 960#if EV_MULTIPLICITY
878 struct ev_loop *loop = &default_loop_struct; 961 struct ev_loop *loop = &default_loop_struct;
879#endif 962#endif
880 963
881#if _WIN32 964#if _WIN32
882 signal (signum, sighandler); 965 signal (signum, ev_sighandler);
883#endif 966#endif
884 967
885 signals [signum - 1].gotsig = 1; 968 signals [signum - 1].gotsig = 1;
886 evpipe_write (EV_A_ 1, 0); 969 evpipe_write (EV_A_ &gotsig);
887} 970}
888 971
889void noinline 972void noinline
890ev_feed_signal_event (EV_P_ int signum) 973ev_feed_signal_event (EV_P_ int signum)
891{ 974{
… …
917#ifndef WIFCONTINUED 1000#ifndef WIFCONTINUED
918# define WIFCONTINUED(status) 0 1001# define WIFCONTINUED(status) 0
919#endif 1002#endif
920 1003
921void inline_speed 1004void inline_speed
922child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status) 1005child_reap (EV_P_ int chain, int pid, int status)
923{ 1006{
924 ev_child *w; 1007 ev_child *w;
925 int traced = WIFSTOPPED (status) || WIFCONTINUED (status); 1008 int traced = WIFSTOPPED (status) || WIFCONTINUED (status);
926 1009
927 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next) 1010 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
928 { 1011 {
929 if ((w->pid == pid || !w->pid) 1012 if ((w->pid == pid || !w->pid)
930 && (!traced || (w->flags & 1))) 1013 && (!traced || (w->flags & 1)))
931 { 1014 {
932 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */ 1015 ev_set_priority (w, EV_MAXPRI); /* need to do it *now*, this *must* be the same prio as the signal watcher itself */
933 w->rpid = pid; 1016 w->rpid = pid;
934 w->rstatus = status; 1017 w->rstatus = status;
935 ev_feed_event (EV_A_ (W)w, EV_CHILD); 1018 ev_feed_event (EV_A_ (W)w, EV_CHILD);
936 } 1019 }
937 } 1020 }
… …
951 if (!WCONTINUED 1034 if (!WCONTINUED
952 || errno != EINVAL 1035 || errno != EINVAL
953 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED))) 1036 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
954 return; 1037 return;
955 1038
956 /* make sure we are called again until all childs have been reaped */ 1039 /* make sure we are called again until all children have been reaped */
957 /* we need to do it this way so that the callback gets called before we continue */ 1040 /* we need to do it this way so that the callback gets called before we continue */
958 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 1041 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
959 1042
960 child_reap (EV_A_ sw, pid, pid, status); 1043 child_reap (EV_A_ pid, pid, status);
961 if (EV_PID_HASHSIZE > 1) 1044 if (EV_PID_HASHSIZE > 1)
962 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 1045 child_reap (EV_A_ 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
963} 1046}
964 1047
965#endif 1048#endif
966 1049
967/*****************************************************************************/ 1050/*****************************************************************************/
… …
1110 if (!(flags & EVFLAG_NOENV) 1193 if (!(flags & EVFLAG_NOENV)
1111 && !enable_secure () 1194 && !enable_secure ()
1112 && getenv ("LIBEV_FLAGS")) 1195 && getenv ("LIBEV_FLAGS"))
1113 flags = atoi (getenv ("LIBEV_FLAGS")); 1196 flags = atoi (getenv ("LIBEV_FLAGS"));
1114 1197
1115 if (!(flags & 0x0000ffffUL)) 1198 if (!(flags & 0x0000ffffU))
1116 flags |= ev_recommended_backends (); 1199 flags |= ev_recommended_backends ();
1117 1200
1118#if EV_USE_PORT 1201#if EV_USE_PORT
1119 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1202 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1120#endif 1203#endif
… …
1144 if (ev_is_active (&pipeev)) 1227 if (ev_is_active (&pipeev))
1145 { 1228 {
1146 ev_ref (EV_A); /* signal watcher */ 1229 ev_ref (EV_A); /* signal watcher */
1147 ev_io_stop (EV_A_ &pipeev); 1230 ev_io_stop (EV_A_ &pipeev);
1148 1231
1149 close (evpipe [0]); evpipe [0] = 0; 1232#if EV_USE_EVENTFD
1150 close (evpipe [1]); evpipe [1] = 0; 1233 if (evfd >= 0)
1234 close (evfd);
1235#endif
1236
1237 if (evpipe [0] >= 0)
1238 {
1239 close (evpipe [0]);
1240 close (evpipe [1]);
1241 }
1151 } 1242 }
1152 1243
1153#if EV_USE_INOTIFY 1244#if EV_USE_INOTIFY
1154 if (fs_fd >= 0) 1245 if (fs_fd >= 0)
1155 close (fs_fd); 1246 close (fs_fd);
… …
1200#endif 1291#endif
1201 1292
1202 backend = 0; 1293 backend = 0;
1203} 1294}
1204 1295
1296#if EV_USE_INOTIFY
1205void inline_size infy_fork (EV_P); 1297void inline_size infy_fork (EV_P);
1298#endif
1206 1299
1207void inline_size 1300void inline_size
1208loop_fork (EV_P) 1301loop_fork (EV_P)
1209{ 1302{
1210#if EV_USE_PORT 1303#if EV_USE_PORT
… …
1221#endif 1314#endif
1222 1315
1223 if (ev_is_active (&pipeev)) 1316 if (ev_is_active (&pipeev))
1224 { 1317 {
1225 /* this "locks" the handlers against writing to the pipe */ 1318 /* this "locks" the handlers against writing to the pipe */
1319 /* while we modify the fd vars */
1320 gotsig = 1;
1321#if EV_ASYNC_ENABLE
1226 gotsig = gotasync = 1; 1322 gotasync = 1;
1323#endif
1227 1324
1228 ev_ref (EV_A); 1325 ev_ref (EV_A);
1229 ev_io_stop (EV_A_ &pipeev); 1326 ev_io_stop (EV_A_ &pipeev);
1327
1328#if EV_USE_EVENTFD
1329 if (evfd >= 0)
1330 close (evfd);
1331#endif
1332
1333 if (evpipe [0] >= 0)
1334 {
1230 close (evpipe [0]); 1335 close (evpipe [0]);
1231 close (evpipe [1]); 1336 close (evpipe [1]);
1337 }
1232 1338
1233 evpipe_init (EV_A); 1339 evpipe_init (EV_A);
1234 /* now iterate over everything, in case we missed something */ 1340 /* now iterate over everything, in case we missed something */
1235 pipecb (EV_A_ &pipeev, EV_READ); 1341 pipecb (EV_A_ &pipeev, EV_READ);
1236 } 1342 }
… …
1264void 1370void
1265ev_loop_fork (EV_P) 1371ev_loop_fork (EV_P)
1266{ 1372{
1267 postfork = 1; /* must be in line with ev_default_fork */ 1373 postfork = 1; /* must be in line with ev_default_fork */
1268} 1374}
1269
1270#endif 1375#endif
1271 1376
1272#if EV_MULTIPLICITY 1377#if EV_MULTIPLICITY
1273struct ev_loop * 1378struct ev_loop *
1274ev_default_loop_init (unsigned int flags) 1379ev_default_loop_init (unsigned int flags)
… …
1355 EV_CB_INVOKE (p->w, p->events); 1460 EV_CB_INVOKE (p->w, p->events);
1356 } 1461 }
1357 } 1462 }
1358} 1463}
1359 1464
1360void inline_size
1361timers_reify (EV_P)
1362{
1363 while (timercnt && ((WT)timers [0])->at <= mn_now)
1364 {
1365 ev_timer *w = (ev_timer *)timers [0];
1366
1367 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1368
1369 /* first reschedule or stop timer */
1370 if (w->repeat)
1371 {
1372 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1373
1374 ((WT)w)->at += w->repeat;
1375 if (((WT)w)->at < mn_now)
1376 ((WT)w)->at = mn_now;
1377
1378 downheap (timers, timercnt, 0);
1379 }
1380 else
1381 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1382
1383 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1384 }
1385}
1386
1387#if EV_PERIODIC_ENABLE
1388void inline_size
1389periodics_reify (EV_P)
1390{
1391 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1392 {
1393 ev_periodic *w = (ev_periodic *)periodics [0];
1394
1395 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1396
1397 /* first reschedule or stop timer */
1398 if (w->reschedule_cb)
1399 {
1400 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1401 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1402 downheap (periodics, periodiccnt, 0);
1403 }
1404 else if (w->interval)
1405 {
1406 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1407 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1408 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1409 downheap (periodics, periodiccnt, 0);
1410 }
1411 else
1412 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1413
1414 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1415 }
1416}
1417
1418static void noinline
1419periodics_reschedule (EV_P)
1420{
1421 int i;
1422
1423 /* adjust periodics after time jump */
1424 for (i = 0; i < periodiccnt; ++i)
1425 {
1426 ev_periodic *w = (ev_periodic *)periodics [i];
1427
1428 if (w->reschedule_cb)
1429 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1430 else if (w->interval)
1431 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1432 }
1433
1434 /* now rebuild the heap */
1435 for (i = periodiccnt >> 1; i--; )
1436 downheap (periodics, periodiccnt, i);
1437}
1438#endif
1439
1440#if EV_IDLE_ENABLE 1465#if EV_IDLE_ENABLE
1441void inline_size 1466void inline_size
1442idle_reify (EV_P) 1467idle_reify (EV_P)
1443{ 1468{
1444 if (expect_false (idleall)) 1469 if (expect_false (idleall))
… …
1455 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE); 1480 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1456 break; 1481 break;
1457 } 1482 }
1458 } 1483 }
1459 } 1484 }
1485}
1486#endif
1487
1488void inline_size
1489timers_reify (EV_P)
1490{
1491 while (timercnt && ev_at (timers [1]) <= mn_now)
1492 {
1493 ev_timer *w = (ev_timer *)timers [1];
1494
1495 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1496
1497 /* first reschedule or stop timer */
1498 if (w->repeat)
1499 {
1500 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1501
1502 ev_at (w) += w->repeat;
1503 if (ev_at (w) < mn_now)
1504 ev_at (w) = mn_now;
1505
1506 downheap (timers, timercnt, 1);
1507 }
1508 else
1509 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1510
1511 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1512 }
1513}
1514
1515#if EV_PERIODIC_ENABLE
1516void inline_size
1517periodics_reify (EV_P)
1518{
1519 while (periodiccnt && ev_at (periodics [1]) <= ev_rt_now)
1520 {
1521 ev_periodic *w = (ev_periodic *)periodics [1];
1522
1523 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1524
1525 /* first reschedule or stop timer */
1526 if (w->reschedule_cb)
1527 {
1528 ev_at (w) = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1529 assert (("ev_periodic reschedule callback returned time in the past", ev_at (w) > ev_rt_now));
1530 downheap (periodics, periodiccnt, 1);
1531 }
1532 else if (w->interval)
1533 {
1534 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1535 if (ev_at (w) - ev_rt_now <= TIME_EPSILON) ev_at (w) += w->interval;
1536 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ev_at (w) > ev_rt_now));
1537 downheap (periodics, periodiccnt, 1);
1538 }
1539 else
1540 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1541
1542 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1543 }
1544}
1545
1546static void noinline
1547periodics_reschedule (EV_P)
1548{
1549 int i;
1550
1551 /* adjust periodics after time jump */
1552 for (i = 1; i <= periodiccnt; ++i)
1553 {
1554 ev_periodic *w = (ev_periodic *)periodics [i];
1555
1556 if (w->reschedule_cb)
1557 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1558 else if (w->interval)
1559 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1560 }
1561
1562 /* now rebuild the heap */
1563 for (i = periodiccnt >> 1; i--; )
1564 downheap (periodics, periodiccnt, i);
1460} 1565}
1461#endif 1566#endif
1462 1567
1463void inline_speed 1568void inline_speed
1464time_update (EV_P_ ev_tstamp max_block) 1569time_update (EV_P_ ev_tstamp max_block)
… …
1493 */ 1598 */
1494 for (i = 4; --i; ) 1599 for (i = 4; --i; )
1495 { 1600 {
1496 rtmn_diff = ev_rt_now - mn_now; 1601 rtmn_diff = ev_rt_now - mn_now;
1497 1602
1498 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1603 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP))
1499 return; /* all is well */ 1604 return; /* all is well */
1500 1605
1501 ev_rt_now = ev_time (); 1606 ev_rt_now = ev_time ();
1502 mn_now = get_clock (); 1607 mn_now = get_clock ();
1503 now_floor = mn_now; 1608 now_floor = mn_now;
… …
1518 { 1623 {
1519#if EV_PERIODIC_ENABLE 1624#if EV_PERIODIC_ENABLE
1520 periodics_reschedule (EV_A); 1625 periodics_reschedule (EV_A);
1521#endif 1626#endif
1522 /* adjust timers. this is easy, as the offset is the same for all of them */ 1627 /* adjust timers. this is easy, as the offset is the same for all of them */
1523 for (i = 0; i < timercnt; ++i) 1628 for (i = 1; i <= timercnt; ++i)
1524 ((WT)timers [i])->at += ev_rt_now - mn_now; 1629 ev_at (timers [i]) += ev_rt_now - mn_now;
1525 } 1630 }
1526 1631
1527 mn_now = ev_rt_now; 1632 mn_now = ev_rt_now;
1528 } 1633 }
1529} 1634}
… …
1543static int loop_done; 1648static int loop_done;
1544 1649
1545void 1650void
1546ev_loop (EV_P_ int flags) 1651ev_loop (EV_P_ int flags)
1547{ 1652{
1548 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1653 loop_done = EVUNLOOP_CANCEL;
1549 ? EVUNLOOP_ONE
1550 : EVUNLOOP_CANCEL;
1551 1654
1552 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */ 1655 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1553 1656
1554 do 1657 do
1555 { 1658 {
… …
1601 1704
1602 waittime = MAX_BLOCKTIME; 1705 waittime = MAX_BLOCKTIME;
1603 1706
1604 if (timercnt) 1707 if (timercnt)
1605 { 1708 {
1606 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1709 ev_tstamp to = ev_at (timers [1]) - mn_now + backend_fudge;
1607 if (waittime > to) waittime = to; 1710 if (waittime > to) waittime = to;
1608 } 1711 }
1609 1712
1610#if EV_PERIODIC_ENABLE 1713#if EV_PERIODIC_ENABLE
1611 if (periodiccnt) 1714 if (periodiccnt)
1612 { 1715 {
1613 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1716 ev_tstamp to = ev_at (periodics [1]) - ev_rt_now + backend_fudge;
1614 if (waittime > to) waittime = to; 1717 if (waittime > to) waittime = to;
1615 } 1718 }
1616#endif 1719#endif
1617 1720
1618 if (expect_false (waittime < timeout_blocktime)) 1721 if (expect_false (waittime < timeout_blocktime))
… …
1651 /* queue check watchers, to be executed first */ 1754 /* queue check watchers, to be executed first */
1652 if (expect_false (checkcnt)) 1755 if (expect_false (checkcnt))
1653 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1756 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1654 1757
1655 call_pending (EV_A); 1758 call_pending (EV_A);
1656
1657 } 1759 }
1658 while (expect_true (activecnt && !loop_done)); 1760 while (expect_true (
1761 activecnt
1762 && !loop_done
1763 && !(flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK))
1764 ));
1659 1765
1660 if (loop_done == EVUNLOOP_ONE) 1766 if (loop_done == EVUNLOOP_ONE)
1661 loop_done = EVUNLOOP_CANCEL; 1767 loop_done = EVUNLOOP_CANCEL;
1662} 1768}
1663 1769
… …
1781ev_timer_start (EV_P_ ev_timer *w) 1887ev_timer_start (EV_P_ ev_timer *w)
1782{ 1888{
1783 if (expect_false (ev_is_active (w))) 1889 if (expect_false (ev_is_active (w)))
1784 return; 1890 return;
1785 1891
1786 ((WT)w)->at += mn_now; 1892 ev_at (w) += mn_now;
1787 1893
1788 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1894 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1789 1895
1790 ev_start (EV_A_ (W)w, ++timercnt); 1896 ev_start (EV_A_ (W)w, ++timercnt);
1791 array_needsize (WT, timers, timermax, timercnt, EMPTY2); 1897 array_needsize (WT, timers, timermax, timercnt + 1, EMPTY2);
1792 timers [timercnt - 1] = (WT)w; 1898 timers [timercnt] = (WT)w;
1793 upheap (timers, timercnt - 1); 1899 upheap (timers, timercnt);
1794 1900
1795 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1901 /*assert (("internal timer heap corruption", timers [ev_active (w)] == w));*/
1796} 1902}
1797 1903
1798void noinline 1904void noinline
1799ev_timer_stop (EV_P_ ev_timer *w) 1905ev_timer_stop (EV_P_ ev_timer *w)
1800{ 1906{
1801 clear_pending (EV_A_ (W)w); 1907 clear_pending (EV_A_ (W)w);
1802 if (expect_false (!ev_is_active (w))) 1908 if (expect_false (!ev_is_active (w)))
1803 return; 1909 return;
1804 1910
1805 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1806
1807 { 1911 {
1808 int active = ((W)w)->active; 1912 int active = ev_active (w);
1809 1913
1914 assert (("internal timer heap corruption", timers [active] == (WT)w));
1915
1810 if (expect_true (--active < --timercnt)) 1916 if (expect_true (active < timercnt))
1811 { 1917 {
1812 timers [active] = timers [timercnt]; 1918 timers [active] = timers [timercnt];
1813 adjustheap (timers, timercnt, active); 1919 adjustheap (timers, timercnt, active);
1814 } 1920 }
1921
1922 --timercnt;
1815 } 1923 }
1816 1924
1817 ((WT)w)->at -= mn_now; 1925 ev_at (w) -= mn_now;
1818 1926
1819 ev_stop (EV_A_ (W)w); 1927 ev_stop (EV_A_ (W)w);
1820} 1928}
1821 1929
1822void noinline 1930void noinline
… …
1824{ 1932{
1825 if (ev_is_active (w)) 1933 if (ev_is_active (w))
1826 { 1934 {
1827 if (w->repeat) 1935 if (w->repeat)
1828 { 1936 {
1829 ((WT)w)->at = mn_now + w->repeat; 1937 ev_at (w) = mn_now + w->repeat;
1830 adjustheap (timers, timercnt, ((W)w)->active - 1); 1938 adjustheap (timers, timercnt, ev_active (w));
1831 } 1939 }
1832 else 1940 else
1833 ev_timer_stop (EV_A_ w); 1941 ev_timer_stop (EV_A_ w);
1834 } 1942 }
1835 else if (w->repeat) 1943 else if (w->repeat)
1836 { 1944 {
1837 w->at = w->repeat; 1945 ev_at (w) = w->repeat;
1838 ev_timer_start (EV_A_ w); 1946 ev_timer_start (EV_A_ w);
1839 } 1947 }
1840} 1948}
1841 1949
1842#if EV_PERIODIC_ENABLE 1950#if EV_PERIODIC_ENABLE
… …
1845{ 1953{
1846 if (expect_false (ev_is_active (w))) 1954 if (expect_false (ev_is_active (w)))
1847 return; 1955 return;
1848 1956
1849 if (w->reschedule_cb) 1957 if (w->reschedule_cb)
1850 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1958 ev_at (w) = w->reschedule_cb (w, ev_rt_now);
1851 else if (w->interval) 1959 else if (w->interval)
1852 { 1960 {
1853 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1961 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1854 /* this formula differs from the one in periodic_reify because we do not always round up */ 1962 /* this formula differs from the one in periodic_reify because we do not always round up */
1855 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 1963 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1856 } 1964 }
1857 else 1965 else
1858 ((WT)w)->at = w->offset; 1966 ev_at (w) = w->offset;
1859 1967
1860 ev_start (EV_A_ (W)w, ++periodiccnt); 1968 ev_start (EV_A_ (W)w, ++periodiccnt);
1861 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2); 1969 array_needsize (WT, periodics, periodicmax, periodiccnt + 1, EMPTY2);
1862 periodics [periodiccnt - 1] = (WT)w; 1970 periodics [periodiccnt] = (WT)w;
1863 upheap (periodics, periodiccnt - 1); 1971 upheap (periodics, periodiccnt);
1864 1972
1865 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1973 /*assert (("internal periodic heap corruption", periodics [ev_active (w)] == w));*/
1866} 1974}
1867 1975
1868void noinline 1976void noinline
1869ev_periodic_stop (EV_P_ ev_periodic *w) 1977ev_periodic_stop (EV_P_ ev_periodic *w)
1870{ 1978{
1871 clear_pending (EV_A_ (W)w); 1979 clear_pending (EV_A_ (W)w);
1872 if (expect_false (!ev_is_active (w))) 1980 if (expect_false (!ev_is_active (w)))
1873 return; 1981 return;
1874 1982
1875 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1876
1877 { 1983 {
1878 int active = ((W)w)->active; 1984 int active = ev_active (w);
1879 1985
1986 assert (("internal periodic heap corruption", periodics [active] == (WT)w));
1987
1880 if (expect_true (--active < --periodiccnt)) 1988 if (expect_true (active < periodiccnt))
1881 { 1989 {
1882 periodics [active] = periodics [periodiccnt]; 1990 periodics [active] = periodics [periodiccnt];
1883 adjustheap (periodics, periodiccnt, active); 1991 adjustheap (periodics, periodiccnt, active);
1884 } 1992 }
1993
1994 --periodiccnt;
1885 } 1995 }
1886 1996
1887 ev_stop (EV_A_ (W)w); 1997 ev_stop (EV_A_ (W)w);
1888} 1998}
1889 1999
… …
1931 wlist_add (&signals [w->signum - 1].head, (WL)w); 2041 wlist_add (&signals [w->signum - 1].head, (WL)w);
1932 2042
1933 if (!((WL)w)->next) 2043 if (!((WL)w)->next)
1934 { 2044 {
1935#if _WIN32 2045#if _WIN32
1936 signal (w->signum, sighandler); 2046 signal (w->signum, ev_sighandler);
1937#else 2047#else
1938 struct sigaction sa; 2048 struct sigaction sa;
1939 sa.sa_handler = sighandler; 2049 sa.sa_handler = ev_sighandler;
1940 sigfillset (&sa.sa_mask); 2050 sigfillset (&sa.sa_mask);
1941 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 2051 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1942 sigaction (w->signum, &sa, 0); 2052 sigaction (w->signum, &sa, 0);
1943#endif 2053#endif
1944 } 2054 }
… …
2005 if (w->wd < 0) 2115 if (w->wd < 0)
2006 { 2116 {
2007 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */ 2117 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
2008 2118
2009 /* monitor some parent directory for speedup hints */ 2119 /* monitor some parent directory for speedup hints */
2120 /* note that exceeding the hardcoded limit is not a correctness issue, */
2121 /* but an efficiency issue only */
2010 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096) 2122 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
2011 { 2123 {
2012 char path [4096]; 2124 char path [4096];
2013 strcpy (path, w->path); 2125 strcpy (path, w->path);
2014 2126
… …
2259 clear_pending (EV_A_ (W)w); 2371 clear_pending (EV_A_ (W)w);
2260 if (expect_false (!ev_is_active (w))) 2372 if (expect_false (!ev_is_active (w)))
2261 return; 2373 return;
2262 2374
2263 { 2375 {
2264 int active = ((W)w)->active; 2376 int active = ev_active (w);
2265 2377
2266 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]]; 2378 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2267 ((W)idles [ABSPRI (w)][active - 1])->active = active; 2379 ev_active (idles [ABSPRI (w)][active - 1]) = active;
2268 2380
2269 ev_stop (EV_A_ (W)w); 2381 ev_stop (EV_A_ (W)w);
2270 --idleall; 2382 --idleall;
2271 } 2383 }
2272} 2384}
… …
2289 clear_pending (EV_A_ (W)w); 2401 clear_pending (EV_A_ (W)w);
2290 if (expect_false (!ev_is_active (w))) 2402 if (expect_false (!ev_is_active (w)))
2291 return; 2403 return;
2292 2404
2293 { 2405 {
2294 int active = ((W)w)->active; 2406 int active = ev_active (w);
2407
2295 prepares [active - 1] = prepares [--preparecnt]; 2408 prepares [active - 1] = prepares [--preparecnt];
2296 ((W)prepares [active - 1])->active = active; 2409 ev_active (prepares [active - 1]) = active;
2297 } 2410 }
2298 2411
2299 ev_stop (EV_A_ (W)w); 2412 ev_stop (EV_A_ (W)w);
2300} 2413}
2301 2414
… …
2316 clear_pending (EV_A_ (W)w); 2429 clear_pending (EV_A_ (W)w);
2317 if (expect_false (!ev_is_active (w))) 2430 if (expect_false (!ev_is_active (w)))
2318 return; 2431 return;
2319 2432
2320 { 2433 {
2321 int active = ((W)w)->active; 2434 int active = ev_active (w);
2435
2322 checks [active - 1] = checks [--checkcnt]; 2436 checks [active - 1] = checks [--checkcnt];
2323 ((W)checks [active - 1])->active = active; 2437 ev_active (checks [active - 1]) = active;
2324 } 2438 }
2325 2439
2326 ev_stop (EV_A_ (W)w); 2440 ev_stop (EV_A_ (W)w);
2327} 2441}
2328 2442
… …
2424 clear_pending (EV_A_ (W)w); 2538 clear_pending (EV_A_ (W)w);
2425 if (expect_false (!ev_is_active (w))) 2539 if (expect_false (!ev_is_active (w)))
2426 return; 2540 return;
2427 2541
2428 { 2542 {
2429 int active = ((W)w)->active; 2543 int active = ev_active (w);
2544
2430 forks [active - 1] = forks [--forkcnt]; 2545 forks [active - 1] = forks [--forkcnt];
2431 ((W)forks [active - 1])->active = active; 2546 ev_active (forks [active - 1]) = active;
2432 } 2547 }
2433 2548
2434 ev_stop (EV_A_ (W)w); 2549 ev_stop (EV_A_ (W)w);
2435} 2550}
2436#endif 2551#endif
… …
2455 clear_pending (EV_A_ (W)w); 2570 clear_pending (EV_A_ (W)w);
2456 if (expect_false (!ev_is_active (w))) 2571 if (expect_false (!ev_is_active (w)))
2457 return; 2572 return;
2458 2573
2459 { 2574 {
2460 int active = ((W)w)->active; 2575 int active = ev_active (w);
2576
2461 asyncs [active - 1] = asyncs [--asynccnt]; 2577 asyncs [active - 1] = asyncs [--asynccnt];
2462 ((W)asyncs [active - 1])->active = active; 2578 ev_active (asyncs [active - 1]) = active;
2463 } 2579 }
2464 2580
2465 ev_stop (EV_A_ (W)w); 2581 ev_stop (EV_A_ (W)w);
2466} 2582}
2467 2583
2468void 2584void
2469ev_async_send (EV_P_ ev_async *w) 2585ev_async_send (EV_P_ ev_async *w)
2470{ 2586{
2471 w->sent = 1; 2587 w->sent = 1;
2472 evpipe_write (EV_A_ 0, 1); 2588 evpipe_write (EV_A_ &gotasync);
2473} 2589}
2474#endif 2590#endif
2475 2591
2476/*****************************************************************************/ 2592/*****************************************************************************/
2477 2593

Diff Legend

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