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

Comparing libev/ev.c (file contents):
Revision 1.172 by root, Sun Dec 9 02:27:44 2007 UTC vs.
Revision 1.199 by root, Tue Dec 25 07:05:45 2007 UTC

2 * libev event processing core, watcher management 2 * libev event processing core, watcher management
3 * 3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 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 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * modification, are permitted provided that the following conditions are 8 * tion, are permitted provided that the following conditions are met:
9 * met: 9 *
10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer.
12 *
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
22 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
23 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
24 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTH-
25 * ERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
26 * OF THE POSSIBILITY OF SUCH DAMAGE.
10 * 27 *
11 * * Redistributions of source code must retain the above copyright 28 * Alternatively, the contents of this file may be used under the terms of
12 * notice, this list of conditions and the following disclaimer. 29 * the GNU General Public License ("GPL") version 2 or any later version,
13 * 30 * in which case the provisions of the GPL are applicable instead of
14 * * Redistributions in binary form must reproduce the above 31 * the above. If you wish to allow the use of your version of this file
15 * copyright notice, this list of conditions and the following 32 * only under the terms of the GPL and not to allow others to use your
16 * disclaimer in the documentation and/or other materials provided 33 * version of this file under the BSD license, indicate your decision
17 * with the distribution. 34 * by deleting the provisions above and replace them with the notice
18 * 35 * and other provisions required by the GPL. If you do not delete the
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 36 * provisions above, a recipient may use your version of this file under
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 37 * either the BSD or the GPL.
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 38 */
31 39
32#ifdef __cplusplus 40#ifdef __cplusplus
33extern "C" { 41extern "C" {
34#endif 42#endif
51# ifndef EV_USE_MONOTONIC 59# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0 60# define EV_USE_MONOTONIC 0
53# endif 61# endif
54# ifndef EV_USE_REALTIME 62# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0 63# define EV_USE_REALTIME 0
64# endif
65# endif
66
67# ifndef EV_USE_NANOSLEEP
68# if HAVE_NANOSLEEP
69# define EV_USE_NANOSLEEP 1
70# else
71# define EV_USE_NANOSLEEP 0
56# endif 72# endif
57# endif 73# endif
58 74
59# ifndef EV_USE_SELECT 75# ifndef EV_USE_SELECT
60# if HAVE_SELECT && HAVE_SYS_SELECT_H 76# if HAVE_SELECT && HAVE_SYS_SELECT_H
146 162
147#ifndef EV_USE_REALTIME 163#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0 164# define EV_USE_REALTIME 0
149#endif 165#endif
150 166
167#ifndef EV_USE_NANOSLEEP
168# define EV_USE_NANOSLEEP 0
169#endif
170
151#ifndef EV_USE_SELECT 171#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1 172# define EV_USE_SELECT 1
153#endif 173#endif
154 174
155#ifndef EV_USE_POLL 175#ifndef EV_USE_POLL
202#ifndef CLOCK_REALTIME 222#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME 223# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0 224# define EV_USE_REALTIME 0
205#endif 225#endif
206 226
227#if !EV_STAT_ENABLE
228# undef EV_USE_INOTIFY
229# define EV_USE_INOTIFY 0
230#endif
231
232#if !EV_USE_NANOSLEEP
233# ifndef _WIN32
234# include <sys/select.h>
235# endif
236#endif
237
238#if EV_USE_INOTIFY
239# include <sys/inotify.h>
240#endif
241
207#if EV_SELECT_IS_WINSOCKET 242#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h> 243# include <winsock.h>
209#endif 244#endif
210 245
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
219/**/ 246/**/
247
248/*
249 * This is used to avoid floating point rounding problems.
250 * It is added to ev_rt_now when scheduling periodics
251 * to ensure progress, time-wise, even when rounding
252 * errors are against us.
253 * This value is good at least till the year 4000.
254 * Better solutions welcome.
255 */
256#define TIME_EPSILON 0.0001220703125 /* 1/8192 */
220 257
221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 258#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 259#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 260/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds, TODO */
224 261
225#if __GNUC__ >= 3 262#if __GNUC__ >= 4
226# define expect(expr,value) __builtin_expect ((expr),(value)) 263# define expect(expr,value) __builtin_expect ((expr),(value))
227# define noinline __attribute__ ((noinline)) 264# define noinline __attribute__ ((noinline))
228#else 265#else
229# define expect(expr,value) (expr) 266# define expect(expr,value) (expr)
230# define noinline 267# define noinline
251 288
252typedef ev_watcher *W; 289typedef ev_watcher *W;
253typedef ev_watcher_list *WL; 290typedef ev_watcher_list *WL;
254typedef ev_watcher_time *WT; 291typedef ev_watcher_time *WT;
255 292
293#if EV_USE_MONOTONIC
294/* 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 */
256static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 296static sig_atomic_t have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
297#endif
257 298
258#ifdef _WIN32 299#ifdef _WIN32
259# include "ev_win32.c" 300# include "ev_win32.c"
260#endif 301#endif
261 302
397{ 438{
398 return ev_rt_now; 439 return ev_rt_now;
399} 440}
400#endif 441#endif
401 442
443void
444ev_sleep (ev_tstamp delay)
445{
446 if (delay > 0.)
447 {
448#if EV_USE_NANOSLEEP
449 struct timespec ts;
450
451 ts.tv_sec = (time_t)delay;
452 ts.tv_nsec = (long)((delay - (ev_tstamp)(ts.tv_sec)) * 1e9);
453
454 nanosleep (&ts, 0);
455#elif defined(_WIN32)
456 Sleep (delay * 1e3);
457#else
458 struct timeval tv;
459
460 tv.tv_sec = (time_t)delay;
461 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
462
463 select (0, 0, 0, 0, &tv);
464#endif
465 }
466}
467
468/*****************************************************************************/
469
402int inline_size 470int inline_size
403array_nextsize (int elem, int cur, int cnt) 471array_nextsize (int elem, int cur, int cnt)
404{ 472{
405 int ncur = cur + 1; 473 int ncur = cur + 1;
406 474
466 pendings [pri][w_->pending - 1].w = w_; 534 pendings [pri][w_->pending - 1].w = w_;
467 pendings [pri][w_->pending - 1].events = revents; 535 pendings [pri][w_->pending - 1].events = revents;
468 } 536 }
469} 537}
470 538
471void inline_size 539void inline_speed
472queue_events (EV_P_ W *events, int eventcnt, int type) 540queue_events (EV_P_ W *events, int eventcnt, int type)
473{ 541{
474 int i; 542 int i;
475 543
476 for (i = 0; i < eventcnt; ++i) 544 for (i = 0; i < eventcnt; ++i)
523 { 591 {
524 int fd = fdchanges [i]; 592 int fd = fdchanges [i];
525 ANFD *anfd = anfds + fd; 593 ANFD *anfd = anfds + fd;
526 ev_io *w; 594 ev_io *w;
527 595
528 int events = 0; 596 unsigned char events = 0;
529 597
530 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 598 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
531 events |= w->events; 599 events |= (unsigned char)w->events;
532 600
533#if EV_SELECT_IS_WINSOCKET 601#if EV_SELECT_IS_WINSOCKET
534 if (events) 602 if (events)
535 { 603 {
536 unsigned long argp; 604 unsigned long argp;
537 anfd->handle = _get_osfhandle (fd); 605 anfd->handle = _get_osfhandle (fd);
538 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 606 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
539 } 607 }
540#endif 608#endif
541 609
610 {
611 unsigned char o_events = anfd->events;
612 unsigned char o_reify = anfd->reify;
613
542 anfd->reify = 0; 614 anfd->reify = 0;
543
544 backend_modify (EV_A_ fd, anfd->events, events);
545 anfd->events = events; 615 anfd->events = events;
616
617 if (o_events != events || o_reify & EV_IOFDSET)
618 backend_modify (EV_A_ fd, o_events, events);
619 }
546 } 620 }
547 621
548 fdchangecnt = 0; 622 fdchangecnt = 0;
549} 623}
550 624
551void inline_size 625void inline_size
552fd_change (EV_P_ int fd) 626fd_change (EV_P_ int fd, int flags)
553{ 627{
554 if (expect_false (anfds [fd].reify)) 628 unsigned char reify = anfds [fd].reify;
555 return;
556
557 anfds [fd].reify = 1; 629 anfds [fd].reify |= flags;
558 630
631 if (expect_true (!reify))
632 {
559 ++fdchangecnt; 633 ++fdchangecnt;
560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 634 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
561 fdchanges [fdchangecnt - 1] = fd; 635 fdchanges [fdchangecnt - 1] = fd;
636 }
562} 637}
563 638
564void inline_speed 639void inline_speed
565fd_kill (EV_P_ int fd) 640fd_kill (EV_P_ int fd)
566{ 641{
617 692
618 for (fd = 0; fd < anfdmax; ++fd) 693 for (fd = 0; fd < anfdmax; ++fd)
619 if (anfds [fd].events) 694 if (anfds [fd].events)
620 { 695 {
621 anfds [fd].events = 0; 696 anfds [fd].events = 0;
622 fd_change (EV_A_ fd); 697 fd_change (EV_A_ fd, EV_IOFDSET | 1);
623 } 698 }
624} 699}
625 700
626/*****************************************************************************/ 701/*****************************************************************************/
627 702
628void inline_speed 703void inline_speed
629upheap (WT *heap, int k) 704upheap (WT *heap, int k)
630{ 705{
631 WT w = heap [k]; 706 WT w = heap [k];
632 707
633 while (k && heap [k >> 1]->at > w->at) 708 while (k)
634 { 709 {
710 int p = (k - 1) >> 1;
711
712 if (heap [p]->at <= w->at)
713 break;
714
635 heap [k] = heap [k >> 1]; 715 heap [k] = heap [p];
636 ((W)heap [k])->active = k + 1; 716 ((W)heap [k])->active = k + 1;
637 k >>= 1; 717 k = p;
638 } 718 }
639 719
640 heap [k] = w; 720 heap [k] = w;
641 ((W)heap [k])->active = k + 1; 721 ((W)heap [k])->active = k + 1;
642
643} 722}
644 723
645void inline_speed 724void inline_speed
646downheap (WT *heap, int N, int k) 725downheap (WT *heap, int N, int k)
647{ 726{
648 WT w = heap [k]; 727 WT w = heap [k];
649 728
650 while (k < (N >> 1)) 729 for (;;)
651 { 730 {
652 int j = k << 1; 731 int c = (k << 1) + 1;
653 732
654 if (j + 1 < N && heap [j]->at > heap [j + 1]->at) 733 if (c >= N)
655 ++j;
656
657 if (w->at <= heap [j]->at)
658 break; 734 break;
659 735
736 c += c + 1 < N && heap [c]->at > heap [c + 1]->at
737 ? 1 : 0;
738
739 if (w->at <= heap [c]->at)
740 break;
741
660 heap [k] = heap [j]; 742 heap [k] = heap [c];
661 ((W)heap [k])->active = k + 1; 743 ((W)heap [k])->active = k + 1;
744
662 k = j; 745 k = c;
663 } 746 }
664 747
665 heap [k] = w; 748 heap [k] = w;
666 ((W)heap [k])->active = k + 1; 749 ((W)heap [k])->active = k + 1;
667} 750}
774 ev_unref (EV_A); /* child watcher should not keep loop alive */ 857 ev_unref (EV_A); /* child watcher should not keep loop alive */
775} 858}
776 859
777/*****************************************************************************/ 860/*****************************************************************************/
778 861
779static ev_child *childs [EV_PID_HASHSIZE]; 862static WL childs [EV_PID_HASHSIZE];
780 863
781#ifndef _WIN32 864#ifndef _WIN32
782 865
783static ev_signal childev; 866static ev_signal childev;
784 867
899} 982}
900 983
901unsigned int 984unsigned int
902ev_embeddable_backends (void) 985ev_embeddable_backends (void)
903{ 986{
904 return EVBACKEND_EPOLL 987 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
905 | EVBACKEND_KQUEUE 988
906 | EVBACKEND_PORT; 989 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
990 /* please fix it and tell me how to detect the fix */
991 flags &= ~EVBACKEND_EPOLL;
992
993 return flags;
907} 994}
908 995
909unsigned int 996unsigned int
910ev_backend (EV_P) 997ev_backend (EV_P)
911{ 998{
914 1001
915unsigned int 1002unsigned int
916ev_loop_count (EV_P) 1003ev_loop_count (EV_P)
917{ 1004{
918 return loop_count; 1005 return loop_count;
1006}
1007
1008void
1009ev_set_io_collect_interval (EV_P_ ev_tstamp interval)
1010{
1011 io_blocktime = interval;
1012}
1013
1014void
1015ev_set_timeout_collect_interval (EV_P_ ev_tstamp interval)
1016{
1017 timeout_blocktime = interval;
919} 1018}
920 1019
921static void noinline 1020static void noinline
922loop_init (EV_P_ unsigned int flags) 1021loop_init (EV_P_ unsigned int flags)
923{ 1022{
934 ev_rt_now = ev_time (); 1033 ev_rt_now = ev_time ();
935 mn_now = get_clock (); 1034 mn_now = get_clock ();
936 now_floor = mn_now; 1035 now_floor = mn_now;
937 rtmn_diff = ev_rt_now - mn_now; 1036 rtmn_diff = ev_rt_now - mn_now;
938 1037
1038 io_blocktime = 0.;
1039 timeout_blocktime = 0.;
1040
939 /* pid check not overridable via env */ 1041 /* pid check not overridable via env */
940#ifndef _WIN32 1042#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK) 1043 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid (); 1044 curpid = getpid ();
943#endif 1045#endif
1011 array_free (pending, [i]); 1113 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE 1114#if EV_IDLE_ENABLE
1013 array_free (idle, [i]); 1115 array_free (idle, [i]);
1014#endif 1116#endif
1015 } 1117 }
1118
1119 ev_free (anfds); anfdmax = 0;
1016 1120
1017 /* have to use the microsoft-never-gets-it-right macro */ 1121 /* have to use the microsoft-never-gets-it-right macro */
1018 array_free (fdchange, EMPTY); 1122 array_free (fdchange, EMPTY);
1019 array_free (timer, EMPTY); 1123 array_free (timer, EMPTY);
1020#if EV_PERIODIC_ENABLE 1124#if EV_PERIODIC_ENABLE
1021 array_free (periodic, EMPTY); 1125 array_free (periodic, EMPTY);
1126#endif
1127#if EV_FORK_ENABLE
1128 array_free (fork, EMPTY);
1022#endif 1129#endif
1023 array_free (prepare, EMPTY); 1130 array_free (prepare, EMPTY);
1024 array_free (check, EMPTY); 1131 array_free (check, EMPTY);
1025 1132
1026 backend = 0; 1133 backend = 0;
1196void inline_size 1303void inline_size
1197timers_reify (EV_P) 1304timers_reify (EV_P)
1198{ 1305{
1199 while (timercnt && ((WT)timers [0])->at <= mn_now) 1306 while (timercnt && ((WT)timers [0])->at <= mn_now)
1200 { 1307 {
1201 ev_timer *w = timers [0]; 1308 ev_timer *w = (ev_timer *)timers [0];
1202 1309
1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/ 1310 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1204 1311
1205 /* first reschedule or stop timer */ 1312 /* first reschedule or stop timer */
1206 if (w->repeat) 1313 if (w->repeat)
1209 1316
1210 ((WT)w)->at += w->repeat; 1317 ((WT)w)->at += w->repeat;
1211 if (((WT)w)->at < mn_now) 1318 if (((WT)w)->at < mn_now)
1212 ((WT)w)->at = mn_now; 1319 ((WT)w)->at = mn_now;
1213 1320
1214 downheap ((WT *)timers, timercnt, 0); 1321 downheap (timers, timercnt, 0);
1215 } 1322 }
1216 else 1323 else
1217 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1324 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
1218 1325
1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1326 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1224void inline_size 1331void inline_size
1225periodics_reify (EV_P) 1332periodics_reify (EV_P)
1226{ 1333{
1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1334 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1228 { 1335 {
1229 ev_periodic *w = periodics [0]; 1336 ev_periodic *w = (ev_periodic *)periodics [0];
1230 1337
1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/ 1338 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1232 1339
1233 /* first reschedule or stop timer */ 1340 /* first reschedule or stop timer */
1234 if (w->reschedule_cb) 1341 if (w->reschedule_cb)
1235 { 1342 {
1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1343 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + TIME_EPSILON);
1237 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1344 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1238 downheap ((WT *)periodics, periodiccnt, 0); 1345 downheap (periodics, periodiccnt, 0);
1239 } 1346 }
1240 else if (w->interval) 1347 else if (w->interval)
1241 { 1348 {
1242 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1349 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1350 if (((WT)w)->at - ev_rt_now <= TIME_EPSILON) ((WT)w)->at += w->interval;
1243 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now)); 1351 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
1244 downheap ((WT *)periodics, periodiccnt, 0); 1352 downheap (periodics, periodiccnt, 0);
1245 } 1353 }
1246 else 1354 else
1247 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1355 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1248 1356
1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1357 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1256 int i; 1364 int i;
1257 1365
1258 /* adjust periodics after time jump */ 1366 /* adjust periodics after time jump */
1259 for (i = 0; i < periodiccnt; ++i) 1367 for (i = 0; i < periodiccnt; ++i)
1260 { 1368 {
1261 ev_periodic *w = periodics [i]; 1369 ev_periodic *w = (ev_periodic *)periodics [i];
1262 1370
1263 if (w->reschedule_cb) 1371 if (w->reschedule_cb)
1264 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1372 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1265 else if (w->interval) 1373 else if (w->interval)
1266 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1374 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1267 } 1375 }
1268 1376
1269 /* now rebuild the heap */ 1377 /* now rebuild the heap */
1270 for (i = periodiccnt >> 1; i--; ) 1378 for (i = periodiccnt >> 1; i--; )
1271 downheap ((WT *)periodics, periodiccnt, i); 1379 downheap (periodics, periodiccnt, i);
1272} 1380}
1273#endif 1381#endif
1274 1382
1275#if EV_IDLE_ENABLE 1383#if EV_IDLE_ENABLE
1276void inline_size 1384void inline_size
1293 } 1401 }
1294 } 1402 }
1295} 1403}
1296#endif 1404#endif
1297 1405
1298int inline_size 1406void inline_speed
1299time_update_monotonic (EV_P) 1407time_update (EV_P_ ev_tstamp max_block)
1300{ 1408{
1409 int i;
1410
1411#if EV_USE_MONOTONIC
1412 if (expect_true (have_monotonic))
1413 {
1414 ev_tstamp odiff = rtmn_diff;
1415
1301 mn_now = get_clock (); 1416 mn_now = get_clock ();
1302 1417
1418 /* only fetch the realtime clock every 0.5*MIN_TIMEJUMP seconds */
1419 /* interpolate in the meantime */
1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1420 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1304 { 1421 {
1305 ev_rt_now = rtmn_diff + mn_now; 1422 ev_rt_now = rtmn_diff + mn_now;
1306 return 0; 1423 return;
1307 } 1424 }
1308 else 1425
1309 {
1310 now_floor = mn_now; 1426 now_floor = mn_now;
1311 ev_rt_now = ev_time (); 1427 ev_rt_now = ev_time ();
1312 return 1;
1313 }
1314}
1315 1428
1316void inline_size 1429 /* loop a few times, before making important decisions.
1317time_update (EV_P) 1430 * on the choice of "4": one iteration isn't enough,
1318{ 1431 * in case we get preempted during the calls to
1319 int i; 1432 * ev_time and get_clock. a second call is almost guaranteed
1320 1433 * to succeed in that case, though. and looping a few more times
1321#if EV_USE_MONOTONIC 1434 * doesn't hurt either as we only do this on time-jumps or
1322 if (expect_true (have_monotonic)) 1435 * in the unlikely event of having been preempted here.
1323 { 1436 */
1324 if (time_update_monotonic (EV_A)) 1437 for (i = 4; --i; )
1325 { 1438 {
1326 ev_tstamp odiff = rtmn_diff;
1327
1328 /* loop a few times, before making important decisions.
1329 * on the choice of "4": one iteration isn't enough,
1330 * in case we get preempted during the calls to
1331 * ev_time and get_clock. a second call is almost guaranteed
1332 * to succeed in that case, though. and looping a few more times
1333 * doesn't hurt either as we only do this on time-jumps or
1334 * in the unlikely event of having been preempted here.
1335 */
1336 for (i = 4; --i; )
1337 {
1338 rtmn_diff = ev_rt_now - mn_now; 1439 rtmn_diff = ev_rt_now - mn_now;
1339 1440
1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1441 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1341 return; /* all is well */ 1442 return; /* all is well */
1342 1443
1343 ev_rt_now = ev_time (); 1444 ev_rt_now = ev_time ();
1344 mn_now = get_clock (); 1445 mn_now = get_clock ();
1345 now_floor = mn_now; 1446 now_floor = mn_now;
1346 } 1447 }
1347 1448
1348# if EV_PERIODIC_ENABLE 1449# if EV_PERIODIC_ENABLE
1349 periodics_reschedule (EV_A); 1450 periodics_reschedule (EV_A);
1350# endif 1451# endif
1351 /* no timer adjustment, as the monotonic clock doesn't jump */ 1452 /* no timer adjustment, as the monotonic clock doesn't jump */
1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1453 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1353 }
1354 } 1454 }
1355 else 1455 else
1356#endif 1456#endif
1357 { 1457 {
1358 ev_rt_now = ev_time (); 1458 ev_rt_now = ev_time ();
1359 1459
1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1460 if (expect_false (mn_now > ev_rt_now || ev_rt_now > mn_now + max_block + MIN_TIMEJUMP))
1361 { 1461 {
1362#if EV_PERIODIC_ENABLE 1462#if EV_PERIODIC_ENABLE
1363 periodics_reschedule (EV_A); 1463 periodics_reschedule (EV_A);
1364#endif 1464#endif
1365
1366 /* adjust timers. this is easy, as the offset is the same for all of them */ 1465 /* adjust timers. this is easy, as the offset is the same for all of them */
1367 for (i = 0; i < timercnt; ++i) 1466 for (i = 0; i < timercnt; ++i)
1368 ((WT)timers [i])->at += ev_rt_now - mn_now; 1467 ((WT)timers [i])->at += ev_rt_now - mn_now;
1369 } 1468 }
1370 1469
1433 /* update fd-related kernel structures */ 1532 /* update fd-related kernel structures */
1434 fd_reify (EV_A); 1533 fd_reify (EV_A);
1435 1534
1436 /* calculate blocking time */ 1535 /* calculate blocking time */
1437 { 1536 {
1438 ev_tstamp block; 1537 ev_tstamp waittime = 0.;
1538 ev_tstamp sleeptime = 0.;
1439 1539
1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt)) 1540 if (expect_true (!(flags & EVLOOP_NONBLOCK || idleall || !activecnt)))
1441 block = 0.; /* do not block at all */
1442 else
1443 { 1541 {
1444 /* update time to cancel out callback processing overhead */ 1542 /* update time to cancel out callback processing overhead */
1445#if EV_USE_MONOTONIC
1446 if (expect_true (have_monotonic))
1447 time_update_monotonic (EV_A); 1543 time_update (EV_A_ 1e100);
1448 else
1449#endif
1450 {
1451 ev_rt_now = ev_time ();
1452 mn_now = ev_rt_now;
1453 }
1454 1544
1455 block = MAX_BLOCKTIME; 1545 waittime = MAX_BLOCKTIME;
1456 1546
1457 if (timercnt) 1547 if (timercnt)
1458 { 1548 {
1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1549 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1460 if (block > to) block = to; 1550 if (waittime > to) waittime = to;
1461 } 1551 }
1462 1552
1463#if EV_PERIODIC_ENABLE 1553#if EV_PERIODIC_ENABLE
1464 if (periodiccnt) 1554 if (periodiccnt)
1465 { 1555 {
1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1556 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1467 if (block > to) block = to; 1557 if (waittime > to) waittime = to;
1468 } 1558 }
1469#endif 1559#endif
1470 1560
1471 if (expect_false (block < 0.)) block = 0.; 1561 if (expect_false (waittime < timeout_blocktime))
1562 waittime = timeout_blocktime;
1563
1564 sleeptime = waittime - backend_fudge;
1565
1566 if (expect_true (sleeptime > io_blocktime))
1567 sleeptime = io_blocktime;
1568
1569 if (sleeptime)
1570 {
1571 ev_sleep (sleeptime);
1572 waittime -= sleeptime;
1573 }
1472 } 1574 }
1473 1575
1474 ++loop_count; 1576 ++loop_count;
1475 backend_poll (EV_A_ block); 1577 backend_poll (EV_A_ waittime);
1578
1579 /* update ev_rt_now, do magic */
1580 time_update (EV_A_ waittime + sleeptime);
1476 } 1581 }
1477
1478 /* update ev_rt_now, do magic */
1479 time_update (EV_A);
1480 1582
1481 /* queue pending timers and reschedule them */ 1583 /* queue pending timers and reschedule them */
1482 timers_reify (EV_A); /* relative timers called last */ 1584 timers_reify (EV_A); /* relative timers called last */
1483#if EV_PERIODIC_ENABLE 1585#if EV_PERIODIC_ENABLE
1484 periodics_reify (EV_A); /* absolute timers called first */ 1586 periodics_reify (EV_A); /* absolute timers called first */
1595 1697
1596 assert (("ev_io_start called with negative fd", fd >= 0)); 1698 assert (("ev_io_start called with negative fd", fd >= 0));
1597 1699
1598 ev_start (EV_A_ (W)w, 1); 1700 ev_start (EV_A_ (W)w, 1);
1599 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init); 1701 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1600 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1702 wlist_add (&anfds[fd].head, (WL)w);
1601 1703
1602 fd_change (EV_A_ fd); 1704 fd_change (EV_A_ fd, w->events & EV_IOFDSET | 1);
1705 w->events &= ~EV_IOFDSET;
1603} 1706}
1604 1707
1605void noinline 1708void noinline
1606ev_io_stop (EV_P_ ev_io *w) 1709ev_io_stop (EV_P_ ev_io *w)
1607{ 1710{
1609 if (expect_false (!ev_is_active (w))) 1712 if (expect_false (!ev_is_active (w)))
1610 return; 1713 return;
1611 1714
1612 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1715 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1613 1716
1614 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1717 wlist_del (&anfds[w->fd].head, (WL)w);
1615 ev_stop (EV_A_ (W)w); 1718 ev_stop (EV_A_ (W)w);
1616 1719
1617 fd_change (EV_A_ w->fd); 1720 fd_change (EV_A_ w->fd, 1);
1618} 1721}
1619 1722
1620void noinline 1723void noinline
1621ev_timer_start (EV_P_ ev_timer *w) 1724ev_timer_start (EV_P_ ev_timer *w)
1622{ 1725{
1626 ((WT)w)->at += mn_now; 1729 ((WT)w)->at += mn_now;
1627 1730
1628 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1731 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1629 1732
1630 ev_start (EV_A_ (W)w, ++timercnt); 1733 ev_start (EV_A_ (W)w, ++timercnt);
1631 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1734 array_needsize (WT, timers, timermax, timercnt, EMPTY2);
1632 timers [timercnt - 1] = w; 1735 timers [timercnt - 1] = (WT)w;
1633 upheap ((WT *)timers, timercnt - 1); 1736 upheap (timers, timercnt - 1);
1634 1737
1635 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/ 1738 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1636} 1739}
1637 1740
1638void noinline 1741void noinline
1640{ 1743{
1641 clear_pending (EV_A_ (W)w); 1744 clear_pending (EV_A_ (W)w);
1642 if (expect_false (!ev_is_active (w))) 1745 if (expect_false (!ev_is_active (w)))
1643 return; 1746 return;
1644 1747
1645 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1748 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == (WT)w));
1646 1749
1647 { 1750 {
1648 int active = ((W)w)->active; 1751 int active = ((W)w)->active;
1649 1752
1650 if (expect_true (--active < --timercnt)) 1753 if (expect_true (--active < --timercnt))
1651 { 1754 {
1652 timers [active] = timers [timercnt]; 1755 timers [active] = timers [timercnt];
1653 adjustheap ((WT *)timers, timercnt, active); 1756 adjustheap (timers, timercnt, active);
1654 } 1757 }
1655 } 1758 }
1656 1759
1657 ((WT)w)->at -= mn_now; 1760 ((WT)w)->at -= mn_now;
1658 1761
1665 if (ev_is_active (w)) 1768 if (ev_is_active (w))
1666 { 1769 {
1667 if (w->repeat) 1770 if (w->repeat)
1668 { 1771 {
1669 ((WT)w)->at = mn_now + w->repeat; 1772 ((WT)w)->at = mn_now + w->repeat;
1670 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1773 adjustheap (timers, timercnt, ((W)w)->active - 1);
1671 } 1774 }
1672 else 1775 else
1673 ev_timer_stop (EV_A_ w); 1776 ev_timer_stop (EV_A_ w);
1674 } 1777 }
1675 else if (w->repeat) 1778 else if (w->repeat)
1690 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1793 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1691 else if (w->interval) 1794 else if (w->interval)
1692 { 1795 {
1693 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1796 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1694 /* this formula differs from the one in periodic_reify because we do not always round up */ 1797 /* this formula differs from the one in periodic_reify because we do not always round up */
1695 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1798 ((WT)w)->at = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval;
1696 } 1799 }
1800 else
1801 ((WT)w)->at = w->offset;
1697 1802
1698 ev_start (EV_A_ (W)w, ++periodiccnt); 1803 ev_start (EV_A_ (W)w, ++periodiccnt);
1699 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1804 array_needsize (WT, periodics, periodicmax, periodiccnt, EMPTY2);
1700 periodics [periodiccnt - 1] = w; 1805 periodics [periodiccnt - 1] = (WT)w;
1701 upheap ((WT *)periodics, periodiccnt - 1); 1806 upheap (periodics, periodiccnt - 1);
1702 1807
1703 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/ 1808 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1704} 1809}
1705 1810
1706void noinline 1811void noinline
1708{ 1813{
1709 clear_pending (EV_A_ (W)w); 1814 clear_pending (EV_A_ (W)w);
1710 if (expect_false (!ev_is_active (w))) 1815 if (expect_false (!ev_is_active (w)))
1711 return; 1816 return;
1712 1817
1713 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1818 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == (WT)w));
1714 1819
1715 { 1820 {
1716 int active = ((W)w)->active; 1821 int active = ((W)w)->active;
1717 1822
1718 if (expect_true (--active < --periodiccnt)) 1823 if (expect_true (--active < --periodiccnt))
1719 { 1824 {
1720 periodics [active] = periodics [periodiccnt]; 1825 periodics [active] = periodics [periodiccnt];
1721 adjustheap ((WT *)periodics, periodiccnt, active); 1826 adjustheap (periodics, periodiccnt, active);
1722 } 1827 }
1723 } 1828 }
1724 1829
1725 ev_stop (EV_A_ (W)w); 1830 ev_stop (EV_A_ (W)w);
1726} 1831}
1747 if (expect_false (ev_is_active (w))) 1852 if (expect_false (ev_is_active (w)))
1748 return; 1853 return;
1749 1854
1750 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1855 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1751 1856
1857 {
1858#ifndef _WIN32
1859 sigset_t full, prev;
1860 sigfillset (&full);
1861 sigprocmask (SIG_SETMASK, &full, &prev);
1862#endif
1863
1864 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1865
1866#ifndef _WIN32
1867 sigprocmask (SIG_SETMASK, &prev, 0);
1868#endif
1869 }
1870
1752 ev_start (EV_A_ (W)w, 1); 1871 ev_start (EV_A_ (W)w, 1);
1753 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1754 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1872 wlist_add (&signals [w->signum - 1].head, (WL)w);
1755 1873
1756 if (!((WL)w)->next) 1874 if (!((WL)w)->next)
1757 { 1875 {
1758#if _WIN32 1876#if _WIN32
1759 signal (w->signum, sighandler); 1877 signal (w->signum, sighandler);
1772{ 1890{
1773 clear_pending (EV_A_ (W)w); 1891 clear_pending (EV_A_ (W)w);
1774 if (expect_false (!ev_is_active (w))) 1892 if (expect_false (!ev_is_active (w)))
1775 return; 1893 return;
1776 1894
1777 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1895 wlist_del (&signals [w->signum - 1].head, (WL)w);
1778 ev_stop (EV_A_ (W)w); 1896 ev_stop (EV_A_ (W)w);
1779 1897
1780 if (!signals [w->signum - 1].head) 1898 if (!signals [w->signum - 1].head)
1781 signal (w->signum, SIG_DFL); 1899 signal (w->signum, SIG_DFL);
1782} 1900}
1789#endif 1907#endif
1790 if (expect_false (ev_is_active (w))) 1908 if (expect_false (ev_is_active (w)))
1791 return; 1909 return;
1792 1910
1793 ev_start (EV_A_ (W)w, 1); 1911 ev_start (EV_A_ (W)w, 1);
1794 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1912 wlist_add (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1795} 1913}
1796 1914
1797void 1915void
1798ev_child_stop (EV_P_ ev_child *w) 1916ev_child_stop (EV_P_ ev_child *w)
1799{ 1917{
1800 clear_pending (EV_A_ (W)w); 1918 clear_pending (EV_A_ (W)w);
1801 if (expect_false (!ev_is_active (w))) 1919 if (expect_false (!ev_is_active (w)))
1802 return; 1920 return;
1803 1921
1804 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w); 1922 wlist_del (&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1805 ev_stop (EV_A_ (W)w); 1923 ev_stop (EV_A_ (W)w);
1806} 1924}
1807 1925
1808#if EV_STAT_ENABLE 1926#if EV_STAT_ENABLE
1809 1927
2151 2269
2152#if EV_EMBED_ENABLE 2270#if EV_EMBED_ENABLE
2153void noinline 2271void noinline
2154ev_embed_sweep (EV_P_ ev_embed *w) 2272ev_embed_sweep (EV_P_ ev_embed *w)
2155{ 2273{
2156 ev_loop (w->loop, EVLOOP_NONBLOCK); 2274 ev_loop (w->other, EVLOOP_NONBLOCK);
2157} 2275}
2158 2276
2159static void 2277static void
2160embed_cb (EV_P_ ev_io *io, int revents) 2278embed_io_cb (EV_P_ ev_io *io, int revents)
2161{ 2279{
2162 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2280 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2163 2281
2164 if (ev_cb (w)) 2282 if (ev_cb (w))
2165 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2283 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2166 else 2284 else
2167 ev_embed_sweep (loop, w); 2285 ev_loop (w->other, EVLOOP_NONBLOCK);
2168} 2286}
2287
2288static void
2289embed_prepare_cb (EV_P_ ev_prepare *prepare, int revents)
2290{
2291 ev_embed *w = (ev_embed *)(((char *)prepare) - offsetof (ev_embed, prepare));
2292
2293 {
2294 struct ev_loop *loop = w->other;
2295
2296 while (fdchangecnt)
2297 {
2298 fd_reify (EV_A);
2299 ev_loop (EV_A_ EVLOOP_NONBLOCK);
2300 }
2301 }
2302}
2303
2304#if 0
2305static void
2306embed_idle_cb (EV_P_ ev_idle *idle, int revents)
2307{
2308 ev_idle_stop (EV_A_ idle);
2309}
2310#endif
2169 2311
2170void 2312void
2171ev_embed_start (EV_P_ ev_embed *w) 2313ev_embed_start (EV_P_ ev_embed *w)
2172{ 2314{
2173 if (expect_false (ev_is_active (w))) 2315 if (expect_false (ev_is_active (w)))
2174 return; 2316 return;
2175 2317
2176 { 2318 {
2177 struct ev_loop *loop = w->loop; 2319 struct ev_loop *loop = w->other;
2178 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ())); 2320 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2179 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2321 ev_io_init (&w->io, embed_io_cb, backend_fd, EV_READ);
2180 } 2322 }
2181 2323
2182 ev_set_priority (&w->io, ev_priority (w)); 2324 ev_set_priority (&w->io, ev_priority (w));
2183 ev_io_start (EV_A_ &w->io); 2325 ev_io_start (EV_A_ &w->io);
2184 2326
2327 ev_prepare_init (&w->prepare, embed_prepare_cb);
2328 ev_set_priority (&w->prepare, EV_MINPRI);
2329 ev_prepare_start (EV_A_ &w->prepare);
2330
2331 /*ev_idle_init (&w->idle, e,bed_idle_cb);*/
2332
2185 ev_start (EV_A_ (W)w, 1); 2333 ev_start (EV_A_ (W)w, 1);
2186} 2334}
2187 2335
2188void 2336void
2189ev_embed_stop (EV_P_ ev_embed *w) 2337ev_embed_stop (EV_P_ ev_embed *w)
2191 clear_pending (EV_A_ (W)w); 2339 clear_pending (EV_A_ (W)w);
2192 if (expect_false (!ev_is_active (w))) 2340 if (expect_false (!ev_is_active (w)))
2193 return; 2341 return;
2194 2342
2195 ev_io_stop (EV_A_ &w->io); 2343 ev_io_stop (EV_A_ &w->io);
2344 ev_prepare_stop (EV_A_ &w->prepare);
2196 2345
2197 ev_stop (EV_A_ (W)w); 2346 ev_stop (EV_A_ (W)w);
2198} 2347}
2199#endif 2348#endif
2200 2349
2289 ev_timer_set (&once->to, timeout, 0.); 2438 ev_timer_set (&once->to, timeout, 0.);
2290 ev_timer_start (EV_A_ &once->to); 2439 ev_timer_start (EV_A_ &once->to);
2291 } 2440 }
2292} 2441}
2293 2442
2443#if EV_MULTIPLICITY
2444 #include "ev_wrap.h"
2445#endif
2446
2294#ifdef __cplusplus 2447#ifdef __cplusplus
2295} 2448}
2296#endif 2449#endif
2297 2450

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines