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

Comparing libev/ev.c (file contents):
Revision 1.29 by root, Thu Nov 1 08:10:03 2007 UTC vs.
Revision 1.103 by root, Mon Nov 12 00:31:08 2007 UTC

1/* 1/*
2 * libev event processing core, watcher management
3 *
2 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
3 * All rights reserved. 5 * All rights reserved.
4 * 6 *
5 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 8 * modification, are permitted provided that the following conditions are
24 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26 * (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
27 * 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.
28 */ 30 */
29#if EV_USE_CONFIG_H 31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
36#ifndef EV_STANDALONE
30# include "config.h" 37# include "config.h"
38
39# if HAVE_CLOCK_GETTIME
40# ifndef EV_USE_MONOTONIC
41# define EV_USE_MONOTONIC 1
42# endif
43# ifndef EV_USE_REALTIME
44# define EV_USE_REALTIME 1
45# endif
46# endif
47
48# if HAVE_SELECT && HAVE_SYS_SELECT_H && !defined (EV_USE_SELECT)
49# define EV_USE_SELECT 1
50# endif
51
52# if HAVE_POLL && HAVE_POLL_H && !defined (EV_USE_POLL)
53# define EV_USE_POLL 1
54# endif
55
56# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H && !defined (EV_USE_EPOLL)
57# define EV_USE_EPOLL 1
58# endif
59
60# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H && !defined (EV_USE_KQUEUE)
61# define EV_USE_KQUEUE 1
62# endif
63
31#endif 64#endif
32 65
33#include <math.h> 66#include <math.h>
34#include <stdlib.h> 67#include <stdlib.h>
35#include <unistd.h>
36#include <fcntl.h> 68#include <fcntl.h>
37#include <signal.h>
38#include <stddef.h> 69#include <stddef.h>
39 70
40#include <stdio.h> 71#include <stdio.h>
41 72
42#include <assert.h> 73#include <assert.h>
43#include <errno.h> 74#include <errno.h>
44#include <sys/types.h> 75#include <sys/types.h>
45#include <sys/wait.h>
46#include <sys/time.h>
47#include <time.h> 76#include <time.h>
48 77
78#include <signal.h>
79
80#ifndef _WIN32
81# include <unistd.h>
82# include <sys/time.h>
83# include <sys/wait.h>
84#else
85# define WIN32_LEAN_AND_MEAN
86# include <windows.h>
87# ifndef EV_SELECT_IS_WINSOCKET
88# define EV_SELECT_IS_WINSOCKET 1
89# endif
90#endif
91
92/**/
93
49#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
50# ifdef CLOCK_MONOTONIC
51# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
52# endif
53#endif 96#endif
54 97
55#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
56# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
57#endif 100#endif
58 101
102#ifndef EV_USE_POLL
103# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
104#endif
105
59#ifndef EV_USE_EPOLL 106#ifndef EV_USE_EPOLL
60# define EV_USE_EPOLL 0 107# define EV_USE_EPOLL 0
61#endif 108#endif
62 109
110#ifndef EV_USE_KQUEUE
111# define EV_USE_KQUEUE 0
112#endif
113
63#ifndef EV_USE_REALTIME 114#ifndef EV_USE_REALTIME
64# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 115# define EV_USE_REALTIME 1
65#endif 116#endif
117
118/**/
119
120#ifndef CLOCK_MONOTONIC
121# undef EV_USE_MONOTONIC
122# define EV_USE_MONOTONIC 0
123#endif
124
125#ifndef CLOCK_REALTIME
126# undef EV_USE_REALTIME
127# define EV_USE_REALTIME 0
128#endif
129
130#if EV_SELECT_IS_WINSOCKET
131# include <winsock.h>
132#endif
133
134/**/
66 135
67#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 136#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
68#define MAX_BLOCKTIME 59.731 137#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
69#define PID_HASHSIZE 16 /* size of pid hahs table, must be power of two */ 138#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
139/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
70 140
141#ifdef EV_H
142# include EV_H
143#else
71#include "ev.h" 144# include "ev.h"
145#endif
146
147#if __GNUC__ >= 3
148# define expect(expr,value) __builtin_expect ((expr),(value))
149# define inline inline
150#else
151# define expect(expr,value) (expr)
152# define inline static
153#endif
154
155#define expect_false(expr) expect ((expr) != 0, 0)
156#define expect_true(expr) expect ((expr) != 0, 1)
157
158#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
159#define ABSPRI(w) ((w)->priority - EV_MINPRI)
160
161#define EMPTY /* required for microsofts broken pseudo-c compiler */
72 162
73typedef struct ev_watcher *W; 163typedef struct ev_watcher *W;
74typedef struct ev_watcher_list *WL; 164typedef struct ev_watcher_list *WL;
75typedef struct ev_watcher_time *WT; 165typedef struct ev_watcher_time *WT;
76 166
77static ev_tstamp now, diff; /* monotonic clock */ 167static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
168
169#ifdef _WIN32
170# include "ev_win32.c"
171#endif
172
173/*****************************************************************************/
174
175static void (*syserr_cb)(const char *msg);
176
177void ev_set_syserr_cb (void (*cb)(const char *msg))
178{
179 syserr_cb = cb;
180}
181
182static void
183syserr (const char *msg)
184{
185 if (!msg)
186 msg = "(libev) system error";
187
188 if (syserr_cb)
189 syserr_cb (msg);
190 else
191 {
192 perror (msg);
193 abort ();
194 }
195}
196
197static void *(*alloc)(void *ptr, long size);
198
199void ev_set_allocator (void *(*cb)(void *ptr, long size))
200{
201 alloc = cb;
202}
203
204static void *
205ev_realloc (void *ptr, long size)
206{
207 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
208
209 if (!ptr && size)
210 {
211 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
212 abort ();
213 }
214
215 return ptr;
216}
217
218#define ev_malloc(size) ev_realloc (0, (size))
219#define ev_free(ptr) ev_realloc ((ptr), 0)
220
221/*****************************************************************************/
222
223typedef struct
224{
225 WL head;
226 unsigned char events;
227 unsigned char reify;
228#if EV_SELECT_IS_WINSOCKET
229 SOCKET handle;
230#endif
231} ANFD;
232
233typedef struct
234{
235 W w;
236 int events;
237} ANPENDING;
238
239#if EV_MULTIPLICITY
240
241 struct ev_loop
242 {
243 ev_tstamp ev_rt_now;
244 #define ev_rt_now ((loop)->ev_rt_now)
245 #define VAR(name,decl) decl;
246 #include "ev_vars.h"
247 #undef VAR
248 };
249 #include "ev_wrap.h"
250
251 struct ev_loop default_loop_struct;
252 static struct ev_loop *default_loop;
253
254#else
255
78ev_tstamp ev_now; 256 ev_tstamp ev_rt_now;
79int ev_method; 257 #define VAR(name,decl) static decl;
258 #include "ev_vars.h"
259 #undef VAR
80 260
81static int have_monotonic; /* runtime */ 261 static int default_loop;
82 262
83static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */ 263#endif
84static void (*method_modify)(int fd, int oev, int nev);
85static void (*method_poll)(ev_tstamp timeout);
86 264
87/*****************************************************************************/ 265/*****************************************************************************/
88 266
89ev_tstamp 267ev_tstamp
90ev_time (void) 268ev_time (void)
98 gettimeofday (&tv, 0); 276 gettimeofday (&tv, 0);
99 return tv.tv_sec + tv.tv_usec * 1e-6; 277 return tv.tv_sec + tv.tv_usec * 1e-6;
100#endif 278#endif
101} 279}
102 280
103static ev_tstamp 281inline ev_tstamp
104get_clock (void) 282get_clock (void)
105{ 283{
106#if EV_USE_MONOTONIC 284#if EV_USE_MONOTONIC
107 if (have_monotonic) 285 if (expect_true (have_monotonic))
108 { 286 {
109 struct timespec ts; 287 struct timespec ts;
110 clock_gettime (CLOCK_MONOTONIC, &ts); 288 clock_gettime (CLOCK_MONOTONIC, &ts);
111 return ts.tv_sec + ts.tv_nsec * 1e-9; 289 return ts.tv_sec + ts.tv_nsec * 1e-9;
112 } 290 }
113#endif 291#endif
114 292
115 return ev_time (); 293 return ev_time ();
116} 294}
117 295
296#if EV_MULTIPLICITY
297ev_tstamp
298ev_now (EV_P)
299{
300 return ev_rt_now;
301}
302#endif
303
118#define array_nextsize(n) (((n) << 1) | 4 & ~3) 304#define array_roundsize(type,n) ((n) | 4 & ~3)
119#define array_prevsize(n) (((n) >> 1) | 4 & ~3)
120 305
121#define array_needsize(base,cur,cnt,init) \ 306#define array_needsize(type,base,cur,cnt,init) \
122 if ((cnt) > cur) \ 307 if (expect_false ((cnt) > cur)) \
123 { \ 308 { \
124 int newcnt = cur; \ 309 int newcnt = cur; \
125 do \ 310 do \
126 { \ 311 { \
127 newcnt = array_nextsize (newcnt); \ 312 newcnt = array_roundsize (type, newcnt << 1); \
128 } \ 313 } \
129 while ((cnt) > newcnt); \ 314 while ((cnt) > newcnt); \
130 \ 315 \
131 base = realloc (base, sizeof (*base) * (newcnt)); \ 316 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
132 init (base + cur, newcnt - cur); \ 317 init (base + cur, newcnt - cur); \
133 cur = newcnt; \ 318 cur = newcnt; \
134 } 319 }
320
321#define array_slim(type,stem) \
322 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
323 { \
324 stem ## max = array_roundsize (stem ## cnt >> 1); \
325 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
326 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
327 }
328
329#define array_free(stem, idx) \
330 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
135 331
136/*****************************************************************************/ 332/*****************************************************************************/
137
138typedef struct
139{
140 struct ev_io *head;
141 int events;
142} ANFD;
143
144static ANFD *anfds;
145static int anfdmax;
146 333
147static void 334static void
148anfds_init (ANFD *base, int count) 335anfds_init (ANFD *base, int count)
149{ 336{
150 while (count--) 337 while (count--)
151 { 338 {
152 base->head = 0; 339 base->head = 0;
153 base->events = EV_NONE; 340 base->events = EV_NONE;
341 base->reify = 0;
342
154 ++base; 343 ++base;
155 } 344 }
156} 345}
157 346
158typedef struct 347void
348ev_feed_event (EV_P_ void *w, int revents)
159{ 349{
160 W w; 350 W w_ = (W)w;
161 int events;
162} ANPENDING;
163 351
164static ANPENDING *pendings; 352 if (w_->pending)
165static int pendingmax, pendingcnt;
166
167static void
168event (W w, int events)
169{
170 if (w->active)
171 { 353 {
172 w->pending = ++pendingcnt;
173 array_needsize (pendings, pendingmax, pendingcnt, );
174 pendings [pendingcnt - 1].w = w;
175 pendings [pendingcnt - 1].events = events; 354 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
355 return;
176 } 356 }
177}
178 357
358 w_->pending = ++pendingcnt [ABSPRI (w_)];
359 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
360 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
361 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
362}
363
179static void 364static void
180queue_events (W *events, int eventcnt, int type) 365queue_events (EV_P_ W *events, int eventcnt, int type)
181{ 366{
182 int i; 367 int i;
183 368
184 for (i = 0; i < eventcnt; ++i) 369 for (i = 0; i < eventcnt; ++i)
185 event (events [i], type); 370 ev_feed_event (EV_A_ events [i], type);
186} 371}
187 372
188static void 373inline void
189fd_event (int fd, int events) 374fd_event (EV_P_ int fd, int revents)
190{ 375{
191 ANFD *anfd = anfds + fd; 376 ANFD *anfd = anfds + fd;
192 struct ev_io *w; 377 struct ev_io *w;
193 378
194 for (w = anfd->head; w; w = w->next) 379 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
195 { 380 {
196 int ev = w->events & events; 381 int ev = w->events & revents;
197 382
198 if (ev) 383 if (ev)
199 event ((W)w, ev); 384 ev_feed_event (EV_A_ (W)w, ev);
200 } 385 }
386}
387
388void
389ev_feed_fd_event (EV_P_ int fd, int revents)
390{
391 fd_event (EV_A_ fd, revents);
201} 392}
202 393
203/*****************************************************************************/ 394/*****************************************************************************/
204 395
205static int *fdchanges;
206static int fdchangemax, fdchangecnt;
207
208static void 396static void
209fd_reify (void) 397fd_reify (EV_P)
210{ 398{
211 int i; 399 int i;
212 400
213 for (i = 0; i < fdchangecnt; ++i) 401 for (i = 0; i < fdchangecnt; ++i)
214 { 402 {
216 ANFD *anfd = anfds + fd; 404 ANFD *anfd = anfds + fd;
217 struct ev_io *w; 405 struct ev_io *w;
218 406
219 int events = 0; 407 int events = 0;
220 408
221 for (w = anfd->head; w; w = w->next) 409 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
222 events |= w->events; 410 events |= w->events;
223 411
224 anfd->events &= ~EV_REIFY; 412#if EV_SELECT_IS_WINSOCKET
225 413 if (events)
226 if (anfd->events != events)
227 { 414 {
228 method_modify (fd, anfd->events, events); 415 unsigned long argp;
229 anfd->events = events; 416 anfd->handle = _get_osfhandle (fd);
417 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
230 } 418 }
419#endif
420
421 anfd->reify = 0;
422
423 method_modify (EV_A_ fd, anfd->events, events);
424 anfd->events = events;
231 } 425 }
232 426
233 fdchangecnt = 0; 427 fdchangecnt = 0;
234} 428}
235 429
236static void 430static void
237fd_change (int fd) 431fd_change (EV_P_ int fd)
238{ 432{
239 if (anfds [fd].events & EV_REIFY || fdchangecnt < 0) 433 if (anfds [fd].reify)
240 return; 434 return;
241 435
242 anfds [fd].events |= EV_REIFY; 436 anfds [fd].reify = 1;
243 437
244 ++fdchangecnt; 438 ++fdchangecnt;
245 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 439 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
246 fdchanges [fdchangecnt - 1] = fd; 440 fdchanges [fdchangecnt - 1] = fd;
247} 441}
248 442
443static void
444fd_kill (EV_P_ int fd)
445{
446 struct ev_io *w;
447
448 while ((w = (struct ev_io *)anfds [fd].head))
449 {
450 ev_io_stop (EV_A_ w);
451 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
452 }
453}
454
455static int
456fd_valid (int fd)
457{
458#ifdef _WIN32
459 return _get_osfhandle (fd) != -1;
460#else
461 return fcntl (fd, F_GETFD) != -1;
462#endif
463}
464
249/* called on EBADF to verify fds */ 465/* called on EBADF to verify fds */
250static void 466static void
251fd_recheck (void) 467fd_ebadf (EV_P)
252{ 468{
253 int fd; 469 int fd;
254 470
255 for (fd = 0; fd < anfdmax; ++fd) 471 for (fd = 0; fd < anfdmax; ++fd)
256 if (anfds [fd].events) 472 if (anfds [fd].events)
257 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 473 if (!fd_valid (fd) == -1 && errno == EBADF)
258 while (anfds [fd].head) 474 fd_kill (EV_A_ fd);
475}
476
477/* called on ENOMEM in select/poll to kill some fds and retry */
478static void
479fd_enomem (EV_P)
480{
481 int fd;
482
483 for (fd = anfdmax; fd--; )
484 if (anfds [fd].events)
259 { 485 {
260 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT); 486 fd_kill (EV_A_ fd);
261 ev_io_stop (anfds [fd].head); 487 return;
262 } 488 }
489}
490
491/* usually called after fork if method needs to re-arm all fds from scratch */
492static void
493fd_rearm_all (EV_P)
494{
495 int fd;
496
497 /* this should be highly optimised to not do anything but set a flag */
498 for (fd = 0; fd < anfdmax; ++fd)
499 if (anfds [fd].events)
500 {
501 anfds [fd].events = 0;
502 fd_change (EV_A_ fd);
503 }
263} 504}
264 505
265/*****************************************************************************/ 506/*****************************************************************************/
266 507
267static struct ev_timer **timers;
268static int timermax, timercnt;
269
270static struct ev_periodic **periodics;
271static int periodicmax, periodiccnt;
272
273static void 508static void
274upheap (WT *timers, int k) 509upheap (WT *heap, int k)
275{ 510{
276 WT w = timers [k]; 511 WT w = heap [k];
277 512
278 while (k && timers [k >> 1]->at > w->at) 513 while (k && heap [k >> 1]->at > w->at)
279 { 514 {
280 timers [k] = timers [k >> 1]; 515 heap [k] = heap [k >> 1];
281 timers [k]->active = k + 1; 516 ((W)heap [k])->active = k + 1;
282 k >>= 1; 517 k >>= 1;
283 } 518 }
284 519
285 timers [k] = w; 520 heap [k] = w;
286 timers [k]->active = k + 1; 521 ((W)heap [k])->active = k + 1;
287 522
288} 523}
289 524
290static void 525static void
291downheap (WT *timers, int N, int k) 526downheap (WT *heap, int N, int k)
292{ 527{
293 WT w = timers [k]; 528 WT w = heap [k];
294 529
295 while (k < (N >> 1)) 530 while (k < (N >> 1))
296 { 531 {
297 int j = k << 1; 532 int j = k << 1;
298 533
299 if (j + 1 < N && timers [j]->at > timers [j + 1]->at) 534 if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
300 ++j; 535 ++j;
301 536
302 if (w->at <= timers [j]->at) 537 if (w->at <= heap [j]->at)
303 break; 538 break;
304 539
305 timers [k] = timers [j]; 540 heap [k] = heap [j];
306 timers [k]->active = k + 1; 541 ((W)heap [k])->active = k + 1;
307 k = j; 542 k = j;
308 } 543 }
309 544
310 timers [k] = w; 545 heap [k] = w;
311 timers [k]->active = k + 1; 546 ((W)heap [k])->active = k + 1;
547}
548
549inline void
550adjustheap (WT *heap, int N, int k)
551{
552 upheap (heap, k);
553 downheap (heap, N, k);
312} 554}
313 555
314/*****************************************************************************/ 556/*****************************************************************************/
315 557
316typedef struct 558typedef struct
317{ 559{
318 struct ev_signal *head; 560 WL head;
319 sig_atomic_t gotsig; 561 sig_atomic_t volatile gotsig;
320} ANSIG; 562} ANSIG;
321 563
322static ANSIG *signals; 564static ANSIG *signals;
323static int signalmax; 565static int signalmax;
324 566
325static int sigpipe [2]; 567static int sigpipe [2];
326static sig_atomic_t gotsig; 568static sig_atomic_t volatile gotsig;
327static struct ev_io sigev; 569static struct ev_io sigev;
328 570
329static void 571static void
330signals_init (ANSIG *base, int count) 572signals_init (ANSIG *base, int count)
331{ 573{
332 while (count--) 574 while (count--)
333 { 575 {
334 base->head = 0; 576 base->head = 0;
335 base->gotsig = 0; 577 base->gotsig = 0;
578
336 ++base; 579 ++base;
337 } 580 }
338} 581}
339 582
340static void 583static void
341sighandler (int signum) 584sighandler (int signum)
342{ 585{
586#if _WIN32
587 signal (signum, sighandler);
588#endif
589
343 signals [signum - 1].gotsig = 1; 590 signals [signum - 1].gotsig = 1;
344 591
345 if (!gotsig) 592 if (!gotsig)
346 { 593 {
594 int old_errno = errno;
347 gotsig = 1; 595 gotsig = 1;
348 write (sigpipe [1], &gotsig, 1); 596 write (sigpipe [1], &signum, 1);
597 errno = old_errno;
349 } 598 }
350} 599}
351 600
601void
602ev_feed_signal_event (EV_P_ int signum)
603{
604 WL w;
605
606#if EV_MULTIPLICITY
607 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
608#endif
609
610 --signum;
611
612 if (signum < 0 || signum >= signalmax)
613 return;
614
615 signals [signum].gotsig = 0;
616
617 for (w = signals [signum].head; w; w = w->next)
618 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
619}
620
352static void 621static void
353sigcb (struct ev_io *iow, int revents) 622sigcb (EV_P_ struct ev_io *iow, int revents)
354{ 623{
355 struct ev_signal *w;
356 int sig; 624 int signum;
357 625
626 read (sigpipe [0], &revents, 1);
358 gotsig = 0; 627 gotsig = 0;
359 read (sigpipe [0], &revents, 1);
360 628
361 for (sig = signalmax; sig--; ) 629 for (signum = signalmax; signum--; )
362 if (signals [sig].gotsig) 630 if (signals [signum].gotsig)
363 { 631 ev_feed_signal_event (EV_A_ signum + 1);
364 signals [sig].gotsig = 0;
365
366 for (w = signals [sig].head; w; w = w->next)
367 event ((W)w, EV_SIGNAL);
368 }
369} 632}
370 633
371static void 634inline void
372siginit (void) 635fd_intern (int fd)
373{ 636{
637#ifdef _WIN32
638 int arg = 1;
639 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
640#else
374 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 641 fcntl (fd, F_SETFD, FD_CLOEXEC);
375 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
376
377 /* rather than sort out wether we really need nb, set it */
378 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 642 fcntl (fd, F_SETFL, O_NONBLOCK);
379 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 643#endif
644}
645
646static void
647siginit (EV_P)
648{
649 fd_intern (sigpipe [0]);
650 fd_intern (sigpipe [1]);
380 651
381 ev_io_set (&sigev, sigpipe [0], EV_READ); 652 ev_io_set (&sigev, sigpipe [0], EV_READ);
382 ev_io_start (&sigev); 653 ev_io_start (EV_A_ &sigev);
654 ev_unref (EV_A); /* child watcher should not keep loop alive */
383} 655}
384 656
385/*****************************************************************************/ 657/*****************************************************************************/
386 658
387static struct ev_idle **idles;
388static int idlemax, idlecnt;
389
390static struct ev_prepare **prepares;
391static int preparemax, preparecnt;
392
393static struct ev_check **checks;
394static int checkmax, checkcnt;
395
396/*****************************************************************************/
397
398static struct ev_child *childs [PID_HASHSIZE]; 659static struct ev_child *childs [PID_HASHSIZE];
660
661#ifndef _WIN32
662
399static struct ev_signal childev; 663static struct ev_signal childev;
400 664
401#ifndef WCONTINUED 665#ifndef WCONTINUED
402# define WCONTINUED 0 666# define WCONTINUED 0
403#endif 667#endif
404 668
405static void 669static void
406childcb (struct ev_signal *sw, int revents) 670child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
407{ 671{
408 struct ev_child *w; 672 struct ev_child *w;
673
674 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
675 if (w->pid == pid || !w->pid)
676 {
677 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
678 w->rpid = pid;
679 w->rstatus = status;
680 ev_feed_event (EV_A_ (W)w, EV_CHILD);
681 }
682}
683
684static void
685childcb (EV_P_ struct ev_signal *sw, int revents)
686{
409 int pid, status; 687 int pid, status;
410 688
411 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 689 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
412 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 690 {
413 if (w->pid == pid || w->pid == -1) 691 /* make sure we are called again until all childs have been reaped */
414 { 692 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
415 w->status = status; 693
416 event ((W)w, EV_CHILD); 694 child_reap (EV_A_ sw, pid, pid, status);
417 } 695 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
696 }
418} 697}
698
699#endif
419 700
420/*****************************************************************************/ 701/*****************************************************************************/
421 702
703#if EV_USE_KQUEUE
704# include "ev_kqueue.c"
705#endif
422#if EV_USE_EPOLL 706#if EV_USE_EPOLL
423# include "ev_epoll.c" 707# include "ev_epoll.c"
424#endif 708#endif
709#if EV_USE_POLL
710# include "ev_poll.c"
711#endif
425#if EV_USE_SELECT 712#if EV_USE_SELECT
426# include "ev_select.c" 713# include "ev_select.c"
427#endif 714#endif
428 715
429int 716int
436ev_version_minor (void) 723ev_version_minor (void)
437{ 724{
438 return EV_VERSION_MINOR; 725 return EV_VERSION_MINOR;
439} 726}
440 727
441int ev_init (int flags) 728/* return true if we are running with elevated privileges and should ignore env variables */
729static int
730enable_secure (void)
442{ 731{
732#ifdef _WIN32
733 return 0;
734#else
735 return getuid () != geteuid ()
736 || getgid () != getegid ();
737#endif
738}
739
740int
741ev_method (EV_P)
742{
743 return method;
744}
745
746static void
747loop_init (EV_P_ int methods)
748{
443 if (!ev_method) 749 if (!method)
444 { 750 {
445#if EV_USE_MONOTONIC 751#if EV_USE_MONOTONIC
446 { 752 {
447 struct timespec ts; 753 struct timespec ts;
448 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 754 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
449 have_monotonic = 1; 755 have_monotonic = 1;
450 } 756 }
451#endif 757#endif
452 758
453 ev_now = ev_time (); 759 ev_rt_now = ev_time ();
454 now = get_clock (); 760 mn_now = get_clock ();
761 now_floor = mn_now;
455 diff = ev_now - now; 762 rtmn_diff = ev_rt_now - mn_now;
456 763
457 if (pipe (sigpipe)) 764 if (methods == EVMETHOD_AUTO)
458 return 0; 765 if (!enable_secure () && getenv ("LIBEV_METHODS"))
459 766 methods = atoi (getenv ("LIBEV_METHODS"));
767 else
460 ev_method = EVMETHOD_NONE; 768 methods = EVMETHOD_ANY;
769
770 method = 0;
771#if EV_USE_KQUEUE
772 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
773#endif
461#if EV_USE_EPOLL 774#if EV_USE_EPOLL
462 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 775 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
776#endif
777#if EV_USE_POLL
778 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
463#endif 779#endif
464#if EV_USE_SELECT 780#if EV_USE_SELECT
465 if (ev_method == EVMETHOD_NONE) select_init (flags); 781 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
466#endif 782#endif
467 783
784 ev_init (&sigev, sigcb);
785 ev_set_priority (&sigev, EV_MAXPRI);
786 }
787}
788
789void
790loop_destroy (EV_P)
791{
792 int i;
793
794#if EV_USE_KQUEUE
795 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
796#endif
797#if EV_USE_EPOLL
798 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
799#endif
800#if EV_USE_POLL
801 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
802#endif
803#if EV_USE_SELECT
804 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
805#endif
806
807 for (i = NUMPRI; i--; )
808 array_free (pending, [i]);
809
810 /* have to use the microsoft-never-gets-it-right macro */
811 array_free (fdchange, EMPTY);
812 array_free (timer, EMPTY);
813#if EV_PERIODICS
814 array_free (periodic, EMPTY);
815#endif
816 array_free (idle, EMPTY);
817 array_free (prepare, EMPTY);
818 array_free (check, EMPTY);
819
820 method = 0;
821}
822
823static void
824loop_fork (EV_P)
825{
826#if EV_USE_EPOLL
827 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
828#endif
829#if EV_USE_KQUEUE
830 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
831#endif
832
833 if (ev_is_active (&sigev))
834 {
835 /* default loop */
836
837 ev_ref (EV_A);
838 ev_io_stop (EV_A_ &sigev);
839 close (sigpipe [0]);
840 close (sigpipe [1]);
841
842 while (pipe (sigpipe))
843 syserr ("(libev) error creating pipe");
844
845 siginit (EV_A);
846 }
847
848 postfork = 0;
849}
850
851#if EV_MULTIPLICITY
852struct ev_loop *
853ev_loop_new (int methods)
854{
855 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
856
857 memset (loop, 0, sizeof (struct ev_loop));
858
859 loop_init (EV_A_ methods);
860
861 if (ev_method (EV_A))
862 return loop;
863
864 return 0;
865}
866
867void
868ev_loop_destroy (EV_P)
869{
870 loop_destroy (EV_A);
871 ev_free (loop);
872}
873
874void
875ev_loop_fork (EV_P)
876{
877 postfork = 1;
878}
879
880#endif
881
882#if EV_MULTIPLICITY
883struct ev_loop *
884#else
885int
886#endif
887ev_default_loop (int methods)
888{
889 if (sigpipe [0] == sigpipe [1])
890 if (pipe (sigpipe))
891 return 0;
892
893 if (!default_loop)
894 {
895#if EV_MULTIPLICITY
896 struct ev_loop *loop = default_loop = &default_loop_struct;
897#else
898 default_loop = 1;
899#endif
900
901 loop_init (EV_A_ methods);
902
468 if (ev_method) 903 if (ev_method (EV_A))
469 { 904 {
470 ev_watcher_init (&sigev, sigcb);
471 siginit (); 905 siginit (EV_A);
472 906
907#ifndef _WIN32
473 ev_signal_init (&childev, childcb, SIGCHLD); 908 ev_signal_init (&childev, childcb, SIGCHLD);
909 ev_set_priority (&childev, EV_MAXPRI);
474 ev_signal_start (&childev); 910 ev_signal_start (EV_A_ &childev);
911 ev_unref (EV_A); /* child watcher should not keep loop alive */
912#endif
475 } 913 }
914 else
915 default_loop = 0;
476 } 916 }
477 917
478 return ev_method; 918 return default_loop;
919}
920
921void
922ev_default_destroy (void)
923{
924#if EV_MULTIPLICITY
925 struct ev_loop *loop = default_loop;
926#endif
927
928#ifndef _WIN32
929 ev_ref (EV_A); /* child watcher */
930 ev_signal_stop (EV_A_ &childev);
931#endif
932
933 ev_ref (EV_A); /* signal watcher */
934 ev_io_stop (EV_A_ &sigev);
935
936 close (sigpipe [0]); sigpipe [0] = 0;
937 close (sigpipe [1]); sigpipe [1] = 0;
938
939 loop_destroy (EV_A);
940}
941
942void
943ev_default_fork (void)
944{
945#if EV_MULTIPLICITY
946 struct ev_loop *loop = default_loop;
947#endif
948
949 if (method)
950 postfork = 1;
479} 951}
480 952
481/*****************************************************************************/ 953/*****************************************************************************/
482 954
483void
484ev_prefork (void)
485{
486 /* nop */
487}
488
489void
490ev_postfork_parent (void)
491{
492 /* nop */
493}
494
495void
496ev_postfork_child (void)
497{
498#if EV_USE_EPOLL
499 if (ev_method == EVMETHOD_EPOLL)
500 epoll_postfork_child ();
501#endif
502
503 ev_io_stop (&sigev);
504 close (sigpipe [0]);
505 close (sigpipe [1]);
506 pipe (sigpipe);
507 siginit ();
508}
509
510/*****************************************************************************/
511
512static void 955static int
956any_pending (EV_P)
957{
958 int pri;
959
960 for (pri = NUMPRI; pri--; )
961 if (pendingcnt [pri])
962 return 1;
963
964 return 0;
965}
966
967static void
513call_pending (void) 968call_pending (EV_P)
514{ 969{
970 int pri;
971
972 for (pri = NUMPRI; pri--; )
515 while (pendingcnt) 973 while (pendingcnt [pri])
516 { 974 {
517 ANPENDING *p = pendings + --pendingcnt; 975 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
518 976
519 if (p->w) 977 if (p->w)
520 { 978 {
521 p->w->pending = 0; 979 p->w->pending = 0;
522 p->w->cb (p->w, p->events); 980 EV_CB_INVOKE (p->w, p->events);
523 } 981 }
524 } 982 }
525} 983}
526 984
527static void 985static void
528timers_reify (void) 986timers_reify (EV_P)
529{ 987{
530 while (timercnt && timers [0]->at <= now) 988 while (timercnt && ((WT)timers [0])->at <= mn_now)
531 { 989 {
532 struct ev_timer *w = timers [0]; 990 struct ev_timer *w = timers [0];
533 991
534 event ((W)w, EV_TIMEOUT); 992 assert (("inactive timer on timer heap detected", ev_is_active (w)));
535 993
536 /* first reschedule or stop timer */ 994 /* first reschedule or stop timer */
537 if (w->repeat) 995 if (w->repeat)
538 { 996 {
997 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
998
539 w->at = now + w->repeat; 999 ((WT)w)->at += w->repeat;
540 assert (("timer timeout in the past, negative repeat?", w->at > now)); 1000 if (((WT)w)->at < mn_now)
1001 ((WT)w)->at = mn_now;
1002
541 downheap ((WT *)timers, timercnt, 0); 1003 downheap ((WT *)timers, timercnt, 0);
542 } 1004 }
543 else 1005 else
544 ev_timer_stop (w); /* nonrepeating: stop timer */ 1006 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
545 }
546}
547 1007
1008 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
1009 }
1010}
1011
1012#if EV_PERIODICS
548static void 1013static void
549periodics_reify (void) 1014periodics_reify (EV_P)
550{ 1015{
551 while (periodiccnt && periodics [0]->at <= ev_now) 1016 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
552 { 1017 {
553 struct ev_periodic *w = periodics [0]; 1018 struct ev_periodic *w = periodics [0];
554 1019
1020 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1021
555 /* first reschedule or stop timer */ 1022 /* first reschedule or stop timer */
556 if (w->interval) 1023 if (w->reschedule_cb)
557 { 1024 {
1025 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1026
1027 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1028 downheap ((WT *)periodics, periodiccnt, 0);
1029 }
1030 else if (w->interval)
1031 {
558 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 1032 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
559 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 1033 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
560 downheap ((WT *)periodics, periodiccnt, 0); 1034 downheap ((WT *)periodics, periodiccnt, 0);
561 } 1035 }
562 else 1036 else
563 ev_periodic_stop (w); /* nonrepeating: stop timer */ 1037 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
564 1038
565 event ((W)w, EV_TIMEOUT); 1039 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
566 } 1040 }
567} 1041}
568 1042
569static void 1043static void
570periodics_reschedule (ev_tstamp diff) 1044periodics_reschedule (EV_P)
571{ 1045{
572 int i; 1046 int i;
573 1047
574 /* adjust periodics after time jump */ 1048 /* adjust periodics after time jump */
575 for (i = 0; i < periodiccnt; ++i) 1049 for (i = 0; i < periodiccnt; ++i)
576 { 1050 {
577 struct ev_periodic *w = periodics [i]; 1051 struct ev_periodic *w = periodics [i];
578 1052
1053 if (w->reschedule_cb)
1054 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
579 if (w->interval) 1055 else if (w->interval)
1056 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1057 }
1058
1059 /* now rebuild the heap */
1060 for (i = periodiccnt >> 1; i--; )
1061 downheap ((WT *)periodics, periodiccnt, i);
1062}
1063#endif
1064
1065inline int
1066time_update_monotonic (EV_P)
1067{
1068 mn_now = get_clock ();
1069
1070 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1071 {
1072 ev_rt_now = rtmn_diff + mn_now;
1073 return 0;
1074 }
1075 else
1076 {
1077 now_floor = mn_now;
1078 ev_rt_now = ev_time ();
1079 return 1;
1080 }
1081}
1082
1083static void
1084time_update (EV_P)
1085{
1086 int i;
1087
1088#if EV_USE_MONOTONIC
1089 if (expect_true (have_monotonic))
1090 {
1091 if (time_update_monotonic (EV_A))
580 { 1092 {
581 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 1093 ev_tstamp odiff = rtmn_diff;
582 1094
583 if (fabs (diff) >= 1e-4) 1095 for (i = 4; --i; ) /* loop a few times, before making important decisions */
584 { 1096 {
585 ev_periodic_stop (w); 1097 rtmn_diff = ev_rt_now - mn_now;
586 ev_periodic_start (w);
587 1098
588 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 1099 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1100 return; /* all is well */
1101
1102 ev_rt_now = ev_time ();
1103 mn_now = get_clock ();
1104 now_floor = mn_now;
589 } 1105 }
1106
1107# if EV_PERIODICS
1108 periodics_reschedule (EV_A);
1109# endif
1110 /* no timer adjustment, as the monotonic clock doesn't jump */
1111 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
590 } 1112 }
591 } 1113 }
592} 1114 else
593 1115#endif
594static void 1116 {
595time_update (void)
596{
597 int i;
598
599 ev_now = ev_time (); 1117 ev_rt_now = ev_time ();
600 1118
601 if (have_monotonic) 1119 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
602 {
603 ev_tstamp odiff = diff;
604
605 for (i = 4; --i; ) /* loop a few times, before making important decisions */
606 { 1120 {
607 now = get_clock (); 1121#if EV_PERIODICS
608 diff = ev_now - now;
609
610 if (fabs (odiff - diff) < MIN_TIMEJUMP)
611 return; /* all is well */
612
613 ev_now = ev_time ();
614 }
615
616 periodics_reschedule (diff - odiff);
617 /* no timer adjustment, as the monotonic clock doesn't jump */
618 }
619 else
620 {
621 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)
622 {
623 periodics_reschedule (ev_now - now); 1122 periodics_reschedule (EV_A);
1123#endif
624 1124
625 /* adjust timers. this is easy, as the offset is the same for all */ 1125 /* adjust timers. this is easy, as the offset is the same for all */
626 for (i = 0; i < timercnt; ++i) 1126 for (i = 0; i < timercnt; ++i)
627 timers [i]->at += diff; 1127 ((WT)timers [i])->at += ev_rt_now - mn_now;
628 } 1128 }
629 1129
630 now = ev_now; 1130 mn_now = ev_rt_now;
631 } 1131 }
632} 1132}
633 1133
634int ev_loop_done; 1134void
1135ev_ref (EV_P)
1136{
1137 ++activecnt;
1138}
635 1139
1140void
1141ev_unref (EV_P)
1142{
1143 --activecnt;
1144}
1145
1146static int loop_done;
1147
1148void
636void ev_loop (int flags) 1149ev_loop (EV_P_ int flags)
637{ 1150{
638 double block; 1151 double block;
639 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1152 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
640 1153
641 do 1154 do
642 { 1155 {
643 /* queue check watchers (and execute them) */ 1156 /* queue check watchers (and execute them) */
644 if (preparecnt) 1157 if (expect_false (preparecnt))
645 { 1158 {
646 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 1159 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
647 call_pending (); 1160 call_pending (EV_A);
648 } 1161 }
649 1162
1163 /* we might have forked, so reify kernel state if necessary */
1164 if (expect_false (postfork))
1165 loop_fork (EV_A);
1166
650 /* update fd-related kernel structures */ 1167 /* update fd-related kernel structures */
651 fd_reify (); 1168 fd_reify (EV_A);
652 1169
653 /* calculate blocking time */ 1170 /* calculate blocking time */
654 1171
655 /* we only need this for !monotonic clockor timers, but as we basically 1172 /* we only need this for !monotonic clock or timers, but as we basically
656 always have timers, we just calculate it always */ 1173 always have timers, we just calculate it always */
1174#if EV_USE_MONOTONIC
1175 if (expect_true (have_monotonic))
1176 time_update_monotonic (EV_A);
1177 else
1178#endif
1179 {
657 ev_now = ev_time (); 1180 ev_rt_now = ev_time ();
1181 mn_now = ev_rt_now;
1182 }
658 1183
659 if (flags & EVLOOP_NONBLOCK || idlecnt) 1184 if (flags & EVLOOP_NONBLOCK || idlecnt)
660 block = 0.; 1185 block = 0.;
661 else 1186 else
662 { 1187 {
663 block = MAX_BLOCKTIME; 1188 block = MAX_BLOCKTIME;
664 1189
665 if (timercnt) 1190 if (timercnt)
666 { 1191 {
667 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 1192 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
668 if (block > to) block = to; 1193 if (block > to) block = to;
669 } 1194 }
670 1195
1196#if EV_PERIODICS
671 if (periodiccnt) 1197 if (periodiccnt)
672 { 1198 {
673 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 1199 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
674 if (block > to) block = to; 1200 if (block > to) block = to;
675 } 1201 }
1202#endif
676 1203
677 if (block < 0.) block = 0.; 1204 if (block < 0.) block = 0.;
678 } 1205 }
679 1206
680 method_poll (block); 1207 method_poll (EV_A_ block);
681 1208
682 /* update ev_now, do magic */ 1209 /* update ev_rt_now, do magic */
683 time_update (); 1210 time_update (EV_A);
684 1211
685 /* queue pending timers and reschedule them */ 1212 /* queue pending timers and reschedule them */
686 timers_reify (); /* relative timers called last */ 1213 timers_reify (EV_A); /* relative timers called last */
1214#if EV_PERIODICS
687 periodics_reify (); /* absolute timers called first */ 1215 periodics_reify (EV_A); /* absolute timers called first */
1216#endif
688 1217
689 /* queue idle watchers unless io or timers are pending */ 1218 /* queue idle watchers unless io or timers are pending */
690 if (!pendingcnt) 1219 if (idlecnt && !any_pending (EV_A))
691 queue_events ((W *)idles, idlecnt, EV_IDLE); 1220 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
692 1221
693 /* queue check watchers, to be executed first */ 1222 /* queue check watchers, to be executed first */
694 if (checkcnt) 1223 if (checkcnt)
695 queue_events ((W *)checks, checkcnt, EV_CHECK); 1224 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
696 1225
697 call_pending (); 1226 call_pending (EV_A);
698 } 1227 }
699 while (!ev_loop_done); 1228 while (activecnt && !loop_done);
700 1229
701 if (ev_loop_done != 2) 1230 if (loop_done != 2)
702 ev_loop_done = 0; 1231 loop_done = 0;
1232}
1233
1234void
1235ev_unloop (EV_P_ int how)
1236{
1237 loop_done = how;
703} 1238}
704 1239
705/*****************************************************************************/ 1240/*****************************************************************************/
706 1241
707static void 1242inline void
708wlist_add (WL *head, WL elem) 1243wlist_add (WL *head, WL elem)
709{ 1244{
710 elem->next = *head; 1245 elem->next = *head;
711 *head = elem; 1246 *head = elem;
712} 1247}
713 1248
714static void 1249inline void
715wlist_del (WL *head, WL elem) 1250wlist_del (WL *head, WL elem)
716{ 1251{
717 while (*head) 1252 while (*head)
718 { 1253 {
719 if (*head == elem) 1254 if (*head == elem)
724 1259
725 head = &(*head)->next; 1260 head = &(*head)->next;
726 } 1261 }
727} 1262}
728 1263
729static void 1264inline void
730ev_clear (W w) 1265ev_clear_pending (EV_P_ W w)
731{ 1266{
732 if (w->pending) 1267 if (w->pending)
733 { 1268 {
734 pendings [w->pending - 1].w = 0; 1269 pendings [ABSPRI (w)][w->pending - 1].w = 0;
735 w->pending = 0; 1270 w->pending = 0;
736 } 1271 }
737} 1272}
738 1273
739static void 1274inline void
740ev_start (W w, int active) 1275ev_start (EV_P_ W w, int active)
741{ 1276{
1277 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1278 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1279
742 w->active = active; 1280 w->active = active;
1281 ev_ref (EV_A);
743} 1282}
744 1283
745static void 1284inline void
746ev_stop (W w) 1285ev_stop (EV_P_ W w)
747{ 1286{
1287 ev_unref (EV_A);
748 w->active = 0; 1288 w->active = 0;
749} 1289}
750 1290
751/*****************************************************************************/ 1291/*****************************************************************************/
752 1292
753void 1293void
754ev_io_start (struct ev_io *w) 1294ev_io_start (EV_P_ struct ev_io *w)
755{ 1295{
1296 int fd = w->fd;
1297
756 if (ev_is_active (w)) 1298 if (ev_is_active (w))
757 return; 1299 return;
758 1300
759 int fd = w->fd; 1301 assert (("ev_io_start called with negative fd", fd >= 0));
760 1302
761 ev_start ((W)w, 1); 1303 ev_start (EV_A_ (W)w, 1);
762 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1304 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
763 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1305 wlist_add ((WL *)&anfds[fd].head, (WL)w);
764 1306
765 fd_change (fd); 1307 fd_change (EV_A_ fd);
766} 1308}
767 1309
768void 1310void
769ev_io_stop (struct ev_io *w) 1311ev_io_stop (EV_P_ struct ev_io *w)
770{ 1312{
771 ev_clear ((W)w); 1313 ev_clear_pending (EV_A_ (W)w);
772 if (!ev_is_active (w)) 1314 if (!ev_is_active (w))
773 return; 1315 return;
774 1316
1317 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1318
775 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1319 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
776 ev_stop ((W)w); 1320 ev_stop (EV_A_ (W)w);
777 1321
778 fd_change (w->fd); 1322 fd_change (EV_A_ w->fd);
779} 1323}
780 1324
781void 1325void
782ev_timer_start (struct ev_timer *w) 1326ev_timer_start (EV_P_ struct ev_timer *w)
783{ 1327{
784 if (ev_is_active (w)) 1328 if (ev_is_active (w))
785 return; 1329 return;
786 1330
787 w->at += now; 1331 ((WT)w)->at += mn_now;
788 1332
789 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 1333 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
790 1334
791 ev_start ((W)w, ++timercnt); 1335 ev_start (EV_A_ (W)w, ++timercnt);
792 array_needsize (timers, timermax, timercnt, ); 1336 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
793 timers [timercnt - 1] = w; 1337 timers [timercnt - 1] = w;
794 upheap ((WT *)timers, timercnt - 1); 1338 upheap ((WT *)timers, timercnt - 1);
795}
796 1339
1340 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1341}
1342
797void 1343void
798ev_timer_stop (struct ev_timer *w) 1344ev_timer_stop (EV_P_ struct ev_timer *w)
799{ 1345{
800 ev_clear ((W)w); 1346 ev_clear_pending (EV_A_ (W)w);
801 if (!ev_is_active (w)) 1347 if (!ev_is_active (w))
802 return; 1348 return;
803 1349
1350 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1351
804 if (w->active < timercnt--) 1352 if (((W)w)->active < timercnt--)
805 { 1353 {
806 timers [w->active - 1] = timers [timercnt]; 1354 timers [((W)w)->active - 1] = timers [timercnt];
807 downheap ((WT *)timers, timercnt, w->active - 1); 1355 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
808 } 1356 }
809 1357
810 w->at = w->repeat; 1358 ((WT)w)->at -= mn_now;
811 1359
812 ev_stop ((W)w); 1360 ev_stop (EV_A_ (W)w);
813} 1361}
814 1362
815void 1363void
816ev_timer_again (struct ev_timer *w) 1364ev_timer_again (EV_P_ struct ev_timer *w)
817{ 1365{
818 if (ev_is_active (w)) 1366 if (ev_is_active (w))
819 { 1367 {
820 if (w->repeat) 1368 if (w->repeat)
821 { 1369 {
822 w->at = now + w->repeat; 1370 ((WT)w)->at = mn_now + w->repeat;
823 downheap ((WT *)timers, timercnt, w->active - 1); 1371 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
824 } 1372 }
825 else 1373 else
826 ev_timer_stop (w); 1374 ev_timer_stop (EV_A_ w);
827 } 1375 }
828 else if (w->repeat) 1376 else if (w->repeat)
829 ev_timer_start (w); 1377 ev_timer_start (EV_A_ w);
830} 1378}
831 1379
1380#if EV_PERIODICS
832void 1381void
833ev_periodic_start (struct ev_periodic *w) 1382ev_periodic_start (EV_P_ struct ev_periodic *w)
834{ 1383{
835 if (ev_is_active (w)) 1384 if (ev_is_active (w))
836 return; 1385 return;
837 1386
838 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 1387 if (w->reschedule_cb)
839 1388 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1389 else if (w->interval)
1390 {
1391 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
840 /* this formula differs from the one in periodic_reify because we do not always round up */ 1392 /* this formula differs from the one in periodic_reify because we do not always round up */
841 if (w->interval)
842 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1393 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1394 }
843 1395
844 ev_start ((W)w, ++periodiccnt); 1396 ev_start (EV_A_ (W)w, ++periodiccnt);
845 array_needsize (periodics, periodicmax, periodiccnt, ); 1397 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
846 periodics [periodiccnt - 1] = w; 1398 periodics [periodiccnt - 1] = w;
847 upheap ((WT *)periodics, periodiccnt - 1); 1399 upheap ((WT *)periodics, periodiccnt - 1);
848}
849 1400
1401 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1402}
1403
850void 1404void
851ev_periodic_stop (struct ev_periodic *w) 1405ev_periodic_stop (EV_P_ struct ev_periodic *w)
852{ 1406{
853 ev_clear ((W)w); 1407 ev_clear_pending (EV_A_ (W)w);
854 if (!ev_is_active (w)) 1408 if (!ev_is_active (w))
855 return; 1409 return;
856 1410
1411 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1412
857 if (w->active < periodiccnt--) 1413 if (((W)w)->active < periodiccnt--)
858 { 1414 {
859 periodics [w->active - 1] = periodics [periodiccnt]; 1415 periodics [((W)w)->active - 1] = periodics [periodiccnt];
860 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1416 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
861 } 1417 }
862 1418
863 ev_stop ((W)w); 1419 ev_stop (EV_A_ (W)w);
864} 1420}
865 1421
866void 1422void
1423ev_periodic_again (EV_P_ struct ev_periodic *w)
1424{
1425 /* TODO: use adjustheap and recalculation */
1426 ev_periodic_stop (EV_A_ w);
1427 ev_periodic_start (EV_A_ w);
1428}
1429#endif
1430
1431void
867ev_signal_start (struct ev_signal *w) 1432ev_idle_start (EV_P_ struct ev_idle *w)
868{ 1433{
869 if (ev_is_active (w)) 1434 if (ev_is_active (w))
870 return; 1435 return;
871 1436
1437 ev_start (EV_A_ (W)w, ++idlecnt);
1438 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1439 idles [idlecnt - 1] = w;
1440}
1441
1442void
1443ev_idle_stop (EV_P_ struct ev_idle *w)
1444{
1445 ev_clear_pending (EV_A_ (W)w);
1446 if (!ev_is_active (w))
1447 return;
1448
1449 idles [((W)w)->active - 1] = idles [--idlecnt];
1450 ev_stop (EV_A_ (W)w);
1451}
1452
1453void
1454ev_prepare_start (EV_P_ struct ev_prepare *w)
1455{
1456 if (ev_is_active (w))
1457 return;
1458
1459 ev_start (EV_A_ (W)w, ++preparecnt);
1460 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1461 prepares [preparecnt - 1] = w;
1462}
1463
1464void
1465ev_prepare_stop (EV_P_ struct ev_prepare *w)
1466{
1467 ev_clear_pending (EV_A_ (W)w);
1468 if (!ev_is_active (w))
1469 return;
1470
1471 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1472 ev_stop (EV_A_ (W)w);
1473}
1474
1475void
1476ev_check_start (EV_P_ struct ev_check *w)
1477{
1478 if (ev_is_active (w))
1479 return;
1480
1481 ev_start (EV_A_ (W)w, ++checkcnt);
1482 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1483 checks [checkcnt - 1] = w;
1484}
1485
1486void
1487ev_check_stop (EV_P_ struct ev_check *w)
1488{
1489 ev_clear_pending (EV_A_ (W)w);
1490 if (!ev_is_active (w))
1491 return;
1492
1493 checks [((W)w)->active - 1] = checks [--checkcnt];
1494 ev_stop (EV_A_ (W)w);
1495}
1496
1497#ifndef SA_RESTART
1498# define SA_RESTART 0
1499#endif
1500
1501void
1502ev_signal_start (EV_P_ struct ev_signal *w)
1503{
1504#if EV_MULTIPLICITY
1505 assert (("signal watchers are only supported in the default loop", loop == default_loop));
1506#endif
1507 if (ev_is_active (w))
1508 return;
1509
1510 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1511
872 ev_start ((W)w, 1); 1512 ev_start (EV_A_ (W)w, 1);
873 array_needsize (signals, signalmax, w->signum, signals_init); 1513 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
874 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1514 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
875 1515
876 if (!w->next) 1516 if (!((WL)w)->next)
877 { 1517 {
1518#if _WIN32
1519 signal (w->signum, sighandler);
1520#else
878 struct sigaction sa; 1521 struct sigaction sa;
879 sa.sa_handler = sighandler; 1522 sa.sa_handler = sighandler;
880 sigfillset (&sa.sa_mask); 1523 sigfillset (&sa.sa_mask);
881 sa.sa_flags = 0; 1524 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
882 sigaction (w->signum, &sa, 0); 1525 sigaction (w->signum, &sa, 0);
1526#endif
883 } 1527 }
884} 1528}
885 1529
886void 1530void
887ev_signal_stop (struct ev_signal *w) 1531ev_signal_stop (EV_P_ struct ev_signal *w)
888{ 1532{
889 ev_clear ((W)w); 1533 ev_clear_pending (EV_A_ (W)w);
890 if (!ev_is_active (w)) 1534 if (!ev_is_active (w))
891 return; 1535 return;
892 1536
893 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1537 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
894 ev_stop ((W)w); 1538 ev_stop (EV_A_ (W)w);
895 1539
896 if (!signals [w->signum - 1].head) 1540 if (!signals [w->signum - 1].head)
897 signal (w->signum, SIG_DFL); 1541 signal (w->signum, SIG_DFL);
898} 1542}
899 1543
900void 1544void
901ev_idle_start (struct ev_idle *w) 1545ev_child_start (EV_P_ struct ev_child *w)
902{ 1546{
1547#if EV_MULTIPLICITY
1548 assert (("child watchers are only supported in the default loop", loop == default_loop));
1549#endif
903 if (ev_is_active (w)) 1550 if (ev_is_active (w))
904 return; 1551 return;
905 1552
906 ev_start ((W)w, ++idlecnt);
907 array_needsize (idles, idlemax, idlecnt, );
908 idles [idlecnt - 1] = w;
909}
910
911void
912ev_idle_stop (struct ev_idle *w)
913{
914 ev_clear ((W)w);
915 if (ev_is_active (w))
916 return;
917
918 idles [w->active - 1] = idles [--idlecnt];
919 ev_stop ((W)w);
920}
921
922void
923ev_prepare_start (struct ev_prepare *w)
924{
925 if (ev_is_active (w))
926 return;
927
928 ev_start ((W)w, ++preparecnt);
929 array_needsize (prepares, preparemax, preparecnt, );
930 prepares [preparecnt - 1] = w;
931}
932
933void
934ev_prepare_stop (struct ev_prepare *w)
935{
936 ev_clear ((W)w);
937 if (ev_is_active (w))
938 return;
939
940 prepares [w->active - 1] = prepares [--preparecnt];
941 ev_stop ((W)w);
942}
943
944void
945ev_check_start (struct ev_check *w)
946{
947 if (ev_is_active (w))
948 return;
949
950 ev_start ((W)w, ++checkcnt);
951 array_needsize (checks, checkmax, checkcnt, );
952 checks [checkcnt - 1] = w;
953}
954
955void
956ev_check_stop (struct ev_check *w)
957{
958 ev_clear ((W)w);
959 if (ev_is_active (w))
960 return;
961
962 checks [w->active - 1] = checks [--checkcnt];
963 ev_stop ((W)w);
964}
965
966void
967ev_child_start (struct ev_child *w)
968{
969 if (ev_is_active (w))
970 return;
971
972 ev_start ((W)w, 1); 1553 ev_start (EV_A_ (W)w, 1);
973 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1554 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
974} 1555}
975 1556
976void 1557void
977ev_child_stop (struct ev_child *w) 1558ev_child_stop (EV_P_ struct ev_child *w)
978{ 1559{
979 ev_clear ((W)w); 1560 ev_clear_pending (EV_A_ (W)w);
980 if (ev_is_active (w)) 1561 if (!ev_is_active (w))
981 return; 1562 return;
982 1563
983 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1564 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
984 ev_stop ((W)w); 1565 ev_stop (EV_A_ (W)w);
985} 1566}
986 1567
987/*****************************************************************************/ 1568/*****************************************************************************/
988 1569
989struct ev_once 1570struct ev_once
993 void (*cb)(int revents, void *arg); 1574 void (*cb)(int revents, void *arg);
994 void *arg; 1575 void *arg;
995}; 1576};
996 1577
997static void 1578static void
998once_cb (struct ev_once *once, int revents) 1579once_cb (EV_P_ struct ev_once *once, int revents)
999{ 1580{
1000 void (*cb)(int revents, void *arg) = once->cb; 1581 void (*cb)(int revents, void *arg) = once->cb;
1001 void *arg = once->arg; 1582 void *arg = once->arg;
1002 1583
1003 ev_io_stop (&once->io); 1584 ev_io_stop (EV_A_ &once->io);
1004 ev_timer_stop (&once->to); 1585 ev_timer_stop (EV_A_ &once->to);
1005 free (once); 1586 ev_free (once);
1006 1587
1007 cb (revents, arg); 1588 cb (revents, arg);
1008} 1589}
1009 1590
1010static void 1591static void
1011once_cb_io (struct ev_io *w, int revents) 1592once_cb_io (EV_P_ struct ev_io *w, int revents)
1012{ 1593{
1013 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1594 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1014} 1595}
1015 1596
1016static void 1597static void
1017once_cb_to (struct ev_timer *w, int revents) 1598once_cb_to (EV_P_ struct ev_timer *w, int revents)
1018{ 1599{
1019 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1600 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1020} 1601}
1021 1602
1022void 1603void
1023ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1604ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1024{ 1605{
1025 struct ev_once *once = malloc (sizeof (struct ev_once)); 1606 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1026 1607
1027 if (!once) 1608 if (!once)
1028 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1609 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1029 else 1610 else
1030 { 1611 {
1031 once->cb = cb; 1612 once->cb = cb;
1032 once->arg = arg; 1613 once->arg = arg;
1033 1614
1034 ev_watcher_init (&once->io, once_cb_io); 1615 ev_init (&once->io, once_cb_io);
1035 if (fd >= 0) 1616 if (fd >= 0)
1036 { 1617 {
1037 ev_io_set (&once->io, fd, events); 1618 ev_io_set (&once->io, fd, events);
1038 ev_io_start (&once->io); 1619 ev_io_start (EV_A_ &once->io);
1039 } 1620 }
1040 1621
1041 ev_watcher_init (&once->to, once_cb_to); 1622 ev_init (&once->to, once_cb_to);
1042 if (timeout >= 0.) 1623 if (timeout >= 0.)
1043 { 1624 {
1044 ev_timer_set (&once->to, timeout, 0.); 1625 ev_timer_set (&once->to, timeout, 0.);
1045 ev_timer_start (&once->to); 1626 ev_timer_start (EV_A_ &once->to);
1046 } 1627 }
1047 } 1628 }
1048} 1629}
1049 1630
1050/*****************************************************************************/ 1631#ifdef __cplusplus
1051
1052#if 0
1053
1054struct ev_io wio;
1055
1056static void
1057sin_cb (struct ev_io *w, int revents)
1058{
1059 fprintf (stderr, "sin %d, revents %d\n", w->fd, revents);
1060} 1632}
1061
1062static void
1063ocb (struct ev_timer *w, int revents)
1064{
1065 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
1066 ev_timer_stop (w);
1067 ev_timer_start (w);
1068}
1069
1070static void
1071scb (struct ev_signal *w, int revents)
1072{
1073 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
1074 ev_io_stop (&wio);
1075 ev_io_start (&wio);
1076}
1077
1078static void
1079gcb (struct ev_signal *w, int revents)
1080{
1081 fprintf (stderr, "generic %x\n", revents);
1082
1083}
1084
1085int main (void)
1086{
1087 ev_init (0);
1088
1089 ev_io_init (&wio, sin_cb, 0, EV_READ);
1090 ev_io_start (&wio);
1091
1092 struct ev_timer t[10000];
1093
1094#if 0
1095 int i;
1096 for (i = 0; i < 10000; ++i)
1097 {
1098 struct ev_timer *w = t + i;
1099 ev_watcher_init (w, ocb, i);
1100 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
1101 ev_timer_start (w);
1102 if (drand48 () < 0.5)
1103 ev_timer_stop (w);
1104 }
1105#endif 1633#endif
1106 1634
1107 struct ev_timer t1;
1108 ev_timer_init (&t1, ocb, 5, 10);
1109 ev_timer_start (&t1);
1110
1111 struct ev_signal sig;
1112 ev_signal_init (&sig, scb, SIGQUIT);
1113 ev_signal_start (&sig);
1114
1115 struct ev_check cw;
1116 ev_check_init (&cw, gcb);
1117 ev_check_start (&cw);
1118
1119 struct ev_idle iw;
1120 ev_idle_init (&iw, gcb);
1121 ev_idle_start (&iw);
1122
1123 ev_loop (0);
1124
1125 return 0;
1126}
1127
1128#endif
1129
1130
1131
1132

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines