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

Comparing libev/ev.c (file contents):
Revision 1.25 by root, Wed Oct 31 21:34:45 2007 UTC vs.
Revision 1.101 by root, Sun Nov 11 04:04:23 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines