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

Comparing libev/ev.c (file contents):
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC vs.
Revision 1.155 by root, Wed Nov 28 17:32:24 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 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. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
97# endif
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
53# endif 105# endif
54 106
55#endif 107#endif
56 108
57#include <math.h> 109#include <math.h>
66#include <sys/types.h> 118#include <sys/types.h>
67#include <time.h> 119#include <time.h>
68 120
69#include <signal.h> 121#include <signal.h>
70 122
71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
74# include <sys/wait.h>
75#endif
76/**/
77
78#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1
80#endif
81
82#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1
84#endif
85
86#ifndef EV_USE_POLL
87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
88#endif
89
90#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0
92#endif
93
94#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif
107
108#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1
110#endif
111
112/**/
113
114#ifndef CLOCK_MONOTONIC
115# undef EV_USE_MONOTONIC
116# define EV_USE_MONOTONIC 0
117#endif
118
119#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0
122#endif
123
124/**/
125
126#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
127#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
128#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
129/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
130
131#ifdef EV_H 123#ifdef EV_H
132# include EV_H 124# include EV_H
133#else 125#else
134# include "ev.h" 126# include "ev.h"
135#endif 127#endif
136 128
129#ifndef _WIN32
130# include <sys/time.h>
131# include <sys/wait.h>
132# include <unistd.h>
133#else
134# define WIN32_LEAN_AND_MEAN
135# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1
138# endif
139#endif
140
141/**/
142
143#ifndef EV_USE_MONOTONIC
144# define EV_USE_MONOTONIC 0
145#endif
146
147#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0
149#endif
150
151#ifndef EV_USE_SELECT
152# define EV_USE_SELECT 1
153#endif
154
155#ifndef EV_USE_POLL
156# ifdef _WIN32
157# define EV_USE_POLL 0
158# else
159# define EV_USE_POLL 1
160# endif
161#endif
162
163#ifndef EV_USE_EPOLL
164# define EV_USE_EPOLL 0
165#endif
166
167#ifndef EV_USE_KQUEUE
168# define EV_USE_KQUEUE 0
169#endif
170
171#ifndef EV_USE_PORT
172# define EV_USE_PORT 0
173#endif
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
195/**/
196
197#ifndef CLOCK_MONOTONIC
198# undef EV_USE_MONOTONIC
199# define EV_USE_MONOTONIC 0
200#endif
201
202#ifndef CLOCK_REALTIME
203# undef EV_USE_REALTIME
204# define EV_USE_REALTIME 0
205#endif
206
207#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h>
209#endif
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
219/**/
220
221#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) */
223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
224
137#if __GNUC__ >= 3 225#if __GNUC__ >= 3
138# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
139# define inline inline 229# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
140#else 235#else
141# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
237# define inline_speed static
142# define inline static 238# define inline_size static
239# define noinline
143#endif 240#endif
144 241
145#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
146#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
147 244
148#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
149#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) ((w)->priority - EV_MINPRI)
150 247
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */
250
151typedef struct ev_watcher *W; 251typedef ev_watcher *W;
152typedef struct ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
153typedef struct ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
154 254
155static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
156 256
257#ifdef _WIN32
157#include "ev_win32.c" 258# include "ev_win32.c"
259#endif
158 260
159/*****************************************************************************/ 261/*****************************************************************************/
160 262
161static void (*syserr_cb)(const char *msg); 263static void (*syserr_cb)(const char *msg);
162 264
265void
163void ev_set_syserr_cb (void (*cb)(const char *msg)) 266ev_set_syserr_cb (void (*cb)(const char *msg))
164{ 267{
165 syserr_cb = cb; 268 syserr_cb = cb;
166} 269}
167 270
168static void 271static void noinline
169syserr (const char *msg) 272syserr (const char *msg)
170{ 273{
171 if (!msg) 274 if (!msg)
172 msg = "(libev) system error"; 275 msg = "(libev) system error";
173 276
180 } 283 }
181} 284}
182 285
183static void *(*alloc)(void *ptr, long size); 286static void *(*alloc)(void *ptr, long size);
184 287
288void
185void ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, long size))
186{ 290{
187 alloc = cb; 291 alloc = cb;
188} 292}
189 293
190static void * 294inline_speed void *
191ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, long size)
192{ 296{
193 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
194 298
195 if (!ptr && size) 299 if (!ptr && size)
209typedef struct 313typedef struct
210{ 314{
211 WL head; 315 WL head;
212 unsigned char events; 316 unsigned char events;
213 unsigned char reify; 317 unsigned char reify;
318#if EV_SELECT_IS_WINSOCKET
319 SOCKET handle;
320#endif
214} ANFD; 321} ANFD;
215 322
216typedef struct 323typedef struct
217{ 324{
218 W w; 325 W w;
219 int events; 326 int events;
220} ANPENDING; 327} ANPENDING;
221 328
329#if EV_USE_INOTIFY
330typedef struct
331{
332 WL head;
333} ANFS;
334#endif
335
222#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
223 337
224 struct ev_loop 338 struct ev_loop
225 { 339 {
340 ev_tstamp ev_rt_now;
341 #define ev_rt_now ((loop)->ev_rt_now)
226 #define VAR(name,decl) decl; 342 #define VAR(name,decl) decl;
227 #include "ev_vars.h" 343 #include "ev_vars.h"
228 #undef VAR 344 #undef VAR
229 }; 345 };
230 #include "ev_wrap.h" 346 #include "ev_wrap.h"
231 347
232 struct ev_loop default_loop_struct; 348 static struct ev_loop default_loop_struct;
233 static struct ev_loop *default_loop; 349 struct ev_loop *ev_default_loop_ptr;
234 350
235#else 351#else
236 352
353 ev_tstamp ev_rt_now;
237 #define VAR(name,decl) static decl; 354 #define VAR(name,decl) static decl;
238 #include "ev_vars.h" 355 #include "ev_vars.h"
239 #undef VAR 356 #undef VAR
240 357
241 static int default_loop; 358 static int ev_default_loop_ptr;
242 359
243#endif 360#endif
244 361
245/*****************************************************************************/ 362/*****************************************************************************/
246 363
247inline ev_tstamp 364ev_tstamp
248ev_time (void) 365ev_time (void)
249{ 366{
250#if EV_USE_REALTIME 367#if EV_USE_REALTIME
251 struct timespec ts; 368 struct timespec ts;
252 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
256 gettimeofday (&tv, 0); 373 gettimeofday (&tv, 0);
257 return tv.tv_sec + tv.tv_usec * 1e-6; 374 return tv.tv_sec + tv.tv_usec * 1e-6;
258#endif 375#endif
259} 376}
260 377
261inline ev_tstamp 378ev_tstamp inline_size
262get_clock (void) 379get_clock (void)
263{ 380{
264#if EV_USE_MONOTONIC 381#if EV_USE_MONOTONIC
265 if (expect_true (have_monotonic)) 382 if (expect_true (have_monotonic))
266 { 383 {
279{ 396{
280 return ev_rt_now; 397 return ev_rt_now;
281} 398}
282#endif 399#endif
283 400
284#define array_roundsize(type,n) ((n) | 4 & ~3) 401#define array_roundsize(type,n) (((n) | 4) & ~3)
285 402
286#define array_needsize(type,base,cur,cnt,init) \ 403#define array_needsize(type,base,cur,cnt,init) \
287 if (expect_false ((cnt) > cur)) \ 404 if (expect_false ((cnt) > cur)) \
288 { \ 405 { \
289 int newcnt = cur; \ 406 int newcnt = cur; \
304 stem ## max = array_roundsize (stem ## cnt >> 1); \ 421 stem ## max = array_roundsize (stem ## cnt >> 1); \
305 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\ 422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
306 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
307 } 424 }
308 425
309/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
310/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
311#define array_free_microshit(stem) \
312 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
313
314#define array_free(stem, idx) \ 426#define array_free(stem, idx) \
315 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
316 428
317/*****************************************************************************/ 429/*****************************************************************************/
318 430
319static void 431void noinline
432ev_feed_event (EV_P_ void *w, int revents)
433{
434 W w_ = (W)w;
435
436 if (expect_false (w_->pending))
437 {
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
439 return;
440 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446}
447
448void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type)
450{
451 int i;
452
453 for (i = 0; i < eventcnt; ++i)
454 ev_feed_event (EV_A_ events [i], type);
455}
456
457/*****************************************************************************/
458
459void inline_size
320anfds_init (ANFD *base, int count) 460anfds_init (ANFD *base, int count)
321{ 461{
322 while (count--) 462 while (count--)
323 { 463 {
324 base->head = 0; 464 base->head = 0;
327 467
328 ++base; 468 ++base;
329 } 469 }
330} 470}
331 471
332void 472void inline_speed
333ev_feed_event (EV_P_ void *w, int revents)
334{
335 W w_ = (W)w;
336
337 if (w_->pending)
338 {
339 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
340 return;
341 }
342
343 w_->pending = ++pendingcnt [ABSPRI (w_)];
344 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
345 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
346 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
347}
348
349static void
350queue_events (EV_P_ W *events, int eventcnt, int type)
351{
352 int i;
353
354 for (i = 0; i < eventcnt; ++i)
355 ev_feed_event (EV_A_ events [i], type);
356}
357
358inline void
359fd_event (EV_P_ int fd, int revents) 473fd_event (EV_P_ int fd, int revents)
360{ 474{
361 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
362 struct ev_io *w; 476 ev_io *w;
363 477
364 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 478 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
365 { 479 {
366 int ev = w->events & revents; 480 int ev = w->events & revents;
367 481
368 if (ev) 482 if (ev)
369 ev_feed_event (EV_A_ (W)w, ev); 483 ev_feed_event (EV_A_ (W)w, ev);
374ev_feed_fd_event (EV_P_ int fd, int revents) 488ev_feed_fd_event (EV_P_ int fd, int revents)
375{ 489{
376 fd_event (EV_A_ fd, revents); 490 fd_event (EV_A_ fd, revents);
377} 491}
378 492
379/*****************************************************************************/ 493void inline_size
380
381static void
382fd_reify (EV_P) 494fd_reify (EV_P)
383{ 495{
384 int i; 496 int i;
385 497
386 for (i = 0; i < fdchangecnt; ++i) 498 for (i = 0; i < fdchangecnt; ++i)
387 { 499 {
388 int fd = fdchanges [i]; 500 int fd = fdchanges [i];
389 ANFD *anfd = anfds + fd; 501 ANFD *anfd = anfds + fd;
390 struct ev_io *w; 502 ev_io *w;
391 503
392 int events = 0; 504 int events = 0;
393 505
394 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
395 events |= w->events; 507 events |= w->events;
396 508
509#if EV_SELECT_IS_WINSOCKET
510 if (events)
511 {
512 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd);
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 }
516#endif
517
397 anfd->reify = 0; 518 anfd->reify = 0;
398 519
399 method_modify (EV_A_ fd, anfd->events, events); 520 backend_modify (EV_A_ fd, anfd->events, events);
400 anfd->events = events; 521 anfd->events = events;
401 } 522 }
402 523
403 fdchangecnt = 0; 524 fdchangecnt = 0;
404} 525}
405 526
406static void 527void inline_size
407fd_change (EV_P_ int fd) 528fd_change (EV_P_ int fd)
408{ 529{
409 if (anfds [fd].reify) 530 if (expect_false (anfds [fd].reify))
410 return; 531 return;
411 532
412 anfds [fd].reify = 1; 533 anfds [fd].reify = 1;
413 534
414 ++fdchangecnt; 535 ++fdchangecnt;
415 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void)); 536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
416 fdchanges [fdchangecnt - 1] = fd; 537 fdchanges [fdchangecnt - 1] = fd;
417} 538}
418 539
419static void 540void inline_speed
420fd_kill (EV_P_ int fd) 541fd_kill (EV_P_ int fd)
421{ 542{
422 struct ev_io *w; 543 ev_io *w;
423 544
424 while ((w = (struct ev_io *)anfds [fd].head)) 545 while ((w = (ev_io *)anfds [fd].head))
425 { 546 {
426 ev_io_stop (EV_A_ w); 547 ev_io_stop (EV_A_ w);
427 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 548 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
428 } 549 }
429} 550}
430 551
431static int 552int inline_size
432fd_valid (int fd) 553fd_valid (int fd)
433{ 554{
434#ifdef WIN32 555#ifdef _WIN32
435 return !!win32_get_osfhandle (fd); 556 return _get_osfhandle (fd) != -1;
436#else 557#else
437 return fcntl (fd, F_GETFD) != -1; 558 return fcntl (fd, F_GETFD) != -1;
438#endif 559#endif
439} 560}
440 561
441/* called on EBADF to verify fds */ 562/* called on EBADF to verify fds */
442static void 563static void noinline
443fd_ebadf (EV_P) 564fd_ebadf (EV_P)
444{ 565{
445 int fd; 566 int fd;
446 567
447 for (fd = 0; fd < anfdmax; ++fd) 568 for (fd = 0; fd < anfdmax; ++fd)
449 if (!fd_valid (fd) == -1 && errno == EBADF) 570 if (!fd_valid (fd) == -1 && errno == EBADF)
450 fd_kill (EV_A_ fd); 571 fd_kill (EV_A_ fd);
451} 572}
452 573
453/* called on ENOMEM in select/poll to kill some fds and retry */ 574/* called on ENOMEM in select/poll to kill some fds and retry */
454static void 575static void noinline
455fd_enomem (EV_P) 576fd_enomem (EV_P)
456{ 577{
457 int fd; 578 int fd;
458 579
459 for (fd = anfdmax; fd--; ) 580 for (fd = anfdmax; fd--; )
462 fd_kill (EV_A_ fd); 583 fd_kill (EV_A_ fd);
463 return; 584 return;
464 } 585 }
465} 586}
466 587
467/* usually called after fork if method needs to re-arm all fds from scratch */ 588/* usually called after fork if backend needs to re-arm all fds from scratch */
468static void 589static void noinline
469fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
470{ 591{
471 int fd; 592 int fd;
472 593
473 /* this should be highly optimised to not do anything but set a flag */ 594 /* this should be highly optimised to not do anything but set a flag */
479 } 600 }
480} 601}
481 602
482/*****************************************************************************/ 603/*****************************************************************************/
483 604
484static void 605void inline_speed
485upheap (WT *heap, int k) 606upheap (WT *heap, int k)
486{ 607{
487 WT w = heap [k]; 608 WT w = heap [k];
488 609
489 while (k && heap [k >> 1]->at > w->at) 610 while (k && heap [k >> 1]->at > w->at)
496 heap [k] = w; 617 heap [k] = w;
497 ((W)heap [k])->active = k + 1; 618 ((W)heap [k])->active = k + 1;
498 619
499} 620}
500 621
501static void 622void inline_speed
502downheap (WT *heap, int N, int k) 623downheap (WT *heap, int N, int k)
503{ 624{
504 WT w = heap [k]; 625 WT w = heap [k];
505 626
506 while (k < (N >> 1)) 627 while (k < (N >> 1))
520 641
521 heap [k] = w; 642 heap [k] = w;
522 ((W)heap [k])->active = k + 1; 643 ((W)heap [k])->active = k + 1;
523} 644}
524 645
525inline void 646void inline_size
526adjustheap (WT *heap, int N, int k, ev_tstamp at) 647adjustheap (WT *heap, int N, int k)
527{ 648{
528 ev_tstamp old_at = heap [k]->at; 649 upheap (heap, k);
529 heap [k]->at = at;
530
531 if (old_at < at)
532 downheap (heap, N, k); 650 downheap (heap, N, k);
533 else
534 upheap (heap, k);
535} 651}
536 652
537/*****************************************************************************/ 653/*****************************************************************************/
538 654
539typedef struct 655typedef struct
545static ANSIG *signals; 661static ANSIG *signals;
546static int signalmax; 662static int signalmax;
547 663
548static int sigpipe [2]; 664static int sigpipe [2];
549static sig_atomic_t volatile gotsig; 665static sig_atomic_t volatile gotsig;
550static struct ev_io sigev; 666static ev_io sigev;
551 667
552static void 668void inline_size
553signals_init (ANSIG *base, int count) 669signals_init (ANSIG *base, int count)
554{ 670{
555 while (count--) 671 while (count--)
556 { 672 {
557 base->head = 0; 673 base->head = 0;
562} 678}
563 679
564static void 680static void
565sighandler (int signum) 681sighandler (int signum)
566{ 682{
567#if WIN32 683#if _WIN32
568 signal (signum, sighandler); 684 signal (signum, sighandler);
569#endif 685#endif
570 686
571 signals [signum - 1].gotsig = 1; 687 signals [signum - 1].gotsig = 1;
572 688
573 if (!gotsig) 689 if (!gotsig)
574 { 690 {
575 int old_errno = errno; 691 int old_errno = errno;
576 gotsig = 1; 692 gotsig = 1;
577#ifdef WIN32
578 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
579#else
580 write (sigpipe [1], &signum, 1); 693 write (sigpipe [1], &signum, 1);
581#endif
582 errno = old_errno; 694 errno = old_errno;
583 } 695 }
584} 696}
585 697
586void 698void noinline
587ev_feed_signal_event (EV_P_ int signum) 699ev_feed_signal_event (EV_P_ int signum)
588{ 700{
589 WL w; 701 WL w;
590 702
591#if EV_MULTIPLICITY 703#if EV_MULTIPLICITY
592 assert (("feeding signal events is only supported in the default loop", loop == default_loop)); 704 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
593#endif 705#endif
594 706
595 --signum; 707 --signum;
596 708
597 if (signum < 0 || signum >= signalmax) 709 if (signum < 0 || signum >= signalmax)
602 for (w = signals [signum].head; w; w = w->next) 714 for (w = signals [signum].head; w; w = w->next)
603 ev_feed_event (EV_A_ (W)w, EV_SIGNAL); 715 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
604} 716}
605 717
606static void 718static void
607sigcb (EV_P_ struct ev_io *iow, int revents) 719sigcb (EV_P_ ev_io *iow, int revents)
608{ 720{
609 int signum; 721 int signum;
610 722
611#ifdef WIN32
612 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
613#else
614 read (sigpipe [0], &revents, 1); 723 read (sigpipe [0], &revents, 1);
615#endif
616 gotsig = 0; 724 gotsig = 0;
617 725
618 for (signum = signalmax; signum--; ) 726 for (signum = signalmax; signum--; )
619 if (signals [signum].gotsig) 727 if (signals [signum].gotsig)
620 ev_feed_signal_event (EV_A_ signum + 1); 728 ev_feed_signal_event (EV_A_ signum + 1);
621} 729}
622 730
623static void 731void inline_size
732fd_intern (int fd)
733{
734#ifdef _WIN32
735 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
737#else
738 fcntl (fd, F_SETFD, FD_CLOEXEC);
739 fcntl (fd, F_SETFL, O_NONBLOCK);
740#endif
741}
742
743static void noinline
624siginit (EV_P) 744siginit (EV_P)
625{ 745{
626#ifndef WIN32 746 fd_intern (sigpipe [0]);
627 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 747 fd_intern (sigpipe [1]);
628 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
629
630 /* rather than sort out wether we really need nb, set it */
631 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
632 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
633#endif
634 748
635 ev_io_set (&sigev, sigpipe [0], EV_READ); 749 ev_io_set (&sigev, sigpipe [0], EV_READ);
636 ev_io_start (EV_A_ &sigev); 750 ev_io_start (EV_A_ &sigev);
637 ev_unref (EV_A); /* child watcher should not keep loop alive */ 751 ev_unref (EV_A); /* child watcher should not keep loop alive */
638} 752}
639 753
640/*****************************************************************************/ 754/*****************************************************************************/
641 755
642static struct ev_child *childs [PID_HASHSIZE]; 756static ev_child *childs [EV_PID_HASHSIZE];
643 757
644#ifndef WIN32 758#ifndef _WIN32
645 759
646static struct ev_signal childev; 760static ev_signal childev;
647 761
648#ifndef WCONTINUED 762void inline_speed
649# define WCONTINUED 0
650#endif
651
652static void
653child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) 763child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
654{ 764{
655 struct ev_child *w; 765 ev_child *w;
656 766
657 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
658 if (w->pid == pid || !w->pid) 768 if (w->pid == pid || !w->pid)
659 { 769 {
660 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
661 w->rpid = pid; 771 w->rpid = pid;
662 w->rstatus = status; 772 w->rstatus = status;
663 ev_feed_event (EV_A_ (W)w, EV_CHILD); 773 ev_feed_event (EV_A_ (W)w, EV_CHILD);
664 } 774 }
665} 775}
666 776
777#ifndef WCONTINUED
778# define WCONTINUED 0
779#endif
780
667static void 781static void
668childcb (EV_P_ struct ev_signal *sw, int revents) 782childcb (EV_P_ ev_signal *sw, int revents)
669{ 783{
670 int pid, status; 784 int pid, status;
671 785
786 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
672 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 787 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
673 { 788 if (!WCONTINUED
789 || errno != EINVAL
790 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
791 return;
792
674 /* make sure we are called again until all childs have been reaped */ 793 /* make sure we are called again until all childs have been reaped */
794 /* we need to do it this way so that the callback gets called before we continue */
675 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL); 795 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
676 796
677 child_reap (EV_A_ sw, pid, pid, status); 797 child_reap (EV_A_ sw, pid, pid, status);
798 if (EV_PID_HASHSIZE > 1)
678 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 799 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
679 }
680} 800}
681 801
682#endif 802#endif
683 803
684/*****************************************************************************/ 804/*****************************************************************************/
685 805
806#if EV_USE_PORT
807# include "ev_port.c"
808#endif
686#if EV_USE_KQUEUE 809#if EV_USE_KQUEUE
687# include "ev_kqueue.c" 810# include "ev_kqueue.c"
688#endif 811#endif
689#if EV_USE_EPOLL 812#if EV_USE_EPOLL
690# include "ev_epoll.c" 813# include "ev_epoll.c"
707{ 830{
708 return EV_VERSION_MINOR; 831 return EV_VERSION_MINOR;
709} 832}
710 833
711/* return true if we are running with elevated privileges and should ignore env variables */ 834/* return true if we are running with elevated privileges and should ignore env variables */
712static int 835int inline_size
713enable_secure (void) 836enable_secure (void)
714{ 837{
715#ifdef WIN32 838#ifdef _WIN32
716 return 0; 839 return 0;
717#else 840#else
718 return getuid () != geteuid () 841 return getuid () != geteuid ()
719 || getgid () != getegid (); 842 || getgid () != getegid ();
720#endif 843#endif
721} 844}
722 845
723int 846unsigned int
724ev_method (EV_P) 847ev_supported_backends (void)
725{ 848{
726 return method; 849 unsigned int flags = 0;
727}
728 850
729static void 851 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
730loop_init (EV_P_ int methods) 852 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
853 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
854 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
855 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
856
857 return flags;
858}
859
860unsigned int
861ev_recommended_backends (void)
731{ 862{
732 if (!method) 863 unsigned int flags = ev_supported_backends ();
864
865#ifndef __NetBSD__
866 /* kqueue is borked on everything but netbsd apparently */
867 /* it usually doesn't work correctly on anything but sockets and pipes */
868 flags &= ~EVBACKEND_KQUEUE;
869#endif
870#ifdef __APPLE__
871 // flags &= ~EVBACKEND_KQUEUE; for documentation
872 flags &= ~EVBACKEND_POLL;
873#endif
874
875 return flags;
876}
877
878unsigned int
879ev_embeddable_backends (void)
880{
881 return EVBACKEND_EPOLL
882 | EVBACKEND_KQUEUE
883 | EVBACKEND_PORT;
884}
885
886unsigned int
887ev_backend (EV_P)
888{
889 return backend;
890}
891
892static void noinline
893loop_init (EV_P_ unsigned int flags)
894{
895 if (!backend)
733 { 896 {
734#if EV_USE_MONOTONIC 897#if EV_USE_MONOTONIC
735 { 898 {
736 struct timespec ts; 899 struct timespec ts;
737 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 900 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
742 ev_rt_now = ev_time (); 905 ev_rt_now = ev_time ();
743 mn_now = get_clock (); 906 mn_now = get_clock ();
744 now_floor = mn_now; 907 now_floor = mn_now;
745 rtmn_diff = ev_rt_now - mn_now; 908 rtmn_diff = ev_rt_now - mn_now;
746 909
747 if (methods == EVMETHOD_AUTO) 910 if (!(flags & EVFLAG_NOENV)
748 if (!enable_secure () && getenv ("LIBEV_METHODS")) 911 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS"))
749 methods = atoi (getenv ("LIBEV_METHODS")); 913 flags = atoi (getenv ("LIBEV_FLAGS"));
750 else
751 methods = EVMETHOD_ANY;
752 914
753 method = 0; 915 if (!(flags & 0x0000ffffUL))
916 flags |= ev_recommended_backends ();
917
918 backend = 0;
919 backend_fd = -1;
754#if EV_USE_WIN32 920#if EV_USE_INOTIFY
755 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 921 fs_fd = -2;
922#endif
923
924#if EV_USE_PORT
925 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
756#endif 926#endif
757#if EV_USE_KQUEUE 927#if EV_USE_KQUEUE
758 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 928 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
759#endif 929#endif
760#if EV_USE_EPOLL 930#if EV_USE_EPOLL
761 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 931 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
762#endif 932#endif
763#if EV_USE_POLL 933#if EV_USE_POLL
764 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 934 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
765#endif 935#endif
766#if EV_USE_SELECT 936#if EV_USE_SELECT
767 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 937 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
768#endif 938#endif
769 939
770 ev_init (&sigev, sigcb); 940 ev_init (&sigev, sigcb);
771 ev_set_priority (&sigev, EV_MAXPRI); 941 ev_set_priority (&sigev, EV_MAXPRI);
772 } 942 }
773} 943}
774 944
775void 945static void noinline
776loop_destroy (EV_P) 946loop_destroy (EV_P)
777{ 947{
778 int i; 948 int i;
779 949
780#if EV_USE_WIN32 950#if EV_USE_INOTIFY
781 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 951 if (fs_fd >= 0)
952 close (fs_fd);
953#endif
954
955 if (backend_fd >= 0)
956 close (backend_fd);
957
958#if EV_USE_PORT
959 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
782#endif 960#endif
783#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
784 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 962 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
785#endif 963#endif
786#if EV_USE_EPOLL 964#if EV_USE_EPOLL
787 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 965 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
788#endif 966#endif
789#if EV_USE_POLL 967#if EV_USE_POLL
790 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 968 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
791#endif 969#endif
792#if EV_USE_SELECT 970#if EV_USE_SELECT
793 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
794#endif 972#endif
795 973
796 for (i = NUMPRI; i--; ) 974 for (i = NUMPRI; i--; )
797 array_free (pending, [i]); 975 array_free (pending, [i]);
798 976
799 /* have to use the microsoft-never-gets-it-right macro */ 977 /* have to use the microsoft-never-gets-it-right macro */
800 array_free_microshit (fdchange); 978 array_free (fdchange, EMPTY0);
801 array_free_microshit (timer); 979 array_free (timer, EMPTY0);
802 array_free_microshit (periodic); 980#if EV_PERIODIC_ENABLE
803 array_free_microshit (idle); 981 array_free (periodic, EMPTY0);
804 array_free_microshit (prepare); 982#endif
805 array_free_microshit (check); 983 array_free (idle, EMPTY0);
984 array_free (prepare, EMPTY0);
985 array_free (check, EMPTY0);
806 986
807 method = 0; 987 backend = 0;
808} 988}
809 989
810static void 990void inline_size infy_fork (EV_P);
991
992void inline_size
811loop_fork (EV_P) 993loop_fork (EV_P)
812{ 994{
995#if EV_USE_PORT
996 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
997#endif
998#if EV_USE_KQUEUE
999 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
1000#endif
813#if EV_USE_EPOLL 1001#if EV_USE_EPOLL
814 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1002 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
815#endif 1003#endif
816#if EV_USE_KQUEUE 1004#if EV_USE_INOTIFY
817 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 1005 infy_fork (EV_A);
818#endif 1006#endif
819 1007
820 if (ev_is_active (&sigev)) 1008 if (ev_is_active (&sigev))
821 { 1009 {
822 /* default loop */ 1010 /* default loop */
835 postfork = 0; 1023 postfork = 0;
836} 1024}
837 1025
838#if EV_MULTIPLICITY 1026#if EV_MULTIPLICITY
839struct ev_loop * 1027struct ev_loop *
840ev_loop_new (int methods) 1028ev_loop_new (unsigned int flags)
841{ 1029{
842 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1030 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
843 1031
844 memset (loop, 0, sizeof (struct ev_loop)); 1032 memset (loop, 0, sizeof (struct ev_loop));
845 1033
846 loop_init (EV_A_ methods); 1034 loop_init (EV_A_ flags);
847 1035
848 if (ev_method (EV_A)) 1036 if (ev_backend (EV_A))
849 return loop; 1037 return loop;
850 1038
851 return 0; 1039 return 0;
852} 1040}
853 1041
866 1054
867#endif 1055#endif
868 1056
869#if EV_MULTIPLICITY 1057#if EV_MULTIPLICITY
870struct ev_loop * 1058struct ev_loop *
1059ev_default_loop_init (unsigned int flags)
871#else 1060#else
872int 1061int
1062ev_default_loop (unsigned int flags)
873#endif 1063#endif
874ev_default_loop (int methods)
875{ 1064{
876 if (sigpipe [0] == sigpipe [1]) 1065 if (sigpipe [0] == sigpipe [1])
877 if (pipe (sigpipe)) 1066 if (pipe (sigpipe))
878 return 0; 1067 return 0;
879 1068
880 if (!default_loop) 1069 if (!ev_default_loop_ptr)
881 { 1070 {
882#if EV_MULTIPLICITY 1071#if EV_MULTIPLICITY
883 struct ev_loop *loop = default_loop = &default_loop_struct; 1072 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
884#else 1073#else
885 default_loop = 1; 1074 ev_default_loop_ptr = 1;
886#endif 1075#endif
887 1076
888 loop_init (EV_A_ methods); 1077 loop_init (EV_A_ flags);
889 1078
890 if (ev_method (EV_A)) 1079 if (ev_backend (EV_A))
891 { 1080 {
892 siginit (EV_A); 1081 siginit (EV_A);
893 1082
894#ifndef WIN32 1083#ifndef _WIN32
895 ev_signal_init (&childev, childcb, SIGCHLD); 1084 ev_signal_init (&childev, childcb, SIGCHLD);
896 ev_set_priority (&childev, EV_MAXPRI); 1085 ev_set_priority (&childev, EV_MAXPRI);
897 ev_signal_start (EV_A_ &childev); 1086 ev_signal_start (EV_A_ &childev);
898 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1087 ev_unref (EV_A); /* child watcher should not keep loop alive */
899#endif 1088#endif
900 } 1089 }
901 else 1090 else
902 default_loop = 0; 1091 ev_default_loop_ptr = 0;
903 } 1092 }
904 1093
905 return default_loop; 1094 return ev_default_loop_ptr;
906} 1095}
907 1096
908void 1097void
909ev_default_destroy (void) 1098ev_default_destroy (void)
910{ 1099{
911#if EV_MULTIPLICITY 1100#if EV_MULTIPLICITY
912 struct ev_loop *loop = default_loop; 1101 struct ev_loop *loop = ev_default_loop_ptr;
913#endif 1102#endif
914 1103
915#ifndef WIN32 1104#ifndef _WIN32
916 ev_ref (EV_A); /* child watcher */ 1105 ev_ref (EV_A); /* child watcher */
917 ev_signal_stop (EV_A_ &childev); 1106 ev_signal_stop (EV_A_ &childev);
918#endif 1107#endif
919 1108
920 ev_ref (EV_A); /* signal watcher */ 1109 ev_ref (EV_A); /* signal watcher */
928 1117
929void 1118void
930ev_default_fork (void) 1119ev_default_fork (void)
931{ 1120{
932#if EV_MULTIPLICITY 1121#if EV_MULTIPLICITY
933 struct ev_loop *loop = default_loop; 1122 struct ev_loop *loop = ev_default_loop_ptr;
934#endif 1123#endif
935 1124
936 if (method) 1125 if (backend)
937 postfork = 1; 1126 postfork = 1;
938} 1127}
939 1128
940/*****************************************************************************/ 1129/*****************************************************************************/
941 1130
942static int 1131int inline_size
943any_pending (EV_P) 1132any_pending (EV_P)
944{ 1133{
945 int pri; 1134 int pri;
946 1135
947 for (pri = NUMPRI; pri--; ) 1136 for (pri = NUMPRI; pri--; )
949 return 1; 1138 return 1;
950 1139
951 return 0; 1140 return 0;
952} 1141}
953 1142
954static void 1143void inline_speed
955call_pending (EV_P) 1144call_pending (EV_P)
956{ 1145{
957 int pri; 1146 int pri;
958 1147
959 for (pri = NUMPRI; pri--; ) 1148 for (pri = NUMPRI; pri--; )
960 while (pendingcnt [pri]) 1149 while (pendingcnt [pri])
961 { 1150 {
962 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1151 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
963 1152
964 if (p->w) 1153 if (expect_true (p->w))
965 { 1154 {
1155 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1156
966 p->w->pending = 0; 1157 p->w->pending = 0;
967 EV_CB_INVOKE (p->w, p->events); 1158 EV_CB_INVOKE (p->w, p->events);
968 } 1159 }
969 } 1160 }
970} 1161}
971 1162
972static void 1163void inline_size
973timers_reify (EV_P) 1164timers_reify (EV_P)
974{ 1165{
975 while (timercnt && ((WT)timers [0])->at <= mn_now) 1166 while (timercnt && ((WT)timers [0])->at <= mn_now)
976 { 1167 {
977 struct ev_timer *w = timers [0]; 1168 ev_timer *w = timers [0];
978 1169
979 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1170 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
980 1171
981 /* first reschedule or stop timer */ 1172 /* first reschedule or stop timer */
982 if (w->repeat) 1173 if (w->repeat)
983 { 1174 {
984 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1175 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1176
985 ((WT)w)->at = mn_now + w->repeat; 1177 ((WT)w)->at += w->repeat;
1178 if (((WT)w)->at < mn_now)
1179 ((WT)w)->at = mn_now;
1180
986 downheap ((WT *)timers, timercnt, 0); 1181 downheap ((WT *)timers, timercnt, 0);
987 } 1182 }
988 else 1183 else
989 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1184 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
990 1185
991 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT); 1186 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
992 } 1187 }
993} 1188}
994 1189
995static void 1190#if EV_PERIODIC_ENABLE
1191void inline_size
996periodics_reify (EV_P) 1192periodics_reify (EV_P)
997{ 1193{
998 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now) 1194 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
999 { 1195 {
1000 struct ev_periodic *w = periodics [0]; 1196 ev_periodic *w = periodics [0];
1001 1197
1002 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1198 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
1003 1199
1004 /* first reschedule or stop timer */ 1200 /* first reschedule or stop timer */
1005 if (w->reschedule_cb) 1201 if (w->reschedule_cb)
1006 { 1202 {
1007 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001); 1203 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1008
1009 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now)); 1204 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1010 downheap ((WT *)periodics, periodiccnt, 0); 1205 downheap ((WT *)periodics, periodiccnt, 0);
1011 } 1206 }
1012 else if (w->interval) 1207 else if (w->interval)
1013 { 1208 {
1020 1215
1021 ev_feed_event (EV_A_ (W)w, EV_PERIODIC); 1216 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1022 } 1217 }
1023} 1218}
1024 1219
1025static void 1220static void noinline
1026periodics_reschedule (EV_P) 1221periodics_reschedule (EV_P)
1027{ 1222{
1028 int i; 1223 int i;
1029 1224
1030 /* adjust periodics after time jump */ 1225 /* adjust periodics after time jump */
1031 for (i = 0; i < periodiccnt; ++i) 1226 for (i = 0; i < periodiccnt; ++i)
1032 { 1227 {
1033 struct ev_periodic *w = periodics [i]; 1228 ev_periodic *w = periodics [i];
1034 1229
1035 if (w->reschedule_cb) 1230 if (w->reschedule_cb)
1036 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1231 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1037 else if (w->interval) 1232 else if (w->interval)
1038 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1233 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1040 1235
1041 /* now rebuild the heap */ 1236 /* now rebuild the heap */
1042 for (i = periodiccnt >> 1; i--; ) 1237 for (i = periodiccnt >> 1; i--; )
1043 downheap ((WT *)periodics, periodiccnt, i); 1238 downheap ((WT *)periodics, periodiccnt, i);
1044} 1239}
1240#endif
1045 1241
1046inline int 1242int inline_size
1047time_update_monotonic (EV_P) 1243time_update_monotonic (EV_P)
1048{ 1244{
1049 mn_now = get_clock (); 1245 mn_now = get_clock ();
1050 1246
1051 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1247 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1059 ev_rt_now = ev_time (); 1255 ev_rt_now = ev_time ();
1060 return 1; 1256 return 1;
1061 } 1257 }
1062} 1258}
1063 1259
1064static void 1260void inline_size
1065time_update (EV_P) 1261time_update (EV_P)
1066{ 1262{
1067 int i; 1263 int i;
1068 1264
1069#if EV_USE_MONOTONIC 1265#if EV_USE_MONOTONIC
1071 { 1267 {
1072 if (time_update_monotonic (EV_A)) 1268 if (time_update_monotonic (EV_A))
1073 { 1269 {
1074 ev_tstamp odiff = rtmn_diff; 1270 ev_tstamp odiff = rtmn_diff;
1075 1271
1076 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1272 /* loop a few times, before making important decisions.
1273 * on the choice of "4": one iteration isn't enough,
1274 * in case we get preempted during the calls to
1275 * ev_time and get_clock. a second call is almost guarenteed
1276 * to succeed in that case, though. and looping a few more times
1277 * doesn't hurt either as we only do this on time-jumps or
1278 * in the unlikely event of getting preempted here.
1279 */
1280 for (i = 4; --i; )
1077 { 1281 {
1078 rtmn_diff = ev_rt_now - mn_now; 1282 rtmn_diff = ev_rt_now - mn_now;
1079 1283
1080 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1284 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1081 return; /* all is well */ 1285 return; /* all is well */
1083 ev_rt_now = ev_time (); 1287 ev_rt_now = ev_time ();
1084 mn_now = get_clock (); 1288 mn_now = get_clock ();
1085 now_floor = mn_now; 1289 now_floor = mn_now;
1086 } 1290 }
1087 1291
1292# if EV_PERIODIC_ENABLE
1088 periodics_reschedule (EV_A); 1293 periodics_reschedule (EV_A);
1294# endif
1089 /* no timer adjustment, as the monotonic clock doesn't jump */ 1295 /* no timer adjustment, as the monotonic clock doesn't jump */
1090 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1296 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1091 } 1297 }
1092 } 1298 }
1093 else 1299 else
1095 { 1301 {
1096 ev_rt_now = ev_time (); 1302 ev_rt_now = ev_time ();
1097 1303
1098 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1304 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1099 { 1305 {
1306#if EV_PERIODIC_ENABLE
1100 periodics_reschedule (EV_A); 1307 periodics_reschedule (EV_A);
1308#endif
1101 1309
1102 /* adjust timers. this is easy, as the offset is the same for all */ 1310 /* adjust timers. this is easy, as the offset is the same for all */
1103 for (i = 0; i < timercnt; ++i) 1311 for (i = 0; i < timercnt; ++i)
1104 ((WT)timers [i])->at += ev_rt_now - mn_now; 1312 ((WT)timers [i])->at += ev_rt_now - mn_now;
1105 } 1313 }
1123static int loop_done; 1331static int loop_done;
1124 1332
1125void 1333void
1126ev_loop (EV_P_ int flags) 1334ev_loop (EV_P_ int flags)
1127{ 1335{
1128 double block;
1129 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1336 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1337 ? EVUNLOOP_ONE
1338 : EVUNLOOP_CANCEL;
1130 1339
1131 do 1340 while (activecnt)
1132 { 1341 {
1342 /* we might have forked, so reify kernel state if necessary */
1343 #if EV_FORK_ENABLE
1344 if (expect_false (postfork))
1345 if (forkcnt)
1346 {
1347 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1348 call_pending (EV_A);
1349 }
1350 #endif
1351
1133 /* queue check watchers (and execute them) */ 1352 /* queue check watchers (and execute them) */
1134 if (expect_false (preparecnt)) 1353 if (expect_false (preparecnt))
1135 { 1354 {
1136 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1355 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1137 call_pending (EV_A); 1356 call_pending (EV_A);
1143 1362
1144 /* update fd-related kernel structures */ 1363 /* update fd-related kernel structures */
1145 fd_reify (EV_A); 1364 fd_reify (EV_A);
1146 1365
1147 /* calculate blocking time */ 1366 /* calculate blocking time */
1367 {
1368 double block;
1148 1369
1149 /* we only need this for !monotonic clock or timers, but as we basically 1370 if (flags & EVLOOP_NONBLOCK || idlecnt)
1150 always have timers, we just calculate it always */ 1371 block = 0.; /* do not block at all */
1372 else
1373 {
1374 /* update time to cancel out callback processing overhead */
1151#if EV_USE_MONOTONIC 1375#if EV_USE_MONOTONIC
1152 if (expect_true (have_monotonic)) 1376 if (expect_true (have_monotonic))
1153 time_update_monotonic (EV_A); 1377 time_update_monotonic (EV_A);
1154 else 1378 else
1155#endif 1379#endif
1156 { 1380 {
1157 ev_rt_now = ev_time (); 1381 ev_rt_now = ev_time ();
1158 mn_now = ev_rt_now; 1382 mn_now = ev_rt_now;
1159 } 1383 }
1160 1384
1161 if (flags & EVLOOP_NONBLOCK || idlecnt)
1162 block = 0.;
1163 else
1164 {
1165 block = MAX_BLOCKTIME; 1385 block = MAX_BLOCKTIME;
1166 1386
1167 if (timercnt) 1387 if (timercnt)
1168 { 1388 {
1169 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1389 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1170 if (block > to) block = to; 1390 if (block > to) block = to;
1171 } 1391 }
1172 1392
1393#if EV_PERIODIC_ENABLE
1173 if (periodiccnt) 1394 if (periodiccnt)
1174 { 1395 {
1175 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge; 1396 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1176 if (block > to) block = to; 1397 if (block > to) block = to;
1177 } 1398 }
1399#endif
1178 1400
1179 if (block < 0.) block = 0.; 1401 if (expect_false (block < 0.)) block = 0.;
1180 } 1402 }
1181 1403
1182 method_poll (EV_A_ block); 1404 backend_poll (EV_A_ block);
1405 }
1183 1406
1184 /* update ev_rt_now, do magic */ 1407 /* update ev_rt_now, do magic */
1185 time_update (EV_A); 1408 time_update (EV_A);
1186 1409
1187 /* queue pending timers and reschedule them */ 1410 /* queue pending timers and reschedule them */
1188 timers_reify (EV_A); /* relative timers called last */ 1411 timers_reify (EV_A); /* relative timers called last */
1412#if EV_PERIODIC_ENABLE
1189 periodics_reify (EV_A); /* absolute timers called first */ 1413 periodics_reify (EV_A); /* absolute timers called first */
1414#endif
1190 1415
1191 /* queue idle watchers unless io or timers are pending */ 1416 /* queue idle watchers unless other events are pending */
1192 if (idlecnt && !any_pending (EV_A)) 1417 if (idlecnt && !any_pending (EV_A))
1193 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1418 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1194 1419
1195 /* queue check watchers, to be executed first */ 1420 /* queue check watchers, to be executed first */
1196 if (checkcnt) 1421 if (expect_false (checkcnt))
1197 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1422 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1198 1423
1199 call_pending (EV_A); 1424 call_pending (EV_A);
1200 }
1201 while (activecnt && !loop_done);
1202 1425
1203 if (loop_done != 2) 1426 if (expect_false (loop_done))
1204 loop_done = 0; 1427 break;
1428 }
1429
1430 if (loop_done == EVUNLOOP_ONE)
1431 loop_done = EVUNLOOP_CANCEL;
1205} 1432}
1206 1433
1207void 1434void
1208ev_unloop (EV_P_ int how) 1435ev_unloop (EV_P_ int how)
1209{ 1436{
1210 loop_done = how; 1437 loop_done = how;
1211} 1438}
1212 1439
1213/*****************************************************************************/ 1440/*****************************************************************************/
1214 1441
1215inline void 1442void inline_size
1216wlist_add (WL *head, WL elem) 1443wlist_add (WL *head, WL elem)
1217{ 1444{
1218 elem->next = *head; 1445 elem->next = *head;
1219 *head = elem; 1446 *head = elem;
1220} 1447}
1221 1448
1222inline void 1449void inline_size
1223wlist_del (WL *head, WL elem) 1450wlist_del (WL *head, WL elem)
1224{ 1451{
1225 while (*head) 1452 while (*head)
1226 { 1453 {
1227 if (*head == elem) 1454 if (*head == elem)
1232 1459
1233 head = &(*head)->next; 1460 head = &(*head)->next;
1234 } 1461 }
1235} 1462}
1236 1463
1237inline void 1464void inline_speed
1238ev_clear_pending (EV_P_ W w) 1465ev_clear_pending (EV_P_ W w)
1239{ 1466{
1240 if (w->pending) 1467 if (w->pending)
1241 { 1468 {
1242 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1469 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1243 w->pending = 0; 1470 w->pending = 0;
1244 } 1471 }
1245} 1472}
1246 1473
1247inline void 1474void inline_speed
1248ev_start (EV_P_ W w, int active) 1475ev_start (EV_P_ W w, int active)
1249{ 1476{
1250 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1477 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1251 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 1478 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1252 1479
1253 w->active = active; 1480 w->active = active;
1254 ev_ref (EV_A); 1481 ev_ref (EV_A);
1255} 1482}
1256 1483
1257inline void 1484void inline_size
1258ev_stop (EV_P_ W w) 1485ev_stop (EV_P_ W w)
1259{ 1486{
1260 ev_unref (EV_A); 1487 ev_unref (EV_A);
1261 w->active = 0; 1488 w->active = 0;
1262} 1489}
1263 1490
1264/*****************************************************************************/ 1491/*****************************************************************************/
1265 1492
1266void 1493void
1267ev_io_start (EV_P_ struct ev_io *w) 1494ev_io_start (EV_P_ ev_io *w)
1268{ 1495{
1269 int fd = w->fd; 1496 int fd = w->fd;
1270 1497
1271 if (ev_is_active (w)) 1498 if (expect_false (ev_is_active (w)))
1272 return; 1499 return;
1273 1500
1274 assert (("ev_io_start called with negative fd", fd >= 0)); 1501 assert (("ev_io_start called with negative fd", fd >= 0));
1275 1502
1276 ev_start (EV_A_ (W)w, 1); 1503 ev_start (EV_A_ (W)w, 1);
1279 1506
1280 fd_change (EV_A_ fd); 1507 fd_change (EV_A_ fd);
1281} 1508}
1282 1509
1283void 1510void
1284ev_io_stop (EV_P_ struct ev_io *w) 1511ev_io_stop (EV_P_ ev_io *w)
1285{ 1512{
1286 ev_clear_pending (EV_A_ (W)w); 1513 ev_clear_pending (EV_A_ (W)w);
1287 if (!ev_is_active (w)) 1514 if (expect_false (!ev_is_active (w)))
1288 return; 1515 return;
1516
1517 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1289 1518
1290 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1519 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1291 ev_stop (EV_A_ (W)w); 1520 ev_stop (EV_A_ (W)w);
1292 1521
1293 fd_change (EV_A_ w->fd); 1522 fd_change (EV_A_ w->fd);
1294} 1523}
1295 1524
1296void 1525void
1297ev_timer_start (EV_P_ struct ev_timer *w) 1526ev_timer_start (EV_P_ ev_timer *w)
1298{ 1527{
1299 if (ev_is_active (w)) 1528 if (expect_false (ev_is_active (w)))
1300 return; 1529 return;
1301 1530
1302 ((WT)w)->at += mn_now; 1531 ((WT)w)->at += mn_now;
1303 1532
1304 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1533 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1305 1534
1306 ev_start (EV_A_ (W)w, ++timercnt); 1535 ev_start (EV_A_ (W)w, ++timercnt);
1307 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void)); 1536 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1308 timers [timercnt - 1] = w; 1537 timers [timercnt - 1] = w;
1309 upheap ((WT *)timers, timercnt - 1); 1538 upheap ((WT *)timers, timercnt - 1);
1310 1539
1540 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1541}
1542
1543void
1544ev_timer_stop (EV_P_ ev_timer *w)
1545{
1546 ev_clear_pending (EV_A_ (W)w);
1547 if (expect_false (!ev_is_active (w)))
1548 return;
1549
1311 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1550 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1312}
1313 1551
1314void 1552 {
1315ev_timer_stop (EV_P_ struct ev_timer *w) 1553 int active = ((W)w)->active;
1316{
1317 ev_clear_pending (EV_A_ (W)w);
1318 if (!ev_is_active (w))
1319 return;
1320 1554
1321 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1555 if (expect_true (--active < --timercnt))
1322
1323 if (((W)w)->active < timercnt--)
1324 { 1556 {
1325 timers [((W)w)->active - 1] = timers [timercnt]; 1557 timers [active] = timers [timercnt];
1326 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1558 adjustheap ((WT *)timers, timercnt, active);
1327 } 1559 }
1560 }
1328 1561
1329 ((WT)w)->at = w->repeat; 1562 ((WT)w)->at -= mn_now;
1330 1563
1331 ev_stop (EV_A_ (W)w); 1564 ev_stop (EV_A_ (W)w);
1332} 1565}
1333 1566
1334void 1567void
1335ev_timer_again (EV_P_ struct ev_timer *w) 1568ev_timer_again (EV_P_ ev_timer *w)
1336{ 1569{
1337 if (ev_is_active (w)) 1570 if (ev_is_active (w))
1338 { 1571 {
1339 if (w->repeat) 1572 if (w->repeat)
1573 {
1574 ((WT)w)->at = mn_now + w->repeat;
1340 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat); 1575 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1576 }
1341 else 1577 else
1342 ev_timer_stop (EV_A_ w); 1578 ev_timer_stop (EV_A_ w);
1343 } 1579 }
1344 else if (w->repeat) 1580 else if (w->repeat)
1581 {
1582 w->at = w->repeat;
1345 ev_timer_start (EV_A_ w); 1583 ev_timer_start (EV_A_ w);
1584 }
1346} 1585}
1347 1586
1587#if EV_PERIODIC_ENABLE
1348void 1588void
1349ev_periodic_start (EV_P_ struct ev_periodic *w) 1589ev_periodic_start (EV_P_ ev_periodic *w)
1350{ 1590{
1351 if (ev_is_active (w)) 1591 if (expect_false (ev_is_active (w)))
1352 return; 1592 return;
1353 1593
1354 if (w->reschedule_cb) 1594 if (w->reschedule_cb)
1355 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now); 1595 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1356 else if (w->interval) 1596 else if (w->interval)
1359 /* this formula differs from the one in periodic_reify because we do not always round up */ 1599 /* this formula differs from the one in periodic_reify because we do not always round up */
1360 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval; 1600 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1361 } 1601 }
1362 1602
1363 ev_start (EV_A_ (W)w, ++periodiccnt); 1603 ev_start (EV_A_ (W)w, ++periodiccnt);
1364 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void)); 1604 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1365 periodics [periodiccnt - 1] = w; 1605 periodics [periodiccnt - 1] = w;
1366 upheap ((WT *)periodics, periodiccnt - 1); 1606 upheap ((WT *)periodics, periodiccnt - 1);
1367 1607
1608 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1609}
1610
1611void
1612ev_periodic_stop (EV_P_ ev_periodic *w)
1613{
1614 ev_clear_pending (EV_A_ (W)w);
1615 if (expect_false (!ev_is_active (w)))
1616 return;
1617
1368 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1618 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1369}
1370 1619
1371void 1620 {
1372ev_periodic_stop (EV_P_ struct ev_periodic *w) 1621 int active = ((W)w)->active;
1373{
1374 ev_clear_pending (EV_A_ (W)w);
1375 if (!ev_is_active (w))
1376 return;
1377 1622
1378 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1623 if (expect_true (--active < --periodiccnt))
1379
1380 if (((W)w)->active < periodiccnt--)
1381 { 1624 {
1382 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1625 periodics [active] = periodics [periodiccnt];
1383 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1626 adjustheap ((WT *)periodics, periodiccnt, active);
1384 } 1627 }
1628 }
1385 1629
1386 ev_stop (EV_A_ (W)w); 1630 ev_stop (EV_A_ (W)w);
1387} 1631}
1388 1632
1389void 1633void
1390ev_periodic_again (EV_P_ struct ev_periodic *w) 1634ev_periodic_again (EV_P_ ev_periodic *w)
1391{ 1635{
1392 /* TODO: use adjustheap and recalculation */ 1636 /* TODO: use adjustheap and recalculation */
1393 ev_periodic_stop (EV_A_ w); 1637 ev_periodic_stop (EV_A_ w);
1394 ev_periodic_start (EV_A_ w); 1638 ev_periodic_start (EV_A_ w);
1395} 1639}
1396 1640#endif
1397void
1398ev_idle_start (EV_P_ struct ev_idle *w)
1399{
1400 if (ev_is_active (w))
1401 return;
1402
1403 ev_start (EV_A_ (W)w, ++idlecnt);
1404 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1405 idles [idlecnt - 1] = w;
1406}
1407
1408void
1409ev_idle_stop (EV_P_ struct ev_idle *w)
1410{
1411 ev_clear_pending (EV_A_ (W)w);
1412 if (ev_is_active (w))
1413 return;
1414
1415 idles [((W)w)->active - 1] = idles [--idlecnt];
1416 ev_stop (EV_A_ (W)w);
1417}
1418
1419void
1420ev_prepare_start (EV_P_ struct ev_prepare *w)
1421{
1422 if (ev_is_active (w))
1423 return;
1424
1425 ev_start (EV_A_ (W)w, ++preparecnt);
1426 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1427 prepares [preparecnt - 1] = w;
1428}
1429
1430void
1431ev_prepare_stop (EV_P_ struct ev_prepare *w)
1432{
1433 ev_clear_pending (EV_A_ (W)w);
1434 if (ev_is_active (w))
1435 return;
1436
1437 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1438 ev_stop (EV_A_ (W)w);
1439}
1440
1441void
1442ev_check_start (EV_P_ struct ev_check *w)
1443{
1444 if (ev_is_active (w))
1445 return;
1446
1447 ev_start (EV_A_ (W)w, ++checkcnt);
1448 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1449 checks [checkcnt - 1] = w;
1450}
1451
1452void
1453ev_check_stop (EV_P_ struct ev_check *w)
1454{
1455 ev_clear_pending (EV_A_ (W)w);
1456 if (ev_is_active (w))
1457 return;
1458
1459 checks [((W)w)->active - 1] = checks [--checkcnt];
1460 ev_stop (EV_A_ (W)w);
1461}
1462 1641
1463#ifndef SA_RESTART 1642#ifndef SA_RESTART
1464# define SA_RESTART 0 1643# define SA_RESTART 0
1465#endif 1644#endif
1466 1645
1467void 1646void
1468ev_signal_start (EV_P_ struct ev_signal *w) 1647ev_signal_start (EV_P_ ev_signal *w)
1469{ 1648{
1470#if EV_MULTIPLICITY 1649#if EV_MULTIPLICITY
1471 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1650 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1472#endif 1651#endif
1473 if (ev_is_active (w)) 1652 if (expect_false (ev_is_active (w)))
1474 return; 1653 return;
1475 1654
1476 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1655 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1477 1656
1478 ev_start (EV_A_ (W)w, 1); 1657 ev_start (EV_A_ (W)w, 1);
1479 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init); 1658 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1480 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1659 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1481 1660
1482 if (!((WL)w)->next) 1661 if (!((WL)w)->next)
1483 { 1662 {
1484#if WIN32 1663#if _WIN32
1485 signal (w->signum, sighandler); 1664 signal (w->signum, sighandler);
1486#else 1665#else
1487 struct sigaction sa; 1666 struct sigaction sa;
1488 sa.sa_handler = sighandler; 1667 sa.sa_handler = sighandler;
1489 sigfillset (&sa.sa_mask); 1668 sigfillset (&sa.sa_mask);
1492#endif 1671#endif
1493 } 1672 }
1494} 1673}
1495 1674
1496void 1675void
1497ev_signal_stop (EV_P_ struct ev_signal *w) 1676ev_signal_stop (EV_P_ ev_signal *w)
1498{ 1677{
1499 ev_clear_pending (EV_A_ (W)w); 1678 ev_clear_pending (EV_A_ (W)w);
1500 if (!ev_is_active (w)) 1679 if (expect_false (!ev_is_active (w)))
1501 return; 1680 return;
1502 1681
1503 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1682 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1504 ev_stop (EV_A_ (W)w); 1683 ev_stop (EV_A_ (W)w);
1505 1684
1506 if (!signals [w->signum - 1].head) 1685 if (!signals [w->signum - 1].head)
1507 signal (w->signum, SIG_DFL); 1686 signal (w->signum, SIG_DFL);
1508} 1687}
1509 1688
1510void 1689void
1511ev_child_start (EV_P_ struct ev_child *w) 1690ev_child_start (EV_P_ ev_child *w)
1512{ 1691{
1513#if EV_MULTIPLICITY 1692#if EV_MULTIPLICITY
1514 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1693 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1515#endif 1694#endif
1516 if (ev_is_active (w)) 1695 if (expect_false (ev_is_active (w)))
1517 return; 1696 return;
1518 1697
1519 ev_start (EV_A_ (W)w, 1); 1698 ev_start (EV_A_ (W)w, 1);
1520 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1699 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1521} 1700}
1522 1701
1523void 1702void
1524ev_child_stop (EV_P_ struct ev_child *w) 1703ev_child_stop (EV_P_ ev_child *w)
1525{ 1704{
1526 ev_clear_pending (EV_A_ (W)w); 1705 ev_clear_pending (EV_A_ (W)w);
1527 if (ev_is_active (w)) 1706 if (expect_false (!ev_is_active (w)))
1528 return; 1707 return;
1529 1708
1530 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1709 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1531 ev_stop (EV_A_ (W)w); 1710 ev_stop (EV_A_ (W)w);
1532} 1711}
1533 1712
1713#if EV_STAT_ENABLE
1714
1715# ifdef _WIN32
1716# undef lstat
1717# define lstat(a,b) _stati64 (a,b)
1718# endif
1719
1720#define DEF_STAT_INTERVAL 5.0074891
1721#define MIN_STAT_INTERVAL 0.1074891
1722
1723void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1724
1725#if EV_USE_INOTIFY
1726# define EV_INOTIFY_BUFSIZE 8192
1727
1728static void noinline
1729infy_add (EV_P_ ev_stat *w)
1730{
1731 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);
1732
1733 if (w->wd < 0)
1734 {
1735 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1736
1737 /* monitor some parent directory for speedup hints */
1738 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1739 {
1740 char path [4096];
1741 strcpy (path, w->path);
1742
1743 do
1744 {
1745 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1746 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1747
1748 char *pend = strrchr (path, '/');
1749
1750 if (!pend)
1751 break; /* whoops, no '/', complain to your admin */
1752
1753 *pend = 0;
1754 w->wd = inotify_add_watch (fs_fd, path, mask);
1755 }
1756 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1757 }
1758 }
1759 else
1760 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1761
1762 if (w->wd >= 0)
1763 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1764}
1765
1766static void noinline
1767infy_del (EV_P_ ev_stat *w)
1768{
1769 int slot;
1770 int wd = w->wd;
1771
1772 if (wd < 0)
1773 return;
1774
1775 w->wd = -2;
1776 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1777 wlist_del (&fs_hash [slot].head, (WL)w);
1778
1779 /* remove this watcher, if others are watching it, they will rearm */
1780 inotify_rm_watch (fs_fd, wd);
1781}
1782
1783static void noinline
1784infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1785{
1786 if (slot < 0)
1787 /* overflow, need to check for all hahs slots */
1788 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1789 infy_wd (EV_A_ slot, wd, ev);
1790 else
1791 {
1792 WL w_;
1793
1794 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1795 {
1796 ev_stat *w = (ev_stat *)w_;
1797 w_ = w_->next; /* lets us remove this watcher and all before it */
1798
1799 if (w->wd == wd || wd == -1)
1800 {
1801 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1802 {
1803 w->wd = -1;
1804 infy_add (EV_A_ w); /* re-add, no matter what */
1805 }
1806
1807 stat_timer_cb (EV_A_ &w->timer, 0);
1808 }
1809 }
1810 }
1811}
1812
1813static void
1814infy_cb (EV_P_ ev_io *w, int revents)
1815{
1816 char buf [EV_INOTIFY_BUFSIZE];
1817 struct inotify_event *ev = (struct inotify_event *)buf;
1818 int ofs;
1819 int len = read (fs_fd, buf, sizeof (buf));
1820
1821 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1822 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1823}
1824
1825void inline_size
1826infy_init (EV_P)
1827{
1828 if (fs_fd != -2)
1829 return;
1830
1831 fs_fd = inotify_init ();
1832
1833 if (fs_fd >= 0)
1834 {
1835 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1836 ev_set_priority (&fs_w, EV_MAXPRI);
1837 ev_io_start (EV_A_ &fs_w);
1838 }
1839}
1840
1841void inline_size
1842infy_fork (EV_P)
1843{
1844 int slot;
1845
1846 if (fs_fd < 0)
1847 return;
1848
1849 close (fs_fd);
1850 fs_fd = inotify_init ();
1851
1852 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1853 {
1854 WL w_ = fs_hash [slot].head;
1855 fs_hash [slot].head = 0;
1856
1857 while (w_)
1858 {
1859 ev_stat *w = (ev_stat *)w_;
1860 w_ = w_->next; /* lets us add this watcher */
1861
1862 w->wd = -1;
1863
1864 if (fs_fd >= 0)
1865 infy_add (EV_A_ w); /* re-add, no matter what */
1866 else
1867 ev_timer_start (EV_A_ &w->timer);
1868 }
1869
1870 }
1871}
1872
1873#endif
1874
1875void
1876ev_stat_stat (EV_P_ ev_stat *w)
1877{
1878 if (lstat (w->path, &w->attr) < 0)
1879 w->attr.st_nlink = 0;
1880 else if (!w->attr.st_nlink)
1881 w->attr.st_nlink = 1;
1882}
1883
1884void noinline
1885stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1886{
1887 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1888
1889 /* we copy this here each the time so that */
1890 /* prev has the old value when the callback gets invoked */
1891 w->prev = w->attr;
1892 ev_stat_stat (EV_A_ w);
1893
1894 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1895 {
1896 #if EV_USE_INOTIFY
1897 infy_del (EV_A_ w);
1898 infy_add (EV_A_ w);
1899 ev_stat_stat (EV_A_ w); /* avoid race... */
1900 #endif
1901
1902 ev_feed_event (EV_A_ w, EV_STAT);
1903 }
1904}
1905
1906void
1907ev_stat_start (EV_P_ ev_stat *w)
1908{
1909 if (expect_false (ev_is_active (w)))
1910 return;
1911
1912 /* since we use memcmp, we need to clear any padding data etc. */
1913 memset (&w->prev, 0, sizeof (ev_statdata));
1914 memset (&w->attr, 0, sizeof (ev_statdata));
1915
1916 ev_stat_stat (EV_A_ w);
1917
1918 if (w->interval < MIN_STAT_INTERVAL)
1919 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1920
1921 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1922 ev_set_priority (&w->timer, ev_priority (w));
1923
1924#if EV_USE_INOTIFY
1925 infy_init (EV_A);
1926
1927 if (fs_fd >= 0)
1928 infy_add (EV_A_ w);
1929 else
1930#endif
1931 ev_timer_start (EV_A_ &w->timer);
1932
1933 ev_start (EV_A_ (W)w, 1);
1934}
1935
1936void
1937ev_stat_stop (EV_P_ ev_stat *w)
1938{
1939 ev_clear_pending (EV_A_ (W)w);
1940 if (expect_false (!ev_is_active (w)))
1941 return;
1942
1943#if EV_USE_INOTIFY
1944 infy_del (EV_A_ w);
1945#endif
1946 ev_timer_stop (EV_A_ &w->timer);
1947
1948 ev_stop (EV_A_ (W)w);
1949}
1950#endif
1951
1952void
1953ev_idle_start (EV_P_ ev_idle *w)
1954{
1955 if (expect_false (ev_is_active (w)))
1956 return;
1957
1958 ev_start (EV_A_ (W)w, ++idlecnt);
1959 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1960 idles [idlecnt - 1] = w;
1961}
1962
1963void
1964ev_idle_stop (EV_P_ ev_idle *w)
1965{
1966 ev_clear_pending (EV_A_ (W)w);
1967 if (expect_false (!ev_is_active (w)))
1968 return;
1969
1970 {
1971 int active = ((W)w)->active;
1972 idles [active - 1] = idles [--idlecnt];
1973 ((W)idles [active - 1])->active = active;
1974 }
1975
1976 ev_stop (EV_A_ (W)w);
1977}
1978
1979void
1980ev_prepare_start (EV_P_ ev_prepare *w)
1981{
1982 if (expect_false (ev_is_active (w)))
1983 return;
1984
1985 ev_start (EV_A_ (W)w, ++preparecnt);
1986 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1987 prepares [preparecnt - 1] = w;
1988}
1989
1990void
1991ev_prepare_stop (EV_P_ ev_prepare *w)
1992{
1993 ev_clear_pending (EV_A_ (W)w);
1994 if (expect_false (!ev_is_active (w)))
1995 return;
1996
1997 {
1998 int active = ((W)w)->active;
1999 prepares [active - 1] = prepares [--preparecnt];
2000 ((W)prepares [active - 1])->active = active;
2001 }
2002
2003 ev_stop (EV_A_ (W)w);
2004}
2005
2006void
2007ev_check_start (EV_P_ ev_check *w)
2008{
2009 if (expect_false (ev_is_active (w)))
2010 return;
2011
2012 ev_start (EV_A_ (W)w, ++checkcnt);
2013 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
2014 checks [checkcnt - 1] = w;
2015}
2016
2017void
2018ev_check_stop (EV_P_ ev_check *w)
2019{
2020 ev_clear_pending (EV_A_ (W)w);
2021 if (expect_false (!ev_is_active (w)))
2022 return;
2023
2024 {
2025 int active = ((W)w)->active;
2026 checks [active - 1] = checks [--checkcnt];
2027 ((W)checks [active - 1])->active = active;
2028 }
2029
2030 ev_stop (EV_A_ (W)w);
2031}
2032
2033#if EV_EMBED_ENABLE
2034void noinline
2035ev_embed_sweep (EV_P_ ev_embed *w)
2036{
2037 ev_loop (w->loop, EVLOOP_NONBLOCK);
2038}
2039
2040static void
2041embed_cb (EV_P_ ev_io *io, int revents)
2042{
2043 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2044
2045 if (ev_cb (w))
2046 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2047 else
2048 ev_embed_sweep (loop, w);
2049}
2050
2051void
2052ev_embed_start (EV_P_ ev_embed *w)
2053{
2054 if (expect_false (ev_is_active (w)))
2055 return;
2056
2057 {
2058 struct ev_loop *loop = w->loop;
2059 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2060 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2061 }
2062
2063 ev_set_priority (&w->io, ev_priority (w));
2064 ev_io_start (EV_A_ &w->io);
2065
2066 ev_start (EV_A_ (W)w, 1);
2067}
2068
2069void
2070ev_embed_stop (EV_P_ ev_embed *w)
2071{
2072 ev_clear_pending (EV_A_ (W)w);
2073 if (expect_false (!ev_is_active (w)))
2074 return;
2075
2076 ev_io_stop (EV_A_ &w->io);
2077
2078 ev_stop (EV_A_ (W)w);
2079}
2080#endif
2081
2082#if EV_FORK_ENABLE
2083void
2084ev_fork_start (EV_P_ ev_fork *w)
2085{
2086 if (expect_false (ev_is_active (w)))
2087 return;
2088
2089 ev_start (EV_A_ (W)w, ++forkcnt);
2090 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2091 forks [forkcnt - 1] = w;
2092}
2093
2094void
2095ev_fork_stop (EV_P_ ev_fork *w)
2096{
2097 ev_clear_pending (EV_A_ (W)w);
2098 if (expect_false (!ev_is_active (w)))
2099 return;
2100
2101 {
2102 int active = ((W)w)->active;
2103 forks [active - 1] = forks [--forkcnt];
2104 ((W)forks [active - 1])->active = active;
2105 }
2106
2107 ev_stop (EV_A_ (W)w);
2108}
2109#endif
2110
1534/*****************************************************************************/ 2111/*****************************************************************************/
1535 2112
1536struct ev_once 2113struct ev_once
1537{ 2114{
1538 struct ev_io io; 2115 ev_io io;
1539 struct ev_timer to; 2116 ev_timer to;
1540 void (*cb)(int revents, void *arg); 2117 void (*cb)(int revents, void *arg);
1541 void *arg; 2118 void *arg;
1542}; 2119};
1543 2120
1544static void 2121static void
1553 2130
1554 cb (revents, arg); 2131 cb (revents, arg);
1555} 2132}
1556 2133
1557static void 2134static void
1558once_cb_io (EV_P_ struct ev_io *w, int revents) 2135once_cb_io (EV_P_ ev_io *w, int revents)
1559{ 2136{
1560 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 2137 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1561} 2138}
1562 2139
1563static void 2140static void
1564once_cb_to (EV_P_ struct ev_timer *w, int revents) 2141once_cb_to (EV_P_ ev_timer *w, int revents)
1565{ 2142{
1566 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 2143 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1567} 2144}
1568 2145
1569void 2146void
1570ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 2147ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1571{ 2148{
1572 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once)); 2149 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1573 2150
1574 if (!once) 2151 if (expect_false (!once))
2152 {
1575 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 2153 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1576 else 2154 return;
1577 { 2155 }
2156
1578 once->cb = cb; 2157 once->cb = cb;
1579 once->arg = arg; 2158 once->arg = arg;
1580 2159
1581 ev_init (&once->io, once_cb_io); 2160 ev_init (&once->io, once_cb_io);
1582 if (fd >= 0) 2161 if (fd >= 0)
1583 { 2162 {
1584 ev_io_set (&once->io, fd, events); 2163 ev_io_set (&once->io, fd, events);
1585 ev_io_start (EV_A_ &once->io); 2164 ev_io_start (EV_A_ &once->io);
1586 } 2165 }
1587 2166
1588 ev_init (&once->to, once_cb_to); 2167 ev_init (&once->to, once_cb_to);
1589 if (timeout >= 0.) 2168 if (timeout >= 0.)
1590 { 2169 {
1591 ev_timer_set (&once->to, timeout, 0.); 2170 ev_timer_set (&once->to, timeout, 0.);
1592 ev_timer_start (EV_A_ &once->to); 2171 ev_timer_start (EV_A_ &once->to);
1593 }
1594 } 2172 }
1595} 2173}
1596 2174
2175#ifdef __cplusplus
2176}
2177#endif
2178

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines