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

Comparing libev/ev.c (file contents):
Revision 1.251 by root, Thu May 22 03:42:34 2008 UTC vs.
Revision 1.257 by root, Sun Jun 29 22:32:51 2008 UTC

… …
154#ifndef _WIN32 154#ifndef _WIN32
155# include <sys/time.h> 155# include <sys/time.h>
156# include <sys/wait.h> 156# include <sys/wait.h>
157# include <unistd.h> 157# include <unistd.h>
158#else 158#else
159# include <io.h>
159# define WIN32_LEAN_AND_MEAN 160# define WIN32_LEAN_AND_MEAN
160# include <windows.h> 161# include <windows.h>
161# ifndef EV_SELECT_IS_WINSOCKET 162# ifndef EV_SELECT_IS_WINSOCKET
162# define EV_SELECT_IS_WINSOCKET 1 163# define EV_SELECT_IS_WINSOCKET 1
163# endif 164# endif
164#endif 165#endif
165 166
166/* this block tries to deduce configuration from header-defined symbols and defaults */ 167/* this block tries to deduce configuration from header-defined symbols and defaults */
167 168
168#ifndef EV_USE_MONOTONIC 169#ifndef EV_USE_MONOTONIC
170# if defined (_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0
171# define EV_USE_MONOTONIC 1
172# else
169# define EV_USE_MONOTONIC 0 173# define EV_USE_MONOTONIC 0
174# endif
170#endif 175#endif
171 176
172#ifndef EV_USE_REALTIME 177#ifndef EV_USE_REALTIME
173# define EV_USE_REALTIME 0 178# define EV_USE_REALTIME 0
174#endif 179#endif
175 180
176#ifndef EV_USE_NANOSLEEP 181#ifndef EV_USE_NANOSLEEP
182# if _POSIX_C_SOURCE >= 199309L
183# define EV_USE_NANOSLEEP 1
184# else
177# define EV_USE_NANOSLEEP 0 185# define EV_USE_NANOSLEEP 0
186# endif
178#endif 187#endif
179 188
180#ifndef EV_USE_SELECT 189#ifndef EV_USE_SELECT
181# define EV_USE_SELECT 1 190# define EV_USE_SELECT 1
182#endif 191#endif
… …
556 struct timeval tv; 565 struct timeval tv;
557 566
558 tv.tv_sec = (time_t)delay; 567 tv.tv_sec = (time_t)delay;
559 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6); 568 tv.tv_usec = (long)((delay - (ev_tstamp)(tv.tv_sec)) * 1e6);
560 569
570 /* here we rely on sys/time.h + sys/types.h + unistd.h providing select */
571 /* somehting nto guaranteed by newer posix versions, but guaranteed */
572 /* by older ones */
561 select (0, 0, 0, 0, &tv); 573 select (0, 0, 0, 0, &tv);
562#endif 574#endif
563 } 575 }
564} 576}
565 577
… …
699 events |= (unsigned char)w->events; 711 events |= (unsigned char)w->events;
700 712
701#if EV_SELECT_IS_WINSOCKET 713#if EV_SELECT_IS_WINSOCKET
702 if (events) 714 if (events)
703 { 715 {
704 unsigned long argp; 716 unsigned long arg;
705 #ifdef EV_FD_TO_WIN32_HANDLE 717 #ifdef EV_FD_TO_WIN32_HANDLE
706 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 718 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
707 #else 719 #else
708 anfd->handle = _get_osfhandle (fd); 720 anfd->handle = _get_osfhandle (fd);
709 #endif 721 #endif
710 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0)); 722 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
711 } 723 }
712#endif 724#endif
713 725
714 { 726 {
715 unsigned char o_events = anfd->events; 727 unsigned char o_events = anfd->events;
… …
768{ 780{
769 int fd; 781 int fd;
770 782
771 for (fd = 0; fd < anfdmax; ++fd) 783 for (fd = 0; fd < anfdmax; ++fd)
772 if (anfds [fd].events) 784 if (anfds [fd].events)
773 if (!fd_valid (fd) == -1 && errno == EBADF) 785 if (!fd_valid (fd) && errno == EBADF)
774 fd_kill (EV_A_ fd); 786 fd_kill (EV_A_ fd);
775} 787}
776 788
777/* called on ENOMEM in select/poll to kill some fds and retry */ 789/* called on ENOMEM in select/poll to kill some fds and retry */
778static void noinline 790static void noinline
… …
975 987
976void inline_speed 988void inline_speed
977fd_intern (int fd) 989fd_intern (int fd)
978{ 990{
979#ifdef _WIN32 991#ifdef _WIN32
980 int arg = 1; 992 unsigned long arg = 1;
981 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg); 993 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
982#else 994#else
983 fcntl (fd, F_SETFD, FD_CLOEXEC); 995 fcntl (fd, F_SETFD, FD_CLOEXEC);
984 fcntl (fd, F_SETFL, O_NONBLOCK); 996 fcntl (fd, F_SETFL, O_NONBLOCK);
985#endif 997#endif
… …
1568 1580
1569 for (i = NUMPRI; i--; ) 1581 for (i = NUMPRI; i--; )
1570 { 1582 {
1571 assert (pendingmax [i] >= pendingcnt [i]); 1583 assert (pendingmax [i] >= pendingcnt [i]);
1572#if EV_IDLE_ENABLE 1584#if EV_IDLE_ENABLE
1585 assert (idleall >= 0);
1573 assert (idlemax [i] >= idlecnt [i]); 1586 assert (idlemax [i] >= idlecnt [i]);
1574 array_verify (EV_A_ (W *)idles [i], idlecnt [i]); 1587 array_verify (EV_A_ (W *)idles [i], idlecnt [i]);
1575#endif 1588#endif
1576 } 1589 }
1577 1590
… …
2558 } 2571 }
2559 2572
2560 } 2573 }
2561} 2574}
2562 2575
2576#endif
2577
2578#ifdef _WIN32
2579# define EV_LSTAT(p,b) _stati64 (p, b)
2580#else
2581# define EV_LSTAT(p,b) lstat (p, b)
2563#endif 2582#endif
2564 2583
2565void 2584void
2566ev_stat_stat (EV_P_ ev_stat *w) 2585ev_stat_stat (EV_P_ ev_stat *w)
2567{ 2586{

Diff Legend

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