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

Comparing libev/ev.c (file contents):
Revision 1.425 by root, Sun May 6 13:09:35 2012 UTC vs.
Revision 1.427 by root, Sun May 6 19:29:59 2012 UTC

1876 write (evfd, &counter, sizeof (uint64_t)); 1876 write (evfd, &counter, sizeof (uint64_t));
1877 } 1877 }
1878 else 1878 else
1879#endif 1879#endif
1880 { 1880 {
1881 /* win32 people keep sending patches that change this write() to send() */ 1881#ifdef _WIN32
1882 /* and then run away. but send() is wrong, it wants a socket handle on win32 */ 1882 WSABUF buf;
1883 /* so when you think this write should be a send instead, please find out */ 1883 DWORD sent;
1884 /* where your send() is from - it's definitely not the microsoft send, and */ 1884 buf.buf = &buf;
1885 /* tell me. thank you. */ 1885 buf.len = 1;
1886 /* it might be that your problem is that your environment needs EV_USE_WSASOCKET */ 1886 WSASend (EV_FD_TO_WIN32_HANDLE (evpipe [1]), &buf, 1, &sent, 0, 0, 0);
1887 /* check the ev documentation on how to use this flag */ 1887#else
1888 write (evpipe [1], &(evpipe [1]), 1); 1888 write (evpipe [1], &(evpipe [1]), 1);
1889#endif
1889 } 1890 }
1890 1891
1891 errno = old_errno; 1892 errno = old_errno;
1892 } 1893 }
1893} 1894}
1908 read (evfd, &counter, sizeof (uint64_t)); 1909 read (evfd, &counter, sizeof (uint64_t));
1909 } 1910 }
1910 else 1911 else
1911#endif 1912#endif
1912 { 1913 {
1913 char dummy; 1914 char dummy[4];
1914 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1915#ifdef _WIN32
1916 WSABUF buf;
1917 DWORD recvd;
1918 buf.buf = dummy;
1919 buf.len = sizeof (dummy);
1920 WSARecv (EV_FD_TO_WIN32_HANDLE (evpipe [0]), &buf, 1, &recvd, 0, 0, 0);
1921#else
1915 read (evpipe [0], &dummy, 1); 1922 read (evpipe [0], &dummy, sizeof (dummy));
1923#endif
1916 } 1924 }
1917 } 1925 }
1918 1926
1919 pipe_write_skipped = 0; 1927 pipe_write_skipped = 0;
1920 1928
2554#if EV_FEATURE_API 2562#if EV_FEATURE_API
2555void ecb_cold 2563void ecb_cold
2556ev_verify (EV_P) EV_THROW 2564ev_verify (EV_P) EV_THROW
2557{ 2565{
2558#if EV_VERIFY 2566#if EV_VERIFY
2559 int i; 2567 int i, j;
2560 WL w; 2568 WL w, w2;
2561 2569
2562 assert (activecnt >= -1); 2570 assert (activecnt >= -1);
2563 2571
2564 assert (fdchangemax >= fdchangecnt); 2572 assert (fdchangemax >= fdchangecnt);
2565 for (i = 0; i < fdchangecnt; ++i) 2573 for (i = 0; i < fdchangecnt; ++i)
2566 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0)); 2574 assert (("libev: negative fd in fdchanges", fdchanges [i] >= 0));
2567 2575
2568 assert (anfdmax >= 0); 2576 assert (anfdmax >= 0);
2569 for (i = 0; i < anfdmax; ++i) 2577 for (i = j = 0; i < anfdmax; ++i)
2570 for (w = anfds [i].head; w; w = w->next) 2578 for (w = w2 = anfds [i].head; w; w = w->next)
2571 { 2579 {
2572 verify_watcher (EV_A_ (W)w); 2580 verify_watcher (EV_A_ (W)w);
2581
2582 if (++j & 1)
2583 w2 = w2->next;
2584
2585 assert (("libev: io watcher list contains a loop", w != w2));
2573 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1)); 2586 assert (("libev: inactive fd watcher on anfd list", ev_active (w) == 1));
2574 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i)); 2587 assert (("libev: fd mismatch between watcher and anfd", ((ev_io *)w)->fd == i));
2575 } 2588 }
2576 2589
2577 assert (timermax >= timercnt); 2590 assert (timermax >= timercnt);
3249 EV_FREQUENT_CHECK; 3262 EV_FREQUENT_CHECK;
3250 3263
3251 ev_start (EV_A_ (W)w, 1); 3264 ev_start (EV_A_ (W)w, 1);
3252 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero); 3265 array_needsize (ANFD, anfds, anfdmax, fd + 1, array_init_zero);
3253 wlist_add (&anfds[fd].head, (WL)w); 3266 wlist_add (&anfds[fd].head, (WL)w);
3267
3268 /* common bug, apparently */
3269 assert (("libev: ev_io_start called with corrupted watcher", ((WL)w)->next != (WL)w));
3254 3270
3255 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY); 3271 fd_change (EV_A_ fd, w->events & EV__IOFDSET | EV_ANFD_REIFY);
3256 w->events &= ~EV__IOFDSET; 3272 w->events &= ~EV__IOFDSET;
3257 3273
3258 EV_FREQUENT_CHECK; 3274 EV_FREQUENT_CHECK;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines