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

Comparing libev/ev.c (file contents):
Revision 1.28 by root, Thu Nov 1 06:48:49 2007 UTC vs.
Revision 1.104 by root, Mon Nov 12 00:39:45 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines