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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines