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

Comparing libev/ev.c (file contents):
Revision 1.136 by root, Sat Nov 24 07:14:26 2007 UTC vs.
Revision 1.170 by root, Sat Dec 8 22:11:14 2007 UTC

94# else 94# else
95# define EV_USE_PORT 0 95# define EV_USE_PORT 0
96# endif 96# endif
97# endif 97# endif
98 98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
105# endif
106
99#endif 107#endif
100 108
101#include <math.h> 109#include <math.h>
102#include <stdlib.h> 110#include <stdlib.h>
103#include <fcntl.h> 111#include <fcntl.h>
110#include <sys/types.h> 118#include <sys/types.h>
111#include <time.h> 119#include <time.h>
112 120
113#include <signal.h> 121#include <signal.h>
114 122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
128
115#ifndef _WIN32 129#ifndef _WIN32
116# include <unistd.h>
117# include <sys/time.h> 130# include <sys/time.h>
118# include <sys/wait.h> 131# include <sys/wait.h>
132# include <unistd.h>
119#else 133#else
120# define WIN32_LEAN_AND_MEAN 134# define WIN32_LEAN_AND_MEAN
121# include <windows.h> 135# include <windows.h>
122# ifndef EV_SELECT_IS_WINSOCKET 136# ifndef EV_SELECT_IS_WINSOCKET
123# define EV_SELECT_IS_WINSOCKET 1 137# define EV_SELECT_IS_WINSOCKET 1
156 170
157#ifndef EV_USE_PORT 171#ifndef EV_USE_PORT
158# define EV_USE_PORT 0 172# define EV_USE_PORT 0
159#endif 173#endif
160 174
175#ifndef EV_USE_INOTIFY
176# define EV_USE_INOTIFY 0
177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
182# else
183# define EV_PID_HASHSIZE 16
184# endif
185#endif
186
187#ifndef EV_INOTIFY_HASHSIZE
188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
193#endif
194
161/**/ 195/**/
162 196
163#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
164# undef EV_USE_MONOTONIC 198# undef EV_USE_MONOTONIC
165# define EV_USE_MONOTONIC 0 199# define EV_USE_MONOTONIC 0
172 206
173#if EV_SELECT_IS_WINSOCKET 207#if EV_SELECT_IS_WINSOCKET
174# include <winsock.h> 208# include <winsock.h>
175#endif 209#endif
176 210
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
177/**/ 219/**/
178 220
179#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
180#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
181#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
182/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
183
184#ifdef EV_H
185# include EV_H
186#else
187# include "ev.h"
188#endif
189 224
190#if __GNUC__ >= 3 225#if __GNUC__ >= 3
191# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
192# define inline static inline 227# define noinline __attribute__ ((noinline))
193#else 228#else
194# define expect(expr,value) (expr) 229# define expect(expr,value) (expr)
195# define inline static 230# define noinline
231# if __STDC_VERSION__ < 199901L
232# define inline
233# endif
196#endif 234#endif
197 235
198#define expect_false(expr) expect ((expr) != 0, 0) 236#define expect_false(expr) expect ((expr) != 0, 0)
199#define expect_true(expr) expect ((expr) != 0, 1) 237#define expect_true(expr) expect ((expr) != 0, 1)
238#define inline_size static inline
239
240#if EV_MINIMAL
241# define inline_speed static noinline
242#else
243# define inline_speed static inline
244#endif
200 245
201#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 246#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
202#define ABSPRI(w) ((w)->priority - EV_MINPRI) 247#define ABSPRI(w) (((W)w)->priority - EV_MINPRI)
203 248
204#define EMPTY0 /* required for microsofts broken pseudo-c compiler */ 249#define EMPTY /* required for microsofts broken pseudo-c compiler */
205#define EMPTY2(a,b) /* used to suppress some warnings */ 250#define EMPTY2(a,b) /* used to suppress some warnings */
206 251
207typedef ev_watcher *W; 252typedef ev_watcher *W;
208typedef ev_watcher_list *WL; 253typedef ev_watcher_list *WL;
209typedef ev_watcher_time *WT; 254typedef ev_watcher_time *WT;
216 261
217/*****************************************************************************/ 262/*****************************************************************************/
218 263
219static void (*syserr_cb)(const char *msg); 264static void (*syserr_cb)(const char *msg);
220 265
266void
221void ev_set_syserr_cb (void (*cb)(const char *msg)) 267ev_set_syserr_cb (void (*cb)(const char *msg))
222{ 268{
223 syserr_cb = cb; 269 syserr_cb = cb;
224} 270}
225 271
226static void 272static void noinline
227syserr (const char *msg) 273syserr (const char *msg)
228{ 274{
229 if (!msg) 275 if (!msg)
230 msg = "(libev) system error"; 276 msg = "(libev) system error";
231 277
238 } 284 }
239} 285}
240 286
241static void *(*alloc)(void *ptr, long size); 287static void *(*alloc)(void *ptr, long size);
242 288
289void
243void ev_set_allocator (void *(*cb)(void *ptr, long size)) 290ev_set_allocator (void *(*cb)(void *ptr, long size))
244{ 291{
245 alloc = cb; 292 alloc = cb;
246} 293}
247 294
248static void * 295inline_speed void *
249ev_realloc (void *ptr, long size) 296ev_realloc (void *ptr, long size)
250{ 297{
251 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 298 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
252 299
253 if (!ptr && size) 300 if (!ptr && size)
277typedef struct 324typedef struct
278{ 325{
279 W w; 326 W w;
280 int events; 327 int events;
281} ANPENDING; 328} ANPENDING;
329
330#if EV_USE_INOTIFY
331typedef struct
332{
333 WL head;
334} ANFS;
335#endif
282 336
283#if EV_MULTIPLICITY 337#if EV_MULTIPLICITY
284 338
285 struct ev_loop 339 struct ev_loop
286 { 340 {
320 gettimeofday (&tv, 0); 374 gettimeofday (&tv, 0);
321 return tv.tv_sec + tv.tv_usec * 1e-6; 375 return tv.tv_sec + tv.tv_usec * 1e-6;
322#endif 376#endif
323} 377}
324 378
325inline ev_tstamp 379ev_tstamp inline_size
326get_clock (void) 380get_clock (void)
327{ 381{
328#if EV_USE_MONOTONIC 382#if EV_USE_MONOTONIC
329 if (expect_true (have_monotonic)) 383 if (expect_true (have_monotonic))
330 { 384 {
343{ 397{
344 return ev_rt_now; 398 return ev_rt_now;
345} 399}
346#endif 400#endif
347 401
348#define array_roundsize(type,n) (((n) | 4) & ~3) 402int inline_size
403array_nextsize (int elem, int cur, int cnt)
404{
405 int ncur = cur + 1;
406
407 do
408 ncur <<= 1;
409 while (cnt > ncur);
410
411 /* if size > 4096, round to 4096 - 4 * longs to accomodate malloc overhead */
412 if (elem * ncur > 4096)
413 {
414 ncur *= elem;
415 ncur = (ncur + elem + 4095 + sizeof (void *) * 4) & ~4095;
416 ncur = ncur - sizeof (void *) * 4;
417 ncur /= elem;
418 }
419
420 return ncur;
421}
422
423inline_speed void *
424array_realloc (int elem, void *base, int *cur, int cnt)
425{
426 *cur = array_nextsize (elem, *cur, cnt);
427 return ev_realloc (base, elem * *cur);
428}
349 429
350#define array_needsize(type,base,cur,cnt,init) \ 430#define array_needsize(type,base,cur,cnt,init) \
351 if (expect_false ((cnt) > cur)) \ 431 if (expect_false ((cnt) > (cur))) \
352 { \ 432 { \
353 int newcnt = cur; \ 433 int ocur_ = (cur); \
354 do \ 434 (base) = (type *)array_realloc \
355 { \ 435 (sizeof (type), (base), &(cur), (cnt)); \
356 newcnt = array_roundsize (type, newcnt << 1); \ 436 init ((base) + (ocur_), (cur) - ocur_); \
357 } \
358 while ((cnt) > newcnt); \
359 \
360 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
361 init (base + cur, newcnt - cur); \
362 cur = newcnt; \
363 } 437 }
364 438
439#if 0
365#define array_slim(type,stem) \ 440#define array_slim(type,stem) \
366 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 441 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
367 { \ 442 { \
368 stem ## max = array_roundsize (stem ## cnt >> 1); \ 443 stem ## max = array_roundsize (stem ## cnt >> 1); \
369 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 444 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
370 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 445 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
371 } 446 }
447#endif
372 448
373#define array_free(stem, idx) \ 449#define array_free(stem, idx) \
374 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 450 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
375 451
376/*****************************************************************************/ 452/*****************************************************************************/
377 453
378static void 454void noinline
379anfds_init (ANFD *base, int count)
380{
381 while (count--)
382 {
383 base->head = 0;
384 base->events = EV_NONE;
385 base->reify = 0;
386
387 ++base;
388 }
389}
390
391void
392ev_feed_event (EV_P_ void *w, int revents) 455ev_feed_event (EV_P_ void *w, int revents)
393{ 456{
394 W w_ = (W)w; 457 W w_ = (W)w;
395 458
396 if (expect_false (w_->pending)) 459 if (expect_false (w_->pending))
403 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2); 466 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
404 pendings [ABSPRI (w_)][w_->pending - 1].w = w_; 467 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
405 pendings [ABSPRI (w_)][w_->pending - 1].events = revents; 468 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
406} 469}
407 470
408static void 471void inline_size
409queue_events (EV_P_ W *events, int eventcnt, int type) 472queue_events (EV_P_ W *events, int eventcnt, int type)
410{ 473{
411 int i; 474 int i;
412 475
413 for (i = 0; i < eventcnt; ++i) 476 for (i = 0; i < eventcnt; ++i)
414 ev_feed_event (EV_A_ events [i], type); 477 ev_feed_event (EV_A_ events [i], type);
415} 478}
416 479
417inline void 480/*****************************************************************************/
481
482void inline_size
483anfds_init (ANFD *base, int count)
484{
485 while (count--)
486 {
487 base->head = 0;
488 base->events = EV_NONE;
489 base->reify = 0;
490
491 ++base;
492 }
493}
494
495void inline_speed
418fd_event (EV_P_ int fd, int revents) 496fd_event (EV_P_ int fd, int revents)
419{ 497{
420 ANFD *anfd = anfds + fd; 498 ANFD *anfd = anfds + fd;
421 ev_io *w; 499 ev_io *w;
422 500
430} 508}
431 509
432void 510void
433ev_feed_fd_event (EV_P_ int fd, int revents) 511ev_feed_fd_event (EV_P_ int fd, int revents)
434{ 512{
513 if (fd >= 0 && fd < anfdmax)
435 fd_event (EV_A_ fd, revents); 514 fd_event (EV_A_ fd, revents);
436} 515}
437 516
438/*****************************************************************************/ 517void inline_size
439
440inline void
441fd_reify (EV_P) 518fd_reify (EV_P)
442{ 519{
443 int i; 520 int i;
444 521
445 for (i = 0; i < fdchangecnt; ++i) 522 for (i = 0; i < fdchangecnt; ++i)
469 } 546 }
470 547
471 fdchangecnt = 0; 548 fdchangecnt = 0;
472} 549}
473 550
474static void 551void inline_size
475fd_change (EV_P_ int fd) 552fd_change (EV_P_ int fd)
476{ 553{
477 if (expect_false (anfds [fd].reify)) 554 if (expect_false (anfds [fd].reify))
478 return; 555 return;
479 556
482 ++fdchangecnt; 559 ++fdchangecnt;
483 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2); 560 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
484 fdchanges [fdchangecnt - 1] = fd; 561 fdchanges [fdchangecnt - 1] = fd;
485} 562}
486 563
487static void 564void inline_speed
488fd_kill (EV_P_ int fd) 565fd_kill (EV_P_ int fd)
489{ 566{
490 ev_io *w; 567 ev_io *w;
491 568
492 while ((w = (ev_io *)anfds [fd].head)) 569 while ((w = (ev_io *)anfds [fd].head))
494 ev_io_stop (EV_A_ w); 571 ev_io_stop (EV_A_ w);
495 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 572 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
496 } 573 }
497} 574}
498 575
499inline int 576int inline_size
500fd_valid (int fd) 577fd_valid (int fd)
501{ 578{
502#ifdef _WIN32 579#ifdef _WIN32
503 return _get_osfhandle (fd) != -1; 580 return _get_osfhandle (fd) != -1;
504#else 581#else
505 return fcntl (fd, F_GETFD) != -1; 582 return fcntl (fd, F_GETFD) != -1;
506#endif 583#endif
507} 584}
508 585
509/* called on EBADF to verify fds */ 586/* called on EBADF to verify fds */
510static void 587static void noinline
511fd_ebadf (EV_P) 588fd_ebadf (EV_P)
512{ 589{
513 int fd; 590 int fd;
514 591
515 for (fd = 0; fd < anfdmax; ++fd) 592 for (fd = 0; fd < anfdmax; ++fd)
517 if (!fd_valid (fd) == -1 && errno == EBADF) 594 if (!fd_valid (fd) == -1 && errno == EBADF)
518 fd_kill (EV_A_ fd); 595 fd_kill (EV_A_ fd);
519} 596}
520 597
521/* called on ENOMEM in select/poll to kill some fds and retry */ 598/* called on ENOMEM in select/poll to kill some fds and retry */
522static void 599static void noinline
523fd_enomem (EV_P) 600fd_enomem (EV_P)
524{ 601{
525 int fd; 602 int fd;
526 603
527 for (fd = anfdmax; fd--; ) 604 for (fd = anfdmax; fd--; )
531 return; 608 return;
532 } 609 }
533} 610}
534 611
535/* usually called after fork if backend needs to re-arm all fds from scratch */ 612/* usually called after fork if backend needs to re-arm all fds from scratch */
536static void 613static void noinline
537fd_rearm_all (EV_P) 614fd_rearm_all (EV_P)
538{ 615{
539 int fd; 616 int fd;
540 617
541 /* this should be highly optimised to not do anything but set a flag */
542 for (fd = 0; fd < anfdmax; ++fd) 618 for (fd = 0; fd < anfdmax; ++fd)
543 if (anfds [fd].events) 619 if (anfds [fd].events)
544 { 620 {
545 anfds [fd].events = 0; 621 anfds [fd].events = 0;
546 fd_change (EV_A_ fd); 622 fd_change (EV_A_ fd);
547 } 623 }
548} 624}
549 625
550/*****************************************************************************/ 626/*****************************************************************************/
551 627
552static void 628void inline_speed
553upheap (WT *heap, int k) 629upheap (WT *heap, int k)
554{ 630{
555 WT w = heap [k]; 631 WT w = heap [k];
556 632
557 while (k && heap [k >> 1]->at > w->at) 633 while (k && heap [k >> 1]->at > w->at)
564 heap [k] = w; 640 heap [k] = w;
565 ((W)heap [k])->active = k + 1; 641 ((W)heap [k])->active = k + 1;
566 642
567} 643}
568 644
569static void 645void inline_speed
570downheap (WT *heap, int N, int k) 646downheap (WT *heap, int N, int k)
571{ 647{
572 WT w = heap [k]; 648 WT w = heap [k];
573 649
574 while (k < (N >> 1)) 650 while (k < (N >> 1))
588 664
589 heap [k] = w; 665 heap [k] = w;
590 ((W)heap [k])->active = k + 1; 666 ((W)heap [k])->active = k + 1;
591} 667}
592 668
593inline void 669void inline_size
594adjustheap (WT *heap, int N, int k) 670adjustheap (WT *heap, int N, int k)
595{ 671{
596 upheap (heap, k); 672 upheap (heap, k);
597 downheap (heap, N, k); 673 downheap (heap, N, k);
598} 674}
610 686
611static int sigpipe [2]; 687static int sigpipe [2];
612static sig_atomic_t volatile gotsig; 688static sig_atomic_t volatile gotsig;
613static ev_io sigev; 689static ev_io sigev;
614 690
615static void 691void inline_size
616signals_init (ANSIG *base, int count) 692signals_init (ANSIG *base, int count)
617{ 693{
618 while (count--) 694 while (count--)
619 { 695 {
620 base->head = 0; 696 base->head = 0;
640 write (sigpipe [1], &signum, 1); 716 write (sigpipe [1], &signum, 1);
641 errno = old_errno; 717 errno = old_errno;
642 } 718 }
643} 719}
644 720
645void 721void noinline
646ev_feed_signal_event (EV_P_ int signum) 722ev_feed_signal_event (EV_P_ int signum)
647{ 723{
648 WL w; 724 WL w;
649 725
650#if EV_MULTIPLICITY 726#if EV_MULTIPLICITY
673 for (signum = signalmax; signum--; ) 749 for (signum = signalmax; signum--; )
674 if (signals [signum].gotsig) 750 if (signals [signum].gotsig)
675 ev_feed_signal_event (EV_A_ signum + 1); 751 ev_feed_signal_event (EV_A_ signum + 1);
676} 752}
677 753
678static void 754void inline_size
679fd_intern (int fd) 755fd_intern (int fd)
680{ 756{
681#ifdef _WIN32 757#ifdef _WIN32
682 int arg = 1; 758 int arg = 1;
683 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 759 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
685 fcntl (fd, F_SETFD, FD_CLOEXEC); 761 fcntl (fd, F_SETFD, FD_CLOEXEC);
686 fcntl (fd, F_SETFL, O_NONBLOCK); 762 fcntl (fd, F_SETFL, O_NONBLOCK);
687#endif 763#endif
688} 764}
689 765
690static void 766static void noinline
691siginit (EV_P) 767siginit (EV_P)
692{ 768{
693 fd_intern (sigpipe [0]); 769 fd_intern (sigpipe [0]);
694 fd_intern (sigpipe [1]); 770 fd_intern (sigpipe [1]);
695 771
698 ev_unref (EV_A); /* child watcher should not keep loop alive */ 774 ev_unref (EV_A); /* child watcher should not keep loop alive */
699} 775}
700 776
701/*****************************************************************************/ 777/*****************************************************************************/
702 778
703static ev_child *childs [PID_HASHSIZE]; 779static ev_child *childs [EV_PID_HASHSIZE];
704 780
705#ifndef _WIN32 781#ifndef _WIN32
706 782
707static ev_signal childev; 783static ev_signal childev;
784
785void inline_speed
786child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
787{
788 ev_child *w;
789
790 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
791 if (w->pid == pid || !w->pid)
792 {
793 ev_set_priority (w, ev_priority (sw)); /* need to do it *now* */
794 w->rpid = pid;
795 w->rstatus = status;
796 ev_feed_event (EV_A_ (W)w, EV_CHILD);
797 }
798}
708 799
709#ifndef WCONTINUED 800#ifndef WCONTINUED
710# define WCONTINUED 0 801# define WCONTINUED 0
711#endif 802#endif
712 803
713static void 804static void
714child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
715{
716 ev_child *w;
717
718 for (w = (ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
719 if (w->pid == pid || !w->pid)
720 {
721 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
722 w->rpid = pid;
723 w->rstatus = status;
724 ev_feed_event (EV_A_ (W)w, EV_CHILD);
725 }
726}
727
728static void
729childcb (EV_P_ ev_signal *sw, int revents) 805childcb (EV_P_ ev_signal *sw, int revents)
730{ 806{
731 int pid, status; 807 int pid, status;
732 808
809 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
733 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 810 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
734 { 811 if (!WCONTINUED
812 || errno != EINVAL
813 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
814 return;
815
735 /* make sure we are called again until all childs have been reaped */ 816 /* make sure we are called again until all childs have been reaped */
736 /* we need to do it this way so that the callback gets called before we continue */ 817 /* we need to do it this way so that the callback gets called before we continue */
737 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 818 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
738 819
739 child_reap (EV_A_ sw, pid, pid, status); 820 child_reap (EV_A_ sw, pid, pid, status);
821 if (EV_PID_HASHSIZE > 1)
740 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */ 822 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
741 }
742} 823}
743 824
744#endif 825#endif
745 826
746/*****************************************************************************/ 827/*****************************************************************************/
772{ 853{
773 return EV_VERSION_MINOR; 854 return EV_VERSION_MINOR;
774} 855}
775 856
776/* return true if we are running with elevated privileges and should ignore env variables */ 857/* return true if we are running with elevated privileges and should ignore env variables */
777static int 858int inline_size
778enable_secure (void) 859enable_secure (void)
779{ 860{
780#ifdef _WIN32 861#ifdef _WIN32
781 return 0; 862 return 0;
782#else 863#else
829ev_backend (EV_P) 910ev_backend (EV_P)
830{ 911{
831 return backend; 912 return backend;
832} 913}
833 914
834static void 915unsigned int
916ev_loop_count (EV_P)
917{
918 return loop_count;
919}
920
921static void noinline
835loop_init (EV_P_ unsigned int flags) 922loop_init (EV_P_ unsigned int flags)
836{ 923{
837 if (!backend) 924 if (!backend)
838 { 925 {
839#if EV_USE_MONOTONIC 926#if EV_USE_MONOTONIC
847 ev_rt_now = ev_time (); 934 ev_rt_now = ev_time ();
848 mn_now = get_clock (); 935 mn_now = get_clock ();
849 now_floor = mn_now; 936 now_floor = mn_now;
850 rtmn_diff = ev_rt_now - mn_now; 937 rtmn_diff = ev_rt_now - mn_now;
851 938
939 /* pid check not overridable via env */
940#ifndef _WIN32
941 if (flags & EVFLAG_FORKCHECK)
942 curpid = getpid ();
943#endif
944
852 if (!(flags & EVFLAG_NOENV) 945 if (!(flags & EVFLAG_NOENV)
853 && !enable_secure () 946 && !enable_secure ()
854 && getenv ("LIBEV_FLAGS")) 947 && getenv ("LIBEV_FLAGS"))
855 flags = atoi (getenv ("LIBEV_FLAGS")); 948 flags = atoi (getenv ("LIBEV_FLAGS"));
856 949
857 if (!(flags & 0x0000ffffUL)) 950 if (!(flags & 0x0000ffffUL))
858 flags |= ev_recommended_backends (); 951 flags |= ev_recommended_backends ();
859 952
860 backend = 0; 953 backend = 0;
954 backend_fd = -1;
955#if EV_USE_INOTIFY
956 fs_fd = -2;
957#endif
958
861#if EV_USE_PORT 959#if EV_USE_PORT
862 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 960 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
863#endif 961#endif
864#if EV_USE_KQUEUE 962#if EV_USE_KQUEUE
865 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 963 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
877 ev_init (&sigev, sigcb); 975 ev_init (&sigev, sigcb);
878 ev_set_priority (&sigev, EV_MAXPRI); 976 ev_set_priority (&sigev, EV_MAXPRI);
879 } 977 }
880} 978}
881 979
882static void 980static void noinline
883loop_destroy (EV_P) 981loop_destroy (EV_P)
884{ 982{
885 int i; 983 int i;
984
985#if EV_USE_INOTIFY
986 if (fs_fd >= 0)
987 close (fs_fd);
988#endif
989
990 if (backend_fd >= 0)
991 close (backend_fd);
886 992
887#if EV_USE_PORT 993#if EV_USE_PORT
888 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 994 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
889#endif 995#endif
890#if EV_USE_KQUEUE 996#if EV_USE_KQUEUE
899#if EV_USE_SELECT 1005#if EV_USE_SELECT
900 if (backend == EVBACKEND_SELECT) select_destroy (EV_A); 1006 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
901#endif 1007#endif
902 1008
903 for (i = NUMPRI; i--; ) 1009 for (i = NUMPRI; i--; )
1010 {
904 array_free (pending, [i]); 1011 array_free (pending, [i]);
1012#if EV_IDLE_ENABLE
1013 array_free (idle, [i]);
1014#endif
1015 }
905 1016
906 /* have to use the microsoft-never-gets-it-right macro */ 1017 /* have to use the microsoft-never-gets-it-right macro */
907 array_free (fdchange, EMPTY0); 1018 array_free (fdchange, EMPTY);
908 array_free (timer, EMPTY0); 1019 array_free (timer, EMPTY);
909#if EV_PERIODICS 1020#if EV_PERIODIC_ENABLE
910 array_free (periodic, EMPTY0); 1021 array_free (periodic, EMPTY);
911#endif 1022#endif
912 array_free (idle, EMPTY0);
913 array_free (prepare, EMPTY0); 1023 array_free (prepare, EMPTY);
914 array_free (check, EMPTY0); 1024 array_free (check, EMPTY);
915 1025
916 backend = 0; 1026 backend = 0;
917} 1027}
918 1028
919static void 1029void inline_size infy_fork (EV_P);
1030
1031void inline_size
920loop_fork (EV_P) 1032loop_fork (EV_P)
921{ 1033{
922#if EV_USE_PORT 1034#if EV_USE_PORT
923 if (backend == EVBACKEND_PORT ) port_fork (EV_A); 1035 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
924#endif 1036#endif
925#if EV_USE_KQUEUE 1037#if EV_USE_KQUEUE
926 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A); 1038 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
927#endif 1039#endif
928#if EV_USE_EPOLL 1040#if EV_USE_EPOLL
929 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A); 1041 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
1042#endif
1043#if EV_USE_INOTIFY
1044 infy_fork (EV_A);
930#endif 1045#endif
931 1046
932 if (ev_is_active (&sigev)) 1047 if (ev_is_active (&sigev))
933 { 1048 {
934 /* default loop */ 1049 /* default loop */
1050 postfork = 1; 1165 postfork = 1;
1051} 1166}
1052 1167
1053/*****************************************************************************/ 1168/*****************************************************************************/
1054 1169
1055static int 1170void
1056any_pending (EV_P) 1171ev_invoke (EV_P_ void *w, int revents)
1057{ 1172{
1058 int pri; 1173 EV_CB_INVOKE ((W)w, revents);
1059
1060 for (pri = NUMPRI; pri--; )
1061 if (pendingcnt [pri])
1062 return 1;
1063
1064 return 0;
1065} 1174}
1066 1175
1067inline void 1176void inline_speed
1068call_pending (EV_P) 1177call_pending (EV_P)
1069{ 1178{
1070 int pri; 1179 int pri;
1071 1180
1072 for (pri = NUMPRI; pri--; ) 1181 for (pri = NUMPRI; pri--; )
1074 { 1183 {
1075 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1184 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
1076 1185
1077 if (expect_true (p->w)) 1186 if (expect_true (p->w))
1078 { 1187 {
1188 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1189
1079 p->w->pending = 0; 1190 p->w->pending = 0;
1080 EV_CB_INVOKE (p->w, p->events); 1191 EV_CB_INVOKE (p->w, p->events);
1081 } 1192 }
1082 } 1193 }
1083} 1194}
1084 1195
1085inline void 1196void inline_size
1086timers_reify (EV_P) 1197timers_reify (EV_P)
1087{ 1198{
1088 while (timercnt && ((WT)timers [0])->at <= mn_now) 1199 while (timercnt && ((WT)timers [0])->at <= mn_now)
1089 { 1200 {
1090 ev_timer *w = timers [0]; 1201 ev_timer *w = timers [0];
1091 1202
1092 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1203 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
1093 1204
1094 /* first reschedule or stop timer */ 1205 /* first reschedule or stop timer */
1095 if (w->repeat) 1206 if (w->repeat)
1096 { 1207 {
1097 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1208 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1107 1218
1108 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1219 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1109 } 1220 }
1110} 1221}
1111 1222
1112#if EV_PERIODICS 1223#if EV_PERIODIC_ENABLE
1113inline void 1224void inline_size
1114periodics_reify (EV_P) 1225periodics_reify (EV_P)
1115{ 1226{
1116 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1227 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
1117 { 1228 {
1118 ev_periodic *w = periodics [0]; 1229 ev_periodic *w = periodics [0];
1119 1230
1120 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1231 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1121 1232
1122 /* first reschedule or stop timer */ 1233 /* first reschedule or stop timer */
1123 if (w->reschedule_cb) 1234 if (w->reschedule_cb)
1124 { 1235 {
1125 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1236 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1137 1248
1138 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1249 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1139 } 1250 }
1140} 1251}
1141 1252
1142static void 1253static void noinline
1143periodics_reschedule (EV_P) 1254periodics_reschedule (EV_P)
1144{ 1255{
1145 int i; 1256 int i;
1146 1257
1147 /* adjust periodics after time jump */ 1258 /* adjust periodics after time jump */
1159 for (i = periodiccnt >> 1; i--; ) 1270 for (i = periodiccnt >> 1; i--; )
1160 downheap ((WT *)periodics, periodiccnt, i); 1271 downheap ((WT *)periodics, periodiccnt, i);
1161} 1272}
1162#endif 1273#endif
1163 1274
1164inline int 1275#if EV_IDLE_ENABLE
1276void inline_size
1277idle_reify (EV_P)
1278{
1279 if (expect_false (idleall))
1280 {
1281 int pri;
1282
1283 for (pri = NUMPRI; pri--; )
1284 {
1285 if (pendingcnt [pri])
1286 break;
1287
1288 if (idlecnt [pri])
1289 {
1290 queue_events (EV_A_ (W *)idles [pri], idlecnt [pri], EV_IDLE);
1291 break;
1292 }
1293 }
1294 }
1295}
1296#endif
1297
1298int inline_size
1165time_update_monotonic (EV_P) 1299time_update_monotonic (EV_P)
1166{ 1300{
1167 mn_now = get_clock (); 1301 mn_now = get_clock ();
1168 1302
1169 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1303 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1177 ev_rt_now = ev_time (); 1311 ev_rt_now = ev_time ();
1178 return 1; 1312 return 1;
1179 } 1313 }
1180} 1314}
1181 1315
1182inline void 1316void inline_size
1183time_update (EV_P) 1317time_update (EV_P)
1184{ 1318{
1185 int i; 1319 int i;
1186 1320
1187#if EV_USE_MONOTONIC 1321#if EV_USE_MONOTONIC
1189 { 1323 {
1190 if (time_update_monotonic (EV_A)) 1324 if (time_update_monotonic (EV_A))
1191 { 1325 {
1192 ev_tstamp odiff = rtmn_diff; 1326 ev_tstamp odiff = rtmn_diff;
1193 1327
1194 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 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; )
1195 { 1337 {
1196 rtmn_diff = ev_rt_now - mn_now; 1338 rtmn_diff = ev_rt_now - mn_now;
1197 1339
1198 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1340 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1199 return; /* all is well */ 1341 return; /* all is well */
1201 ev_rt_now = ev_time (); 1343 ev_rt_now = ev_time ();
1202 mn_now = get_clock (); 1344 mn_now = get_clock ();
1203 now_floor = mn_now; 1345 now_floor = mn_now;
1204 } 1346 }
1205 1347
1206# if EV_PERIODICS 1348# if EV_PERIODIC_ENABLE
1207 periodics_reschedule (EV_A); 1349 periodics_reschedule (EV_A);
1208# endif 1350# endif
1209 /* no timer adjustment, as the monotonic clock doesn't jump */ 1351 /* no timer adjustment, as the monotonic clock doesn't jump */
1210 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1352 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1211 } 1353 }
1215 { 1357 {
1216 ev_rt_now = ev_time (); 1358 ev_rt_now = ev_time ();
1217 1359
1218 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1360 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1219 { 1361 {
1220#if EV_PERIODICS 1362#if EV_PERIODIC_ENABLE
1221 periodics_reschedule (EV_A); 1363 periodics_reschedule (EV_A);
1222#endif 1364#endif
1223 1365
1224 /* adjust timers. this is easy, as the offset is the same for all */ 1366 /* adjust timers. this is easy, as the offset is the same for all of them */
1225 for (i = 0; i < timercnt; ++i) 1367 for (i = 0; i < timercnt; ++i)
1226 ((WT)timers [i])->at += ev_rt_now - mn_now; 1368 ((WT)timers [i])->at += ev_rt_now - mn_now;
1227 } 1369 }
1228 1370
1229 mn_now = ev_rt_now; 1371 mn_now = ev_rt_now;
1249{ 1391{
1250 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) 1392 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1251 ? EVUNLOOP_ONE 1393 ? EVUNLOOP_ONE
1252 : EVUNLOOP_CANCEL; 1394 : EVUNLOOP_CANCEL;
1253 1395
1254 while (activecnt) 1396 call_pending (EV_A); /* in case we recurse, ensure ordering stays nice and clean */
1397
1398 do
1255 { 1399 {
1400#ifndef _WIN32
1401 if (expect_false (curpid)) /* penalise the forking check even more */
1402 if (expect_false (getpid () != curpid))
1403 {
1404 curpid = getpid ();
1405 postfork = 1;
1406 }
1407#endif
1408
1409#if EV_FORK_ENABLE
1410 /* we might have forked, so queue fork handlers */
1411 if (expect_false (postfork))
1412 if (forkcnt)
1413 {
1414 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1415 call_pending (EV_A);
1416 }
1417#endif
1418
1256 /* queue check watchers (and execute them) */ 1419 /* queue prepare watchers (and execute them) */
1257 if (expect_false (preparecnt)) 1420 if (expect_false (preparecnt))
1258 { 1421 {
1259 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1422 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1260 call_pending (EV_A); 1423 call_pending (EV_A);
1261 } 1424 }
1262 1425
1426 if (expect_false (!activecnt))
1427 break;
1428
1263 /* we might have forked, so reify kernel state if necessary */ 1429 /* we might have forked, so reify kernel state if necessary */
1264 if (expect_false (postfork)) 1430 if (expect_false (postfork))
1265 loop_fork (EV_A); 1431 loop_fork (EV_A);
1266 1432
1267 /* update fd-related kernel structures */ 1433 /* update fd-related kernel structures */
1268 fd_reify (EV_A); 1434 fd_reify (EV_A);
1269 1435
1270 /* calculate blocking time */ 1436 /* calculate blocking time */
1271 { 1437 {
1272 double block; 1438 ev_tstamp block;
1273 1439
1274 if (flags & EVLOOP_NONBLOCK || idlecnt) 1440 if (expect_false (flags & EVLOOP_NONBLOCK || idleall || !activecnt))
1275 block = 0.; /* do not block at all */ 1441 block = 0.; /* do not block at all */
1276 else 1442 else
1277 { 1443 {
1278 /* update time to cancel out callback processing overhead */ 1444 /* update time to cancel out callback processing overhead */
1279#if EV_USE_MONOTONIC 1445#if EV_USE_MONOTONIC
1292 { 1458 {
1293 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge; 1459 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1294 if (block > to) block = to; 1460 if (block > to) block = to;
1295 } 1461 }
1296 1462
1297#if EV_PERIODICS 1463#if EV_PERIODIC_ENABLE
1298 if (periodiccnt) 1464 if (periodiccnt)
1299 { 1465 {
1300 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge; 1466 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1301 if (block > to) block = to; 1467 if (block > to) block = to;
1302 } 1468 }
1303#endif 1469#endif
1304 1470
1305 if (expect_false (block < 0.)) block = 0.; 1471 if (expect_false (block < 0.)) block = 0.;
1306 } 1472 }
1307 1473
1474 ++loop_count;
1308 backend_poll (EV_A_ block); 1475 backend_poll (EV_A_ block);
1309 } 1476 }
1310 1477
1311 /* update ev_rt_now, do magic */ 1478 /* update ev_rt_now, do magic */
1312 time_update (EV_A); 1479 time_update (EV_A);
1313 1480
1314 /* queue pending timers and reschedule them */ 1481 /* queue pending timers and reschedule them */
1315 timers_reify (EV_A); /* relative timers called last */ 1482 timers_reify (EV_A); /* relative timers called last */
1316#if EV_PERIODICS 1483#if EV_PERIODIC_ENABLE
1317 periodics_reify (EV_A); /* absolute timers called first */ 1484 periodics_reify (EV_A); /* absolute timers called first */
1318#endif 1485#endif
1319 1486
1487#if EV_IDLE_ENABLE
1320 /* queue idle watchers unless io or timers are pending */ 1488 /* queue idle watchers unless other events are pending */
1321 if (idlecnt && !any_pending (EV_A)) 1489 idle_reify (EV_A);
1322 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1490#endif
1323 1491
1324 /* queue check watchers, to be executed first */ 1492 /* queue check watchers, to be executed first */
1325 if (expect_false (checkcnt)) 1493 if (expect_false (checkcnt))
1326 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1494 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1327 1495
1328 call_pending (EV_A); 1496 call_pending (EV_A);
1329 1497
1330 if (expect_false (loop_done))
1331 break;
1332 } 1498 }
1499 while (expect_true (activecnt && !loop_done));
1333 1500
1334 if (loop_done == EVUNLOOP_ONE) 1501 if (loop_done == EVUNLOOP_ONE)
1335 loop_done = EVUNLOOP_CANCEL; 1502 loop_done = EVUNLOOP_CANCEL;
1336} 1503}
1337 1504
1341 loop_done = how; 1508 loop_done = how;
1342} 1509}
1343 1510
1344/*****************************************************************************/ 1511/*****************************************************************************/
1345 1512
1346inline void 1513void inline_size
1347wlist_add (WL *head, WL elem) 1514wlist_add (WL *head, WL elem)
1348{ 1515{
1349 elem->next = *head; 1516 elem->next = *head;
1350 *head = elem; 1517 *head = elem;
1351} 1518}
1352 1519
1353inline void 1520void inline_size
1354wlist_del (WL *head, WL elem) 1521wlist_del (WL *head, WL elem)
1355{ 1522{
1356 while (*head) 1523 while (*head)
1357 { 1524 {
1358 if (*head == elem) 1525 if (*head == elem)
1363 1530
1364 head = &(*head)->next; 1531 head = &(*head)->next;
1365 } 1532 }
1366} 1533}
1367 1534
1368inline void 1535void inline_speed
1369ev_clear_pending (EV_P_ W w) 1536clear_pending (EV_P_ W w)
1370{ 1537{
1371 if (w->pending) 1538 if (w->pending)
1372 { 1539 {
1373 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1540 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1374 w->pending = 0; 1541 w->pending = 0;
1375 } 1542 }
1376} 1543}
1377 1544
1378inline void 1545int
1546ev_clear_pending (EV_P_ void *w)
1547{
1548 W w_ = (W)w;
1549 int pending = w_->pending;
1550
1551 if (!pending)
1552 return 0;
1553
1554 w_->pending = 0;
1555 ANPENDING *p = pendings [ABSPRI (w_)] + pending - 1;
1556 p->w = 0;
1557
1558 return p->events;
1559}
1560
1561void inline_size
1562pri_adjust (EV_P_ W w)
1563{
1564 int pri = w->priority;
1565 pri = pri < EV_MINPRI ? EV_MINPRI : pri;
1566 pri = pri > EV_MAXPRI ? EV_MAXPRI : pri;
1567 w->priority = pri;
1568}
1569
1570void inline_speed
1379ev_start (EV_P_ W w, int active) 1571ev_start (EV_P_ W w, int active)
1380{ 1572{
1381 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1573 pri_adjust (EV_A_ w);
1382 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1383
1384 w->active = active; 1574 w->active = active;
1385 ev_ref (EV_A); 1575 ev_ref (EV_A);
1386} 1576}
1387 1577
1388inline void 1578void inline_size
1389ev_stop (EV_P_ W w) 1579ev_stop (EV_P_ W w)
1390{ 1580{
1391 ev_unref (EV_A); 1581 ev_unref (EV_A);
1392 w->active = 0; 1582 w->active = 0;
1393} 1583}
1412} 1602}
1413 1603
1414void 1604void
1415ev_io_stop (EV_P_ ev_io *w) 1605ev_io_stop (EV_P_ ev_io *w)
1416{ 1606{
1417 ev_clear_pending (EV_A_ (W)w); 1607 clear_pending (EV_A_ (W)w);
1418 if (expect_false (!ev_is_active (w))) 1608 if (expect_false (!ev_is_active (w)))
1419 return; 1609 return;
1420 1610
1421 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax)); 1611 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1422 1612
1439 ev_start (EV_A_ (W)w, ++timercnt); 1629 ev_start (EV_A_ (W)w, ++timercnt);
1440 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2); 1630 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1441 timers [timercnt - 1] = w; 1631 timers [timercnt - 1] = w;
1442 upheap ((WT *)timers, timercnt - 1); 1632 upheap ((WT *)timers, timercnt - 1);
1443 1633
1634 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1635}
1636
1637void
1638ev_timer_stop (EV_P_ ev_timer *w)
1639{
1640 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w)))
1642 return;
1643
1444 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1644 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1445}
1446 1645
1447void 1646 {
1448ev_timer_stop (EV_P_ ev_timer *w) 1647 int active = ((W)w)->active;
1449{
1450 ev_clear_pending (EV_A_ (W)w);
1451 if (expect_false (!ev_is_active (w)))
1452 return;
1453 1648
1454 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1455
1456 if (expect_true (((W)w)->active < timercnt--)) 1649 if (expect_true (--active < --timercnt))
1457 { 1650 {
1458 timers [((W)w)->active - 1] = timers [timercnt]; 1651 timers [active] = timers [timercnt];
1459 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1652 adjustheap ((WT *)timers, timercnt, active);
1460 } 1653 }
1654 }
1461 1655
1462 ((WT)w)->at -= mn_now; 1656 ((WT)w)->at -= mn_now;
1463 1657
1464 ev_stop (EV_A_ (W)w); 1658 ev_stop (EV_A_ (W)w);
1465} 1659}
1482 w->at = w->repeat; 1676 w->at = w->repeat;
1483 ev_timer_start (EV_A_ w); 1677 ev_timer_start (EV_A_ w);
1484 } 1678 }
1485} 1679}
1486 1680
1487#if EV_PERIODICS 1681#if EV_PERIODIC_ENABLE
1488void 1682void
1489ev_periodic_start (EV_P_ ev_periodic *w) 1683ev_periodic_start (EV_P_ ev_periodic *w)
1490{ 1684{
1491 if (expect_false (ev_is_active (w))) 1685 if (expect_false (ev_is_active (w)))
1492 return; 1686 return;
1503 ev_start (EV_A_ (W)w, ++periodiccnt); 1697 ev_start (EV_A_ (W)w, ++periodiccnt);
1504 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2); 1698 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1505 periodics [periodiccnt - 1] = w; 1699 periodics [periodiccnt - 1] = w;
1506 upheap ((WT *)periodics, periodiccnt - 1); 1700 upheap ((WT *)periodics, periodiccnt - 1);
1507 1701
1702 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1703}
1704
1705void
1706ev_periodic_stop (EV_P_ ev_periodic *w)
1707{
1708 clear_pending (EV_A_ (W)w);
1709 if (expect_false (!ev_is_active (w)))
1710 return;
1711
1508 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1712 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1509}
1510 1713
1511void 1714 {
1512ev_periodic_stop (EV_P_ ev_periodic *w) 1715 int active = ((W)w)->active;
1513{
1514 ev_clear_pending (EV_A_ (W)w);
1515 if (expect_false (!ev_is_active (w)))
1516 return;
1517 1716
1518 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1519
1520 if (expect_true (((W)w)->active < periodiccnt--)) 1717 if (expect_true (--active < --periodiccnt))
1521 { 1718 {
1522 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1719 periodics [active] = periodics [periodiccnt];
1523 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1720 adjustheap ((WT *)periodics, periodiccnt, active);
1524 } 1721 }
1722 }
1525 1723
1526 ev_stop (EV_A_ (W)w); 1724 ev_stop (EV_A_ (W)w);
1527} 1725}
1528 1726
1529void 1727void
1532 /* TODO: use adjustheap and recalculation */ 1730 /* TODO: use adjustheap and recalculation */
1533 ev_periodic_stop (EV_A_ w); 1731 ev_periodic_stop (EV_A_ w);
1534 ev_periodic_start (EV_A_ w); 1732 ev_periodic_start (EV_A_ w);
1535} 1733}
1536#endif 1734#endif
1537
1538void
1539ev_idle_start (EV_P_ ev_idle *w)
1540{
1541 if (expect_false (ev_is_active (w)))
1542 return;
1543
1544 ev_start (EV_A_ (W)w, ++idlecnt);
1545 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1546 idles [idlecnt - 1] = w;
1547}
1548
1549void
1550ev_idle_stop (EV_P_ ev_idle *w)
1551{
1552 ev_clear_pending (EV_A_ (W)w);
1553 if (expect_false (!ev_is_active (w)))
1554 return;
1555
1556 idles [((W)w)->active - 1] = idles [--idlecnt];
1557 ev_stop (EV_A_ (W)w);
1558}
1559
1560void
1561ev_prepare_start (EV_P_ ev_prepare *w)
1562{
1563 if (expect_false (ev_is_active (w)))
1564 return;
1565
1566 ev_start (EV_A_ (W)w, ++preparecnt);
1567 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1568 prepares [preparecnt - 1] = w;
1569}
1570
1571void
1572ev_prepare_stop (EV_P_ ev_prepare *w)
1573{
1574 ev_clear_pending (EV_A_ (W)w);
1575 if (expect_false (!ev_is_active (w)))
1576 return;
1577
1578 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1579 ev_stop (EV_A_ (W)w);
1580}
1581
1582void
1583ev_check_start (EV_P_ ev_check *w)
1584{
1585 if (expect_false (ev_is_active (w)))
1586 return;
1587
1588 ev_start (EV_A_ (W)w, ++checkcnt);
1589 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1590 checks [checkcnt - 1] = w;
1591}
1592
1593void
1594ev_check_stop (EV_P_ ev_check *w)
1595{
1596 ev_clear_pending (EV_A_ (W)w);
1597 if (expect_false (!ev_is_active (w)))
1598 return;
1599
1600 checks [((W)w)->active - 1] = checks [--checkcnt];
1601 ev_stop (EV_A_ (W)w);
1602}
1603 1735
1604#ifndef SA_RESTART 1736#ifndef SA_RESTART
1605# define SA_RESTART 0 1737# define SA_RESTART 0
1606#endif 1738#endif
1607 1739
1635} 1767}
1636 1768
1637void 1769void
1638ev_signal_stop (EV_P_ ev_signal *w) 1770ev_signal_stop (EV_P_ ev_signal *w)
1639{ 1771{
1640 ev_clear_pending (EV_A_ (W)w); 1772 clear_pending (EV_A_ (W)w);
1641 if (expect_false (!ev_is_active (w))) 1773 if (expect_false (!ev_is_active (w)))
1642 return; 1774 return;
1643 1775
1644 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1776 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1645 ev_stop (EV_A_ (W)w); 1777 ev_stop (EV_A_ (W)w);
1656#endif 1788#endif
1657 if (expect_false (ev_is_active (w))) 1789 if (expect_false (ev_is_active (w)))
1658 return; 1790 return;
1659 1791
1660 ev_start (EV_A_ (W)w, 1); 1792 ev_start (EV_A_ (W)w, 1);
1661 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1793 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1662} 1794}
1663 1795
1664void 1796void
1665ev_child_stop (EV_P_ ev_child *w) 1797ev_child_stop (EV_P_ ev_child *w)
1666{ 1798{
1667 ev_clear_pending (EV_A_ (W)w); 1799 clear_pending (EV_A_ (W)w);
1668 if (expect_false (!ev_is_active (w))) 1800 if (expect_false (!ev_is_active (w)))
1669 return; 1801 return;
1670 1802
1671 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1803 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1672 ev_stop (EV_A_ (W)w); 1804 ev_stop (EV_A_ (W)w);
1673} 1805}
1674 1806
1675#if EV_MULTIPLICITY 1807#if EV_STAT_ENABLE
1808
1809# ifdef _WIN32
1810# undef lstat
1811# define lstat(a,b) _stati64 (a,b)
1812# endif
1813
1814#define DEF_STAT_INTERVAL 5.0074891
1815#define MIN_STAT_INTERVAL 0.1074891
1816
1817static void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1818
1819#if EV_USE_INOTIFY
1820# define EV_INOTIFY_BUFSIZE 8192
1821
1822static void noinline
1823infy_add (EV_P_ ev_stat *w)
1824{
1825 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);
1826
1827 if (w->wd < 0)
1828 {
1829 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1830
1831 /* monitor some parent directory for speedup hints */
1832 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1833 {
1834 char path [4096];
1835 strcpy (path, w->path);
1836
1837 do
1838 {
1839 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1840 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1841
1842 char *pend = strrchr (path, '/');
1843
1844 if (!pend)
1845 break; /* whoops, no '/', complain to your admin */
1846
1847 *pend = 0;
1848 w->wd = inotify_add_watch (fs_fd, path, mask);
1849 }
1850 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1851 }
1852 }
1853 else
1854 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1855
1856 if (w->wd >= 0)
1857 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1858}
1859
1860static void noinline
1861infy_del (EV_P_ ev_stat *w)
1862{
1863 int slot;
1864 int wd = w->wd;
1865
1866 if (wd < 0)
1867 return;
1868
1869 w->wd = -2;
1870 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1871 wlist_del (&fs_hash [slot].head, (WL)w);
1872
1873 /* remove this watcher, if others are watching it, they will rearm */
1874 inotify_rm_watch (fs_fd, wd);
1875}
1876
1877static void noinline
1878infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1879{
1880 if (slot < 0)
1881 /* overflow, need to check for all hahs slots */
1882 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1883 infy_wd (EV_A_ slot, wd, ev);
1884 else
1885 {
1886 WL w_;
1887
1888 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1889 {
1890 ev_stat *w = (ev_stat *)w_;
1891 w_ = w_->next; /* lets us remove this watcher and all before it */
1892
1893 if (w->wd == wd || wd == -1)
1894 {
1895 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1896 {
1897 w->wd = -1;
1898 infy_add (EV_A_ w); /* re-add, no matter what */
1899 }
1900
1901 stat_timer_cb (EV_A_ &w->timer, 0);
1902 }
1903 }
1904 }
1905}
1906
1907static void
1908infy_cb (EV_P_ ev_io *w, int revents)
1909{
1910 char buf [EV_INOTIFY_BUFSIZE];
1911 struct inotify_event *ev = (struct inotify_event *)buf;
1912 int ofs;
1913 int len = read (fs_fd, buf, sizeof (buf));
1914
1915 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1916 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1917}
1918
1919void inline_size
1920infy_init (EV_P)
1921{
1922 if (fs_fd != -2)
1923 return;
1924
1925 fs_fd = inotify_init ();
1926
1927 if (fs_fd >= 0)
1928 {
1929 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1930 ev_set_priority (&fs_w, EV_MAXPRI);
1931 ev_io_start (EV_A_ &fs_w);
1932 }
1933}
1934
1935void inline_size
1936infy_fork (EV_P)
1937{
1938 int slot;
1939
1940 if (fs_fd < 0)
1941 return;
1942
1943 close (fs_fd);
1944 fs_fd = inotify_init ();
1945
1946 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1947 {
1948 WL w_ = fs_hash [slot].head;
1949 fs_hash [slot].head = 0;
1950
1951 while (w_)
1952 {
1953 ev_stat *w = (ev_stat *)w_;
1954 w_ = w_->next; /* lets us add this watcher */
1955
1956 w->wd = -1;
1957
1958 if (fs_fd >= 0)
1959 infy_add (EV_A_ w); /* re-add, no matter what */
1960 else
1961 ev_timer_start (EV_A_ &w->timer);
1962 }
1963
1964 }
1965}
1966
1967#endif
1968
1676void 1969void
1970ev_stat_stat (EV_P_ ev_stat *w)
1971{
1972 if (lstat (w->path, &w->attr) < 0)
1973 w->attr.st_nlink = 0;
1974 else if (!w->attr.st_nlink)
1975 w->attr.st_nlink = 1;
1976}
1977
1978static void noinline
1979stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1980{
1981 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1982
1983 /* we copy this here each the time so that */
1984 /* prev has the old value when the callback gets invoked */
1985 w->prev = w->attr;
1986 ev_stat_stat (EV_A_ w);
1987
1988 /* memcmp doesn't work on netbsd, they.... do stuff to their struct stat */
1989 if (
1990 w->prev.st_dev != w->attr.st_dev
1991 || w->prev.st_ino != w->attr.st_ino
1992 || w->prev.st_mode != w->attr.st_mode
1993 || w->prev.st_nlink != w->attr.st_nlink
1994 || w->prev.st_uid != w->attr.st_uid
1995 || w->prev.st_gid != w->attr.st_gid
1996 || w->prev.st_rdev != w->attr.st_rdev
1997 || w->prev.st_size != w->attr.st_size
1998 || w->prev.st_atime != w->attr.st_atime
1999 || w->prev.st_mtime != w->attr.st_mtime
2000 || w->prev.st_ctime != w->attr.st_ctime
2001 ) {
2002 #if EV_USE_INOTIFY
2003 infy_del (EV_A_ w);
2004 infy_add (EV_A_ w);
2005 ev_stat_stat (EV_A_ w); /* avoid race... */
2006 #endif
2007
2008 ev_feed_event (EV_A_ w, EV_STAT);
2009 }
2010}
2011
2012void
2013ev_stat_start (EV_P_ ev_stat *w)
2014{
2015 if (expect_false (ev_is_active (w)))
2016 return;
2017
2018 /* since we use memcmp, we need to clear any padding data etc. */
2019 memset (&w->prev, 0, sizeof (ev_statdata));
2020 memset (&w->attr, 0, sizeof (ev_statdata));
2021
2022 ev_stat_stat (EV_A_ w);
2023
2024 if (w->interval < MIN_STAT_INTERVAL)
2025 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
2026
2027 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
2028 ev_set_priority (&w->timer, ev_priority (w));
2029
2030#if EV_USE_INOTIFY
2031 infy_init (EV_A);
2032
2033 if (fs_fd >= 0)
2034 infy_add (EV_A_ w);
2035 else
2036#endif
2037 ev_timer_start (EV_A_ &w->timer);
2038
2039 ev_start (EV_A_ (W)w, 1);
2040}
2041
2042void
2043ev_stat_stop (EV_P_ ev_stat *w)
2044{
2045 clear_pending (EV_A_ (W)w);
2046 if (expect_false (!ev_is_active (w)))
2047 return;
2048
2049#if EV_USE_INOTIFY
2050 infy_del (EV_A_ w);
2051#endif
2052 ev_timer_stop (EV_A_ &w->timer);
2053
2054 ev_stop (EV_A_ (W)w);
2055}
2056#endif
2057
2058#if EV_IDLE_ENABLE
2059void
2060ev_idle_start (EV_P_ ev_idle *w)
2061{
2062 if (expect_false (ev_is_active (w)))
2063 return;
2064
2065 pri_adjust (EV_A_ (W)w);
2066
2067 {
2068 int active = ++idlecnt [ABSPRI (w)];
2069
2070 ++idleall;
2071 ev_start (EV_A_ (W)w, active);
2072
2073 array_needsize (ev_idle *, idles [ABSPRI (w)], idlemax [ABSPRI (w)], active, EMPTY2);
2074 idles [ABSPRI (w)][active - 1] = w;
2075 }
2076}
2077
2078void
2079ev_idle_stop (EV_P_ ev_idle *w)
2080{
2081 clear_pending (EV_A_ (W)w);
2082 if (expect_false (!ev_is_active (w)))
2083 return;
2084
2085 {
2086 int active = ((W)w)->active;
2087
2088 idles [ABSPRI (w)][active - 1] = idles [ABSPRI (w)][--idlecnt [ABSPRI (w)]];
2089 ((W)idles [ABSPRI (w)][active - 1])->active = active;
2090
2091 ev_stop (EV_A_ (W)w);
2092 --idleall;
2093 }
2094}
2095#endif
2096
2097void
2098ev_prepare_start (EV_P_ ev_prepare *w)
2099{
2100 if (expect_false (ev_is_active (w)))
2101 return;
2102
2103 ev_start (EV_A_ (W)w, ++preparecnt);
2104 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
2105 prepares [preparecnt - 1] = w;
2106}
2107
2108void
2109ev_prepare_stop (EV_P_ ev_prepare *w)
2110{
2111 clear_pending (EV_A_ (W)w);
2112 if (expect_false (!ev_is_active (w)))
2113 return;
2114
2115 {
2116 int active = ((W)w)->active;
2117 prepares [active - 1] = prepares [--preparecnt];
2118 ((W)prepares [active - 1])->active = active;
2119 }
2120
2121 ev_stop (EV_A_ (W)w);
2122}
2123
2124void
2125ev_check_start (EV_P_ ev_check *w)
2126{
2127 if (expect_false (ev_is_active (w)))
2128 return;
2129
2130 ev_start (EV_A_ (W)w, ++checkcnt);
2131 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2132 checks [checkcnt - 1] = w;
2133}
2134
2135void
2136ev_check_stop (EV_P_ ev_check *w)
2137{
2138 clear_pending (EV_A_ (W)w);
2139 if (expect_false (!ev_is_active (w)))
2140 return;
2141
2142 {
2143 int active = ((W)w)->active;
2144 checks [active - 1] = checks [--checkcnt];
2145 ((W)checks [active - 1])->active = active;
2146 }
2147
2148 ev_stop (EV_A_ (W)w);
2149}
2150
2151#if EV_EMBED_ENABLE
2152void noinline
1677ev_embed_loop (EV_P_ ev_embed *w) 2153ev_embed_sweep (EV_P_ ev_embed *w)
1678{ 2154{
1679 ev_loop (w->loop, EVLOOP_NONBLOCK); 2155 ev_loop (w->loop, EVLOOP_NONBLOCK);
1680} 2156}
1681 2157
1682static void 2158static void
1685 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io)); 2161 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
1686 2162
1687 if (ev_cb (w)) 2163 if (ev_cb (w))
1688 ev_feed_event (EV_A_ (W)w, EV_EMBED); 2164 ev_feed_event (EV_A_ (W)w, EV_EMBED);
1689 else 2165 else
1690 ev_embed_loop (loop, w); 2166 ev_embed_sweep (loop, w);
1691} 2167}
1692 2168
1693void 2169void
1694ev_embed_start (EV_P_ ev_embed *w) 2170ev_embed_start (EV_P_ ev_embed *w)
1695{ 2171{
1702 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ); 2178 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
1703 } 2179 }
1704 2180
1705 ev_set_priority (&w->io, ev_priority (w)); 2181 ev_set_priority (&w->io, ev_priority (w));
1706 ev_io_start (EV_A_ &w->io); 2182 ev_io_start (EV_A_ &w->io);
2183
1707 ev_start (EV_A_ (W)w, 1); 2184 ev_start (EV_A_ (W)w, 1);
1708} 2185}
1709 2186
1710void 2187void
1711ev_embed_stop (EV_P_ ev_embed *w) 2188ev_embed_stop (EV_P_ ev_embed *w)
1712{ 2189{
1713 ev_clear_pending (EV_A_ (W)w); 2190 clear_pending (EV_A_ (W)w);
1714 if (expect_false (!ev_is_active (w))) 2191 if (expect_false (!ev_is_active (w)))
1715 return; 2192 return;
1716 2193
1717 ev_io_stop (EV_A_ &w->io); 2194 ev_io_stop (EV_A_ &w->io);
2195
2196 ev_stop (EV_A_ (W)w);
2197}
2198#endif
2199
2200#if EV_FORK_ENABLE
2201void
2202ev_fork_start (EV_P_ ev_fork *w)
2203{
2204 if (expect_false (ev_is_active (w)))
2205 return;
2206
2207 ev_start (EV_A_ (W)w, ++forkcnt);
2208 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2209 forks [forkcnt - 1] = w;
2210}
2211
2212void
2213ev_fork_stop (EV_P_ ev_fork *w)
2214{
2215 clear_pending (EV_A_ (W)w);
2216 if (expect_false (!ev_is_active (w)))
2217 return;
2218
2219 {
2220 int active = ((W)w)->active;
2221 forks [active - 1] = forks [--forkcnt];
2222 ((W)forks [active - 1])->active = active;
2223 }
2224
1718 ev_stop (EV_A_ (W)w); 2225 ev_stop (EV_A_ (W)w);
1719} 2226}
1720#endif 2227#endif
1721 2228
1722/*****************************************************************************/ 2229/*****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines