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

Comparing libev/ev.c (file contents):
Revision 1.31 by root, Thu Nov 1 09:05:33 2007 UTC vs.
Revision 1.90 by root, Sun Nov 11 00:05:59 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines