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

Comparing libev/ev.c (file contents):
Revision 1.355 by root, Fri Oct 22 10:09:12 2010 UTC vs.
Revision 1.357 by root, Sat Oct 23 22:25:44 2010 UTC

… …
382# include <sys/select.h> 382# include <sys/select.h>
383# endif 383# endif
384#endif 384#endif
385 385
386#if EV_USE_INOTIFY 386#if EV_USE_INOTIFY
387# include <sys/utsname.h>
388# include <sys/statfs.h> 387# include <sys/statfs.h>
389# include <sys/inotify.h> 388# include <sys/inotify.h>
390/* some very old inotify.h headers don't have IN_DONT_FOLLOW */ 389/* some very old inotify.h headers don't have IN_DONT_FOLLOW */
391# ifndef IN_DONT_FOLLOW 390# ifndef IN_DONT_FOLLOW
392# undef EV_USE_INOTIFY 391# undef EV_USE_INOTIFY
… …
523# include "ev_win32.c" 522# include "ev_win32.c"
524#endif 523#endif
525 524
526/*****************************************************************************/ 525/*****************************************************************************/
527 526
527#ifdef __linux
528# include <sys/utsname.h>
529#endif
530
528static unsigned int noinline 531static unsigned int noinline
529ev_linux_version (void) 532ev_linux_version (void)
530{ 533{
531#ifdef __linux 534#ifdef __linux
532 struct utsname buf; 535 struct utsname buf;
… …
665 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */ 668 unsigned char emask; /* the epoll backend stores the actual kernel mask in here */
666 unsigned char unused; 669 unsigned char unused;
667#if EV_USE_EPOLL 670#if EV_USE_EPOLL
668 unsigned int egen; /* generation counter to counter epoll bugs */ 671 unsigned int egen; /* generation counter to counter epoll bugs */
669#endif 672#endif
670#if EV_SELECT_IS_WINSOCKET 673#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
671 SOCKET handle; 674 SOCKET handle;
675#endif
676#if EV_USE_IOCP
677 OVERLAPPED or, ow;
672#endif 678#endif
673} ANFD; 679} ANFD;
674 680
675/* stores the pending event set for a given watcher */ 681/* stores the pending event set for a given watcher */
676typedef struct 682typedef struct
… …
972 unsigned char o_events = anfd->events; 978 unsigned char o_events = anfd->events;
973 unsigned char o_reify = anfd->reify; 979 unsigned char o_reify = anfd->reify;
974 980
975 anfd->reify = 0; 981 anfd->reify = 0;
976 982
977#if EV_SELECT_IS_WINSOCKET 983#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
978 if (o_reify & EV__IOFDSET) 984 if (o_reify & EV__IOFDSET)
979 { 985 {
980 unsigned long arg; 986 unsigned long arg;
981 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd); 987 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
982 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0)); 988 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
989 printf ("oi %d %x\n", fd, anfd->handle);//D
983 } 990 }
984#endif 991#endif
985 992
986 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 993 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
987 { 994 {
… …
1486 1493
1487#endif 1494#endif
1488 1495
1489/*****************************************************************************/ 1496/*****************************************************************************/
1490 1497
1498#if EV_USE_IOCP
1499# include "ev_iocp.c"
1500#endif
1491#if EV_USE_PORT 1501#if EV_USE_PORT
1492# include "ev_port.c" 1502# include "ev_port.c"
1493#endif 1503#endif
1494#if EV_USE_KQUEUE 1504#if EV_USE_KQUEUE
1495# include "ev_kqueue.c" 1505# include "ev_kqueue.c"
… …
1692#endif 1702#endif
1693 1703
1694 if (!(flags & 0x0000ffffU)) 1704 if (!(flags & 0x0000ffffU))
1695 flags |= ev_recommended_backends (); 1705 flags |= ev_recommended_backends ();
1696 1706
1707#if EV_USE_IOCP
1708 if (!backend && (flags & EVBACKEND_IOCP )) backend = iocp_init (EV_A_ flags);
1709#endif
1697#if EV_USE_PORT 1710#if EV_USE_PORT
1698 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags); 1711 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
1699#endif 1712#endif
1700#if EV_USE_KQUEUE 1713#if EV_USE_KQUEUE
1701 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags); 1714 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
… …
1753#endif 1766#endif
1754 1767
1755 if (backend_fd >= 0) 1768 if (backend_fd >= 0)
1756 close (backend_fd); 1769 close (backend_fd);
1757 1770
1771#if EV_USE_IOCP
1772 if (backend == EVBACKEND_IOCP ) iocp_destroy (EV_A);
1773#endif
1758#if EV_USE_PORT 1774#if EV_USE_PORT
1759 if (backend == EVBACKEND_PORT ) port_destroy (EV_A); 1775 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
1760#endif 1776#endif
1761#if EV_USE_KQUEUE 1777#if EV_USE_KQUEUE
1762 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A); 1778 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);

Diff Legend

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