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

Comparing libev/ev.c (file contents):
Revision 1.15 by root, Wed Oct 31 11:56:34 2007 UTC vs.
Revision 1.45 by root, Sat Nov 3 09:19:58 2007 UTC

1/*
2 * libev event processing core, watcher management
3 *
4 * Copyright (c) 2007 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions are
9 * met:
10 *
11 * * Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 *
14 * * Redistributions in binary form must reproduce the above
15 * copyright notice, this list of conditions and the following
16 * disclaimer in the documentation and/or other materials provided
17 * with the distribution.
18 *
19 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */
31#if EV_USE_CONFIG_H
32# include "config.h"
33#endif
34
1#include <math.h> 35#include <math.h>
2#include <stdlib.h> 36#include <stdlib.h>
3#include <unistd.h> 37#include <unistd.h>
4#include <fcntl.h> 38#include <fcntl.h>
5#include <signal.h> 39#include <signal.h>
40#include <stddef.h>
6 41
7#include <stdio.h> 42#include <stdio.h>
8 43
9#include <assert.h> 44#include <assert.h>
10#include <errno.h> 45#include <errno.h>
46#include <sys/types.h>
47#ifndef WIN32
48# include <sys/wait.h>
49#endif
11#include <sys/time.h> 50#include <sys/time.h>
12#include <time.h> 51#include <time.h>
13 52
14#define HAVE_EPOLL 1 53/**/
15 54
16#ifndef HAVE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
56# define EV_USE_MONOTONIC 1
57#endif
58
59#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1
61#endif
62
63#ifndef EV_USE_POLL
64# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif
66
67#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0
69#endif
70
71#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0
73#endif
74
75#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1
77#endif
78
79/**/
80
17# ifdef CLOCK_MONOTONIC 81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
18# define HAVE_MONOTONIC 1 83# define EV_USE_MONOTONIC 0
19# endif 84#endif
20#endif
21 85
22#ifndef HAVE_SELECT
23# define HAVE_SELECT 1
24#endif
25
26#ifndef HAVE_EPOLL
27# define HAVE_EPOLL 0
28#endif
29
30#ifndef HAVE_REALTIME 86#ifndef CLOCK_REALTIME
31# define HAVE_REALTIME 1 /* posix requirement, but might be slower */ 87# undef EV_USE_REALTIME
88# define EV_USE_REALTIME 0
32#endif 89#endif
90
91/**/
33 92
34#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 93#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
35#define MAX_BLOCKTIME 60. 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
95#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
96/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
36 97
37#include "ev.h" 98#include "ev.h"
99
100#if __GNUC__ >= 3
101# define expect(expr,value) __builtin_expect ((expr),(value))
102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
107
108#define expect_false(expr) expect ((expr) != 0, 0)
109#define expect_true(expr) expect ((expr) != 0, 1)
110
111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
38 113
39typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
40typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
41typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
42 117
43static ev_tstamp now, diff; /* monotonic clock */ 118static ev_tstamp now_floor, now, diff; /* monotonic clock */
44ev_tstamp ev_now; 119ev_tstamp ev_now;
45int ev_method; 120int ev_method;
46 121
47static int have_monotonic; /* runtime */ 122static int have_monotonic; /* runtime */
48 123
53/*****************************************************************************/ 128/*****************************************************************************/
54 129
55ev_tstamp 130ev_tstamp
56ev_time (void) 131ev_time (void)
57{ 132{
58#if HAVE_REALTIME 133#if EV_USE_REALTIME
59 struct timespec ts; 134 struct timespec ts;
60 clock_gettime (CLOCK_REALTIME, &ts); 135 clock_gettime (CLOCK_REALTIME, &ts);
61 return ts.tv_sec + ts.tv_nsec * 1e-9; 136 return ts.tv_sec + ts.tv_nsec * 1e-9;
62#else 137#else
63 struct timeval tv; 138 struct timeval tv;
67} 142}
68 143
69static ev_tstamp 144static ev_tstamp
70get_clock (void) 145get_clock (void)
71{ 146{
72#if HAVE_MONOTONIC 147#if EV_USE_MONOTONIC
73 if (have_monotonic) 148 if (expect_true (have_monotonic))
74 { 149 {
75 struct timespec ts; 150 struct timespec ts;
76 clock_gettime (CLOCK_MONOTONIC, &ts); 151 clock_gettime (CLOCK_MONOTONIC, &ts);
77 return ts.tv_sec + ts.tv_nsec * 1e-9; 152 return ts.tv_sec + ts.tv_nsec * 1e-9;
78 } 153 }
79#endif 154#endif
80 155
81 return ev_time (); 156 return ev_time ();
82} 157}
83 158
159#define array_roundsize(base,n) ((n) | 4 & ~3)
160
84#define array_needsize(base,cur,cnt,init) \ 161#define array_needsize(base,cur,cnt,init) \
85 if ((cnt) > cur) \ 162 if (expect_false ((cnt) > cur)) \
86 { \ 163 { \
87 int newcnt = cur ? cur << 1 : 16; \ 164 int newcnt = cur; \
165 do \
166 { \
167 newcnt = array_roundsize (base, newcnt << 1); \
168 } \
169 while ((cnt) > newcnt); \
170 \
88 base = realloc (base, sizeof (*base) * (newcnt)); \ 171 base = realloc (base, sizeof (*base) * (newcnt)); \
89 init (base + cur, newcnt - cur); \ 172 init (base + cur, newcnt - cur); \
90 cur = newcnt; \ 173 cur = newcnt; \
91 } 174 }
92 175
93/*****************************************************************************/ 176/*****************************************************************************/
94 177
95typedef struct 178typedef struct
96{ 179{
97 struct ev_io *head; 180 struct ev_io *head;
98 unsigned char wev, rev; /* want, received event set */ 181 unsigned char events;
182 unsigned char reify;
99} ANFD; 183} ANFD;
100 184
101static ANFD *anfds; 185static ANFD *anfds;
102static int anfdmax; 186static int anfdmax;
103 187
104static int *fdchanges;
105static int fdchangemax, fdchangecnt;
106
107static void 188static void
108anfds_init (ANFD *base, int count) 189anfds_init (ANFD *base, int count)
109{ 190{
110 while (count--) 191 while (count--)
111 { 192 {
112 base->head = 0; 193 base->head = 0;
113 base->wev = base->rev = EV_NONE; 194 base->events = EV_NONE;
195 base->reify = 0;
196
114 ++base; 197 ++base;
115 } 198 }
116} 199}
117 200
118typedef struct 201typedef struct
119{ 202{
120 W w; 203 W w;
121 int events; 204 int events;
122} ANPENDING; 205} ANPENDING;
123 206
124static ANPENDING *pendings; 207static ANPENDING *pendings [NUMPRI];
125static int pendingmax, pendingcnt; 208static int pendingmax [NUMPRI], pendingcnt [NUMPRI];
126 209
127static void 210static void
128event (W w, int events) 211event (W w, int events)
129{ 212{
213 if (w->pending)
214 {
215 pendings [ABSPRI (w)][w->pending - 1].events |= events;
216 return;
217 }
218
130 w->pending = ++pendingcnt; 219 w->pending = ++pendingcnt [ABSPRI (w)];
131 array_needsize (pendings, pendingmax, pendingcnt, ); 220 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
132 pendings [pendingcnt - 1].w = w; 221 pendings [ABSPRI (w)][w->pending - 1].w = w;
133 pendings [pendingcnt - 1].events = events; 222 pendings [ABSPRI (w)][w->pending - 1].events = events;
223}
224
225static void
226queue_events (W *events, int eventcnt, int type)
227{
228 int i;
229
230 for (i = 0; i < eventcnt; ++i)
231 event (events [i], type);
134} 232}
135 233
136static void 234static void
137fd_event (int fd, int events) 235fd_event (int fd, int events)
138{ 236{
146 if (ev) 244 if (ev)
147 event ((W)w, ev); 245 event ((W)w, ev);
148 } 246 }
149} 247}
150 248
249/*****************************************************************************/
250
251static int *fdchanges;
252static int fdchangemax, fdchangecnt;
253
151static void 254static void
152queue_events (W *events, int eventcnt, int type) 255fd_reify (void)
153{ 256{
154 int i; 257 int i;
155 258
156 for (i = 0; i < eventcnt; ++i) 259 for (i = 0; i < fdchangecnt; ++i)
157 event (events [i], type); 260 {
261 int fd = fdchanges [i];
262 ANFD *anfd = anfds + fd;
263 struct ev_io *w;
264
265 int events = 0;
266
267 for (w = anfd->head; w; w = w->next)
268 events |= w->events;
269
270 anfd->reify = 0;
271
272 if (anfd->events != events)
273 {
274 method_modify (fd, anfd->events, events);
275 anfd->events = events;
276 }
277 }
278
279 fdchangecnt = 0;
280}
281
282static void
283fd_change (int fd)
284{
285 if (anfds [fd].reify || fdchangecnt < 0)
286 return;
287
288 anfds [fd].reify = 1;
289
290 ++fdchangecnt;
291 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
292 fdchanges [fdchangecnt - 1] = fd;
293}
294
295static void
296fd_kill (int fd)
297{
298 struct ev_io *w;
299
300 printf ("killing fd %d\n", fd);//D
301 while ((w = anfds [fd].head))
302 {
303 ev_io_stop (w);
304 event ((W)w, EV_ERROR | EV_READ | EV_WRITE);
305 }
306}
307
308/* called on EBADF to verify fds */
309static void
310fd_ebadf (void)
311{
312 int fd;
313
314 for (fd = 0; fd < anfdmax; ++fd)
315 if (anfds [fd].events)
316 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
317 fd_kill (fd);
318}
319
320/* called on ENOMEM in select/poll to kill some fds and retry */
321static void
322fd_enomem (void)
323{
324 int fd = anfdmax;
325
326 while (fd--)
327 if (anfds [fd].events)
328 {
329 close (fd);
330 fd_kill (fd);
331 return;
332 }
158} 333}
159 334
160/*****************************************************************************/ 335/*****************************************************************************/
161 336
162static struct ev_timer **timers; 337static struct ev_timer **timers;
209/*****************************************************************************/ 384/*****************************************************************************/
210 385
211typedef struct 386typedef struct
212{ 387{
213 struct ev_signal *head; 388 struct ev_signal *head;
214 sig_atomic_t gotsig; 389 sig_atomic_t volatile gotsig;
215} ANSIG; 390} ANSIG;
216 391
217static ANSIG *signals; 392static ANSIG *signals;
218static int signalmax; 393static int signalmax;
219 394
220static int sigpipe [2]; 395static int sigpipe [2];
221static sig_atomic_t gotsig; 396static sig_atomic_t volatile gotsig;
222static struct ev_io sigev; 397static struct ev_io sigev;
223 398
224static void 399static void
225signals_init (ANSIG *base, int count) 400signals_init (ANSIG *base, int count)
226{ 401{
227 while (count--) 402 while (count--)
228 { 403 {
229 base->head = 0; 404 base->head = 0;
230 base->gotsig = 0; 405 base->gotsig = 0;
406
231 ++base; 407 ++base;
232 } 408 }
233} 409}
234 410
235static void 411static void
238 signals [signum - 1].gotsig = 1; 414 signals [signum - 1].gotsig = 1;
239 415
240 if (!gotsig) 416 if (!gotsig)
241 { 417 {
242 gotsig = 1; 418 gotsig = 1;
243 write (sigpipe [1], &gotsig, 1); 419 write (sigpipe [1], &signum, 1);
244 } 420 }
245} 421}
246 422
247static void 423static void
248sigcb (struct ev_io *iow, int revents) 424sigcb (struct ev_io *iow, int revents)
249{ 425{
250 struct ev_signal *w; 426 struct ev_signal *w;
251 int sig; 427 int signum;
252 428
429 read (sigpipe [0], &revents, 1);
253 gotsig = 0; 430 gotsig = 0;
254 read (sigpipe [0], &revents, 1);
255 431
256 for (sig = signalmax; sig--; ) 432 for (signum = signalmax; signum--; )
257 if (signals [sig].gotsig) 433 if (signals [signum].gotsig)
258 { 434 {
259 signals [sig].gotsig = 0; 435 signals [signum].gotsig = 0;
260 436
261 for (w = signals [sig].head; w; w = w->next) 437 for (w = signals [signum].head; w; w = w->next)
262 event ((W)w, EV_SIGNAL); 438 event ((W)w, EV_SIGNAL);
263 } 439 }
264} 440}
265 441
266static void 442static void
267siginit (void) 443siginit (void)
268{ 444{
445#ifndef WIN32
269 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 446 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
270 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 447 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
271 448
272 /* rather than sort out wether we really need nb, set it */ 449 /* rather than sort out wether we really need nb, set it */
273 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 450 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
274 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 451 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
452#endif
275 453
276 evio_set (&sigev, sigpipe [0], EV_READ); 454 ev_io_set (&sigev, sigpipe [0], EV_READ);
277 evio_start (&sigev); 455 ev_io_start (&sigev);
278} 456}
279 457
280/*****************************************************************************/ 458/*****************************************************************************/
281 459
282static struct ev_idle **idles; 460static struct ev_idle **idles;
283static int idlemax, idlecnt; 461static int idlemax, idlecnt;
284 462
463static struct ev_prepare **prepares;
464static int preparemax, preparecnt;
465
285static struct ev_check **checks; 466static struct ev_check **checks;
286static int checkmax, checkcnt; 467static int checkmax, checkcnt;
287 468
288/*****************************************************************************/ 469/*****************************************************************************/
289 470
471static struct ev_child *childs [PID_HASHSIZE];
472static struct ev_signal childev;
473
474#ifndef WIN32
475
476#ifndef WCONTINUED
477# define WCONTINUED 0
478#endif
479
480static void
481childcb (struct ev_signal *sw, int revents)
482{
483 struct ev_child *w;
484 int pid, status;
485
486 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1)
487 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next)
488 if (w->pid == pid || !w->pid)
489 {
490 w->status = status;
491 event ((W)w, EV_CHILD);
492 }
493}
494
495#endif
496
497/*****************************************************************************/
498
499#if EV_USE_KQUEUE
500# include "ev_kqueue.c"
501#endif
290#if HAVE_EPOLL 502#if EV_USE_EPOLL
291# include "ev_epoll.c" 503# include "ev_epoll.c"
292#endif 504#endif
505#if EV_USE_POLL
506# include "ev_poll.c"
507#endif
293#if HAVE_SELECT 508#if EV_USE_SELECT
294# include "ev_select.c" 509# include "ev_select.c"
295#endif 510#endif
296 511
512int
513ev_version_major (void)
514{
515 return EV_VERSION_MAJOR;
516}
517
518int
519ev_version_minor (void)
520{
521 return EV_VERSION_MINOR;
522}
523
524/* return true if we are running with elevated privileges and ignore env variables */
525static int
526enable_secure ()
527{
528 return getuid () != geteuid ()
529 || getgid () != getegid ();
530}
531
297int ev_init (int flags) 532int ev_init (int methods)
298{ 533{
299#if HAVE_MONOTONIC
300 {
301 struct timespec ts;
302 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
303 have_monotonic = 1;
304 }
305#endif
306
307 ev_now = ev_time ();
308 now = get_clock ();
309 diff = ev_now - now;
310
311 if (pipe (sigpipe))
312 return 0;
313
314 ev_method = EVMETHOD_NONE;
315#if HAVE_EPOLL
316 if (ev_method == EVMETHOD_NONE) epoll_init (flags);
317#endif
318#if HAVE_SELECT
319 if (ev_method == EVMETHOD_NONE) select_init (flags);
320#endif
321
322 if (ev_method) 534 if (!ev_method)
535 {
536#if EV_USE_MONOTONIC
323 { 537 {
538 struct timespec ts;
539 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
540 have_monotonic = 1;
541 }
542#endif
543
544 ev_now = ev_time ();
545 now = get_clock ();
546 now_floor = now;
547 diff = ev_now - now;
548
549 if (pipe (sigpipe))
550 return 0;
551
552 if (methods == EVMETHOD_AUTO)
553 if (!enable_secure () && getenv ("LIBEV_METHODS"))
554 methods = atoi (getenv ("LIBEV_METHODS"));
555 else
556 methods = EVMETHOD_ANY;
557
558 ev_method = 0;
559#if EV_USE_KQUEUE
560 if (!ev_method && (methods & EVMETHOD_KQUEUE)) kqueue_init (methods);
561#endif
562#if EV_USE_EPOLL
563 if (!ev_method && (methods & EVMETHOD_EPOLL )) epoll_init (methods);
564#endif
565#if EV_USE_POLL
566 if (!ev_method && (methods & EVMETHOD_POLL )) poll_init (methods);
567#endif
568#if EV_USE_SELECT
569 if (!ev_method && (methods & EVMETHOD_SELECT)) select_init (methods);
570#endif
571
572 if (ev_method)
573 {
324 evw_init (&sigev, sigcb); 574 ev_watcher_init (&sigev, sigcb);
325 siginit (); 575 siginit ();
576
577#ifndef WIN32
578 ev_signal_init (&childev, childcb, SIGCHLD);
579 ev_signal_start (&childev);
580#endif
581 }
326 } 582 }
327 583
328 return ev_method; 584 return ev_method;
329} 585}
330 586
331/*****************************************************************************/ 587/*****************************************************************************/
332 588
333void ev_prefork (void) 589void
590ev_fork_prepare (void)
334{ 591{
335 /* nop */ 592 /* nop */
336} 593}
337 594
595void
338void ev_postfork_parent (void) 596ev_fork_parent (void)
339{ 597{
340 /* nop */ 598 /* nop */
341} 599}
342 600
601void
343void ev_postfork_child (void) 602ev_fork_child (void)
344{ 603{
345#if HAVE_EPOLL 604#if EV_USE_EPOLL
346 if (ev_method == EVMETHOD_EPOLL) 605 if (ev_method == EVMETHOD_EPOLL)
347 epoll_postfork_child (); 606 epoll_postfork_child ();
348#endif 607#endif
349 608
350 evio_stop (&sigev); 609 ev_io_stop (&sigev);
351 close (sigpipe [0]); 610 close (sigpipe [0]);
352 close (sigpipe [1]); 611 close (sigpipe [1]);
353 pipe (sigpipe); 612 pipe (sigpipe);
354 siginit (); 613 siginit ();
355} 614}
356 615
357/*****************************************************************************/ 616/*****************************************************************************/
358 617
359static void 618static void
360fd_reify (void) 619call_pending (void)
361{ 620{
362 int i; 621 int pri;
363 622
364 for (i = 0; i < fdchangecnt; ++i) 623 for (pri = NUMPRI; pri--; )
365 { 624 while (pendingcnt [pri])
366 int fd = fdchanges [i];
367 ANFD *anfd = anfds + fd;
368 struct ev_io *w;
369
370 int wev = 0;
371
372 for (w = anfd->head; w; w = w->next)
373 wev |= w->events;
374
375 if (anfd->wev != wev)
376 { 625 {
377 method_modify (fd, anfd->wev, wev); 626 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
378 anfd->wev = wev;
379 }
380 }
381 627
382 fdchangecnt = 0;
383}
384
385static void
386call_pending ()
387{
388 int i;
389
390 for (i = 0; i < pendingcnt; ++i)
391 {
392 ANPENDING *p = pendings + i;
393
394 if (p->w) 628 if (p->w)
395 { 629 {
396 p->w->pending = 0; 630 p->w->pending = 0;
397 p->w->cb (p->w, p->events); 631 p->w->cb (p->w, p->events);
398 } 632 }
399 } 633 }
400
401 pendingcnt = 0;
402} 634}
403 635
404static void 636static void
405timers_reify () 637timers_reify (void)
406{ 638{
407 while (timercnt && timers [0]->at <= now) 639 while (timercnt && timers [0]->at <= now)
408 { 640 {
409 struct ev_timer *w = timers [0]; 641 struct ev_timer *w = timers [0];
410 642
411 /* first reschedule or stop timer */ 643 /* first reschedule or stop timer */
412 if (w->repeat) 644 if (w->repeat)
413 { 645 {
646 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
414 w->at = now + w->repeat; 647 w->at = now + w->repeat;
415 assert (("timer timeout in the past, negative repeat?", w->at > now));
416 downheap ((WT *)timers, timercnt, 0); 648 downheap ((WT *)timers, timercnt, 0);
417 } 649 }
418 else 650 else
419 evtimer_stop (w); /* nonrepeating: stop timer */ 651 ev_timer_stop (w); /* nonrepeating: stop timer */
420 652
421 event ((W)w, EV_TIMEOUT); 653 event ((W)w, EV_TIMEOUT);
422 } 654 }
423} 655}
424 656
425static void 657static void
426periodics_reify () 658periodics_reify (void)
427{ 659{
428 while (periodiccnt && periodics [0]->at <= ev_now) 660 while (periodiccnt && periodics [0]->at <= ev_now)
429 { 661 {
430 struct ev_periodic *w = periodics [0]; 662 struct ev_periodic *w = periodics [0];
431 663
432 /* first reschedule or stop timer */ 664 /* first reschedule or stop timer */
433 if (w->interval) 665 if (w->interval)
434 { 666 {
435 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 667 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval;
436 assert (("periodic timeout in the past, negative interval?", w->at > ev_now)); 668 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now));
437 downheap ((WT *)periodics, periodiccnt, 0); 669 downheap ((WT *)periodics, periodiccnt, 0);
438 } 670 }
439 else 671 else
440 evperiodic_stop (w); /* nonrepeating: stop timer */ 672 ev_periodic_stop (w); /* nonrepeating: stop timer */
441 673
442 event ((W)w, EV_TIMEOUT); 674 event ((W)w, EV_PERIODIC);
443 } 675 }
444} 676}
445 677
446static void 678static void
447periodics_reschedule (ev_tstamp diff) 679periodics_reschedule (ev_tstamp diff)
457 { 689 {
458 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 690 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval;
459 691
460 if (fabs (diff) >= 1e-4) 692 if (fabs (diff) >= 1e-4)
461 { 693 {
462 evperiodic_stop (w); 694 ev_periodic_stop (w);
463 evperiodic_start (w); 695 ev_periodic_start (w);
464 696
465 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 697 i = 0; /* restart loop, inefficient, but time jumps should be rare */
466 } 698 }
467 } 699 }
468 } 700 }
469} 701}
470 702
471static void 703static int
704time_update_monotonic (void)
705{
706 now = get_clock ();
707
708 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5))
709 {
710 ev_now = now + diff;
711 return 0;
712 }
713 else
714 {
715 now_floor = now;
716 ev_now = ev_time ();
717 return 1;
718 }
719}
720
721static void
472time_update () 722time_update (void)
473{ 723{
474 int i; 724 int i;
475 725
476 ev_now = ev_time (); 726#if EV_USE_MONOTONIC
477
478 if (have_monotonic) 727 if (expect_true (have_monotonic))
479 { 728 {
729 if (time_update_monotonic ())
730 {
480 ev_tstamp odiff = diff; 731 ev_tstamp odiff = diff;
481 732
482 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 733 for (i = 4; --i; ) /* loop a few times, before making important decisions */
483 { 734 {
484 now = get_clock ();
485 diff = ev_now - now; 735 diff = ev_now - now;
486 736
487 if (fabs (odiff - diff) < MIN_TIMEJUMP) 737 if (fabs (odiff - diff) < MIN_TIMEJUMP)
488 return; /* all is well */ 738 return; /* all is well */
489 739
490 ev_now = ev_time (); 740 ev_now = ev_time ();
741 now = get_clock ();
742 now_floor = now;
491 } 743 }
492 744
493 periodics_reschedule (diff - odiff); 745 periodics_reschedule (diff - odiff);
494 /* no timer adjustment, as the monotonic clock doesn't jump */ 746 /* no timer adjustment, as the monotonic clock doesn't jump */
747 }
495 } 748 }
496 else 749 else
750#endif
497 { 751 {
752 ev_now = ev_time ();
753
498 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 754 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
499 { 755 {
500 periodics_reschedule (ev_now - now); 756 periodics_reschedule (ev_now - now);
501 757
502 /* adjust timers. this is easy, as the offset is the same for all */ 758 /* adjust timers. this is easy, as the offset is the same for all */
503 for (i = 0; i < timercnt; ++i) 759 for (i = 0; i < timercnt; ++i)
511int ev_loop_done; 767int ev_loop_done;
512 768
513void ev_loop (int flags) 769void ev_loop (int flags)
514{ 770{
515 double block; 771 double block;
516 ev_loop_done = flags & EVLOOP_ONESHOT ? 1 : 0; 772 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
517
518 if (checkcnt)
519 {
520 queue_events ((W *)checks, checkcnt, EV_CHECK);
521 call_pending ();
522 }
523 773
524 do 774 do
525 { 775 {
776 /* queue check watchers (and execute them) */
777 if (expect_false (preparecnt))
778 {
779 queue_events ((W *)prepares, preparecnt, EV_PREPARE);
780 call_pending ();
781 }
782
526 /* update fd-related kernel structures */ 783 /* update fd-related kernel structures */
527 fd_reify (); 784 fd_reify ();
528 785
529 /* calculate blocking time */ 786 /* calculate blocking time */
530 787
531 /* we only need this for !monotonic clock, but as we always have timers, we just calculate it every time */ 788 /* we only need this for !monotonic clockor timers, but as we basically
789 always have timers, we just calculate it always */
790#if EV_USE_MONOTONIC
791 if (expect_true (have_monotonic))
792 time_update_monotonic ();
793 else
794#endif
795 {
532 ev_now = ev_time (); 796 ev_now = ev_time ();
797 now = ev_now;
798 }
533 799
534 if (flags & EVLOOP_NONBLOCK || idlecnt) 800 if (flags & EVLOOP_NONBLOCK || idlecnt)
535 block = 0.; 801 block = 0.;
536 else 802 else
537 { 803 {
538 block = MAX_BLOCKTIME; 804 block = MAX_BLOCKTIME;
539 805
540 if (timercnt) 806 if (timercnt)
541 { 807 {
542 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 808 ev_tstamp to = timers [0]->at - now + method_fudge;
543 if (block > to) block = to; 809 if (block > to) block = to;
544 } 810 }
545 811
546 if (periodiccnt) 812 if (periodiccnt)
547 { 813 {
556 822
557 /* update ev_now, do magic */ 823 /* update ev_now, do magic */
558 time_update (); 824 time_update ();
559 825
560 /* queue pending timers and reschedule them */ 826 /* queue pending timers and reschedule them */
827 timers_reify (); /* relative timers called last */
561 periodics_reify (); /* absolute timers first */ 828 periodics_reify (); /* absolute timers called first */
562 timers_reify (); /* relative timers second */
563 829
564 /* queue idle watchers unless io or timers are pending */ 830 /* queue idle watchers unless io or timers are pending */
565 if (!pendingcnt) 831 if (!pendingcnt)
566 queue_events ((W *)idles, idlecnt, EV_IDLE); 832 queue_events ((W *)idles, idlecnt, EV_IDLE);
567 833
568 /* queue check and possibly idle watchers */ 834 /* queue check watchers, to be executed first */
835 if (checkcnt)
569 queue_events ((W *)checks, checkcnt, EV_CHECK); 836 queue_events ((W *)checks, checkcnt, EV_CHECK);
570 837
571 call_pending (); 838 call_pending ();
572 } 839 }
573 while (!ev_loop_done); 840 while (!ev_loop_done);
574 841
599 head = &(*head)->next; 866 head = &(*head)->next;
600 } 867 }
601} 868}
602 869
603static void 870static void
871ev_clear_pending (W w)
872{
873 if (w->pending)
874 {
875 pendings [ABSPRI (w)][w->pending - 1].w = 0;
876 w->pending = 0;
877 }
878}
879
880static void
604ev_start (W w, int active) 881ev_start (W w, int active)
605{ 882{
606 w->pending = 0; 883 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
884 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
885
607 w->active = active; 886 w->active = active;
608} 887}
609 888
610static void 889static void
611ev_stop (W w) 890ev_stop (W w)
612{ 891{
613 if (w->pending)
614 pendings [w->pending - 1].w = 0;
615
616 w->active = 0; 892 w->active = 0;
617} 893}
618 894
619/*****************************************************************************/ 895/*****************************************************************************/
620 896
621void 897void
622evio_start (struct ev_io *w) 898ev_io_start (struct ev_io *w)
623{ 899{
900 int fd = w->fd;
901
624 if (ev_is_active (w)) 902 if (ev_is_active (w))
625 return; 903 return;
626 904
627 int fd = w->fd; 905 assert (("ev_io_start called with negative fd", fd >= 0));
628 906
629 ev_start ((W)w, 1); 907 ev_start ((W)w, 1);
630 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 908 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
631 wlist_add ((WL *)&anfds[fd].head, (WL)w); 909 wlist_add ((WL *)&anfds[fd].head, (WL)w);
632 910
633 ++fdchangecnt; 911 fd_change (fd);
634 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
635 fdchanges [fdchangecnt - 1] = fd;
636} 912}
637 913
638void 914void
639evio_stop (struct ev_io *w) 915ev_io_stop (struct ev_io *w)
640{ 916{
917 ev_clear_pending ((W)w);
641 if (!ev_is_active (w)) 918 if (!ev_is_active (w))
642 return; 919 return;
643 920
644 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 921 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
645 ev_stop ((W)w); 922 ev_stop ((W)w);
646 923
647 ++fdchangecnt; 924 fd_change (w->fd);
648 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
649 fdchanges [fdchangecnt - 1] = w->fd;
650} 925}
651 926
652
653void 927void
654evtimer_start (struct ev_timer *w) 928ev_timer_start (struct ev_timer *w)
655{ 929{
656 if (ev_is_active (w)) 930 if (ev_is_active (w))
657 return; 931 return;
658 932
659 w->at += now; 933 w->at += now;
660 934
661 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 935 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
662 936
663 ev_start ((W)w, ++timercnt); 937 ev_start ((W)w, ++timercnt);
664 array_needsize (timers, timermax, timercnt, ); 938 array_needsize (timers, timermax, timercnt, );
665 timers [timercnt - 1] = w; 939 timers [timercnt - 1] = w;
666 upheap ((WT *)timers, timercnt - 1); 940 upheap ((WT *)timers, timercnt - 1);
667} 941}
668 942
669void 943void
670evtimer_stop (struct ev_timer *w) 944ev_timer_stop (struct ev_timer *w)
671{ 945{
946 ev_clear_pending ((W)w);
672 if (!ev_is_active (w)) 947 if (!ev_is_active (w))
673 return; 948 return;
674 949
675 if (w->active < timercnt--) 950 if (w->active < timercnt--)
676 { 951 {
682 957
683 ev_stop ((W)w); 958 ev_stop ((W)w);
684} 959}
685 960
686void 961void
687evtimer_again (struct ev_timer *w) 962ev_timer_again (struct ev_timer *w)
688{ 963{
689 if (ev_is_active (w)) 964 if (ev_is_active (w))
690 { 965 {
691 if (w->repeat) 966 if (w->repeat)
692 { 967 {
693 w->at = now + w->repeat; 968 w->at = now + w->repeat;
694 downheap ((WT *)timers, timercnt, w->active - 1); 969 downheap ((WT *)timers, timercnt, w->active - 1);
695 } 970 }
696 else 971 else
697 evtimer_stop (w); 972 ev_timer_stop (w);
698 } 973 }
699 else if (w->repeat) 974 else if (w->repeat)
700 evtimer_start (w); 975 ev_timer_start (w);
701} 976}
702 977
703void 978void
704evperiodic_start (struct ev_periodic *w) 979ev_periodic_start (struct ev_periodic *w)
705{ 980{
706 if (ev_is_active (w)) 981 if (ev_is_active (w))
707 return; 982 return;
708 983
709 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 984 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
710 985
711 /* this formula differs from the one in periodic_reify because we do not always round up */ 986 /* this formula differs from the one in periodic_reify because we do not always round up */
712 if (w->interval) 987 if (w->interval)
713 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 988 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval;
714 989
717 periodics [periodiccnt - 1] = w; 992 periodics [periodiccnt - 1] = w;
718 upheap ((WT *)periodics, periodiccnt - 1); 993 upheap ((WT *)periodics, periodiccnt - 1);
719} 994}
720 995
721void 996void
722evperiodic_stop (struct ev_periodic *w) 997ev_periodic_stop (struct ev_periodic *w)
723{ 998{
999 ev_clear_pending ((W)w);
724 if (!ev_is_active (w)) 1000 if (!ev_is_active (w))
725 return; 1001 return;
726 1002
727 if (w->active < periodiccnt--) 1003 if (w->active < periodiccnt--)
728 { 1004 {
732 1008
733 ev_stop ((W)w); 1009 ev_stop ((W)w);
734} 1010}
735 1011
736void 1012void
737evsignal_start (struct ev_signal *w) 1013ev_signal_start (struct ev_signal *w)
738{ 1014{
739 if (ev_is_active (w)) 1015 if (ev_is_active (w))
740 return; 1016 return;
1017
1018 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
741 1019
742 ev_start ((W)w, 1); 1020 ev_start ((W)w, 1);
743 array_needsize (signals, signalmax, w->signum, signals_init); 1021 array_needsize (signals, signalmax, w->signum, signals_init);
744 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1022 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
745 1023
752 sigaction (w->signum, &sa, 0); 1030 sigaction (w->signum, &sa, 0);
753 } 1031 }
754} 1032}
755 1033
756void 1034void
757evsignal_stop (struct ev_signal *w) 1035ev_signal_stop (struct ev_signal *w)
758{ 1036{
1037 ev_clear_pending ((W)w);
759 if (!ev_is_active (w)) 1038 if (!ev_is_active (w))
760 return; 1039 return;
761 1040
762 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1041 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
763 ev_stop ((W)w); 1042 ev_stop ((W)w);
764 1043
765 if (!signals [w->signum - 1].head) 1044 if (!signals [w->signum - 1].head)
766 signal (w->signum, SIG_DFL); 1045 signal (w->signum, SIG_DFL);
767} 1046}
768 1047
1048void
769void evidle_start (struct ev_idle *w) 1049ev_idle_start (struct ev_idle *w)
770{ 1050{
771 if (ev_is_active (w)) 1051 if (ev_is_active (w))
772 return; 1052 return;
773 1053
774 ev_start ((W)w, ++idlecnt); 1054 ev_start ((W)w, ++idlecnt);
775 array_needsize (idles, idlemax, idlecnt, ); 1055 array_needsize (idles, idlemax, idlecnt, );
776 idles [idlecnt - 1] = w; 1056 idles [idlecnt - 1] = w;
777} 1057}
778 1058
1059void
779void evidle_stop (struct ev_idle *w) 1060ev_idle_stop (struct ev_idle *w)
780{ 1061{
1062 ev_clear_pending ((W)w);
1063 if (ev_is_active (w))
1064 return;
1065
781 idles [w->active - 1] = idles [--idlecnt]; 1066 idles [w->active - 1] = idles [--idlecnt];
782 ev_stop ((W)w); 1067 ev_stop ((W)w);
783} 1068}
784 1069
1070void
1071ev_prepare_start (struct ev_prepare *w)
1072{
1073 if (ev_is_active (w))
1074 return;
1075
1076 ev_start ((W)w, ++preparecnt);
1077 array_needsize (prepares, preparemax, preparecnt, );
1078 prepares [preparecnt - 1] = w;
1079}
1080
1081void
1082ev_prepare_stop (struct ev_prepare *w)
1083{
1084 ev_clear_pending ((W)w);
1085 if (ev_is_active (w))
1086 return;
1087
1088 prepares [w->active - 1] = prepares [--preparecnt];
1089 ev_stop ((W)w);
1090}
1091
1092void
785void evcheck_start (struct ev_check *w) 1093ev_check_start (struct ev_check *w)
786{ 1094{
787 if (ev_is_active (w)) 1095 if (ev_is_active (w))
788 return; 1096 return;
789 1097
790 ev_start ((W)w, ++checkcnt); 1098 ev_start ((W)w, ++checkcnt);
791 array_needsize (checks, checkmax, checkcnt, ); 1099 array_needsize (checks, checkmax, checkcnt, );
792 checks [checkcnt - 1] = w; 1100 checks [checkcnt - 1] = w;
793} 1101}
794 1102
1103void
795void evcheck_stop (struct ev_check *w) 1104ev_check_stop (struct ev_check *w)
796{ 1105{
1106 ev_clear_pending ((W)w);
1107 if (ev_is_active (w))
1108 return;
1109
797 checks [w->active - 1] = checks [--checkcnt]; 1110 checks [w->active - 1] = checks [--checkcnt];
798 ev_stop ((W)w); 1111 ev_stop ((W)w);
799} 1112}
800 1113
1114void
1115ev_child_start (struct ev_child *w)
1116{
1117 if (ev_is_active (w))
1118 return;
1119
1120 ev_start ((W)w, 1);
1121 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1122}
1123
1124void
1125ev_child_stop (struct ev_child *w)
1126{
1127 ev_clear_pending ((W)w);
1128 if (ev_is_active (w))
1129 return;
1130
1131 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1132 ev_stop ((W)w);
1133}
1134
1135/*****************************************************************************/
1136
1137struct ev_once
1138{
1139 struct ev_io io;
1140 struct ev_timer to;
1141 void (*cb)(int revents, void *arg);
1142 void *arg;
1143};
1144
1145static void
1146once_cb (struct ev_once *once, int revents)
1147{
1148 void (*cb)(int revents, void *arg) = once->cb;
1149 void *arg = once->arg;
1150
1151 ev_io_stop (&once->io);
1152 ev_timer_stop (&once->to);
1153 free (once);
1154
1155 cb (revents, arg);
1156}
1157
1158static void
1159once_cb_io (struct ev_io *w, int revents)
1160{
1161 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1162}
1163
1164static void
1165once_cb_to (struct ev_timer *w, int revents)
1166{
1167 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1168}
1169
1170void
1171ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1172{
1173 struct ev_once *once = malloc (sizeof (struct ev_once));
1174
1175 if (!once)
1176 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1177 else
1178 {
1179 once->cb = cb;
1180 once->arg = arg;
1181
1182 ev_watcher_init (&once->io, once_cb_io);
1183 if (fd >= 0)
1184 {
1185 ev_io_set (&once->io, fd, events);
1186 ev_io_start (&once->io);
1187 }
1188
1189 ev_watcher_init (&once->to, once_cb_to);
1190 if (timeout >= 0.)
1191 {
1192 ev_timer_set (&once->to, timeout, 0.);
1193 ev_timer_start (&once->to);
1194 }
1195 }
1196}
1197
801/*****************************************************************************/ 1198/*****************************************************************************/
802 1199
803#if 0 1200#if 0
804 1201
805struct ev_io wio; 1202struct ev_io wio;
812 1209
813static void 1210static void
814ocb (struct ev_timer *w, int revents) 1211ocb (struct ev_timer *w, int revents)
815{ 1212{
816 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data); 1213 //fprintf (stderr, "timer %f,%f (%x) (%f) d%p\n", w->at, w->repeat, revents, w->at - ev_time (), w->data);
817 evtimer_stop (w); 1214 ev_timer_stop (w);
818 evtimer_start (w); 1215 ev_timer_start (w);
819} 1216}
820 1217
821static void 1218static void
822scb (struct ev_signal *w, int revents) 1219scb (struct ev_signal *w, int revents)
823{ 1220{
824 fprintf (stderr, "signal %x,%d\n", revents, w->signum); 1221 fprintf (stderr, "signal %x,%d\n", revents, w->signum);
825 evio_stop (&wio); 1222 ev_io_stop (&wio);
826 evio_start (&wio); 1223 ev_io_start (&wio);
827} 1224}
828 1225
829static void 1226static void
830gcb (struct ev_signal *w, int revents) 1227gcb (struct ev_signal *w, int revents)
831{ 1228{
835 1232
836int main (void) 1233int main (void)
837{ 1234{
838 ev_init (0); 1235 ev_init (0);
839 1236
840 evio_init (&wio, sin_cb, 0, EV_READ); 1237 ev_io_init (&wio, sin_cb, 0, EV_READ);
841 evio_start (&wio); 1238 ev_io_start (&wio);
842 1239
843 struct ev_timer t[10000]; 1240 struct ev_timer t[10000];
844 1241
845#if 0 1242#if 0
846 int i; 1243 int i;
847 for (i = 0; i < 10000; ++i) 1244 for (i = 0; i < 10000; ++i)
848 { 1245 {
849 struct ev_timer *w = t + i; 1246 struct ev_timer *w = t + i;
850 evw_init (w, ocb, i); 1247 ev_watcher_init (w, ocb, i);
851 evtimer_init_abs (w, ocb, drand48 (), 0.99775533); 1248 ev_timer_init_abs (w, ocb, drand48 (), 0.99775533);
852 evtimer_start (w); 1249 ev_timer_start (w);
853 if (drand48 () < 0.5) 1250 if (drand48 () < 0.5)
854 evtimer_stop (w); 1251 ev_timer_stop (w);
855 } 1252 }
856#endif 1253#endif
857 1254
858 struct ev_timer t1; 1255 struct ev_timer t1;
859 evtimer_init (&t1, ocb, 5, 10); 1256 ev_timer_init (&t1, ocb, 5, 10);
860 evtimer_start (&t1); 1257 ev_timer_start (&t1);
861 1258
862 struct ev_signal sig; 1259 struct ev_signal sig;
863 evsignal_init (&sig, scb, SIGQUIT); 1260 ev_signal_init (&sig, scb, SIGQUIT);
864 evsignal_start (&sig); 1261 ev_signal_start (&sig);
865 1262
866 struct ev_check cw; 1263 struct ev_check cw;
867 evcheck_init (&cw, gcb); 1264 ev_check_init (&cw, gcb);
868 evcheck_start (&cw); 1265 ev_check_start (&cw);
869 1266
870 struct ev_idle iw; 1267 struct ev_idle iw;
871 evidle_init (&iw, gcb); 1268 ev_idle_init (&iw, gcb);
872 evidle_start (&iw); 1269 ev_idle_start (&iw);
873 1270
874 ev_loop (0); 1271 ev_loop (0);
875 1272
876 return 0; 1273 return 0;
877} 1274}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines