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

Comparing libev/ev.c (file contents):
Revision 1.70 by root, Tue Nov 6 00:52:32 2007 UTC vs.
Revision 1.152 by root, Wed Nov 28 11:15:55 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (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
29 * 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.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
97# endif
98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
53# endif 105# endif
54 106
55#endif 107#endif
56 108
57#include <math.h> 109#include <math.h>
58#include <stdlib.h> 110#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 111#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 112#include <stddef.h>
63 113
64#include <stdio.h> 114#include <stdio.h>
65 115
66#include <assert.h> 116#include <assert.h>
67#include <errno.h> 117#include <errno.h>
68#include <sys/types.h> 118#include <sys/types.h>
119#include <time.h>
120
121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
128
69#ifndef WIN32 129#ifndef _WIN32
130# include <sys/time.h>
70# include <sys/wait.h> 131# include <sys/wait.h>
132# include <unistd.h>
133#else
134# define WIN32_LEAN_AND_MEAN
135# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1
71#endif 138# endif
72#include <sys/time.h> 139#endif
73#include <time.h>
74 140
75/**/ 141/**/
76 142
77#ifndef EV_USE_MONOTONIC 143#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 144# define EV_USE_MONOTONIC 0
145#endif
146
147#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0
79#endif 149#endif
80 150
81#ifndef EV_USE_SELECT 151#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 152# define EV_USE_SELECT 1
83#endif 153#endif
84 154
85#ifndef EV_USE_POLL 155#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 156# ifdef _WIN32
157# define EV_USE_POLL 0
158# else
159# define EV_USE_POLL 1
160# endif
87#endif 161#endif
88 162
89#ifndef EV_USE_EPOLL 163#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 164# define EV_USE_EPOLL 0
91#endif 165#endif
92 166
93#ifndef EV_USE_KQUEUE 167#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 168# define EV_USE_KQUEUE 0
95#endif 169#endif
96 170
171#ifndef EV_USE_PORT
172# define EV_USE_PORT 0
173#endif
174
97#ifndef EV_USE_WIN32 175#ifndef EV_USE_INOTIFY
98# ifdef WIN32 176# define EV_USE_INOTIFY 0
99# define EV_USE_WIN32 1 177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
100# else 182# else
101# define EV_USE_WIN32 0 183# define EV_PID_HASHSIZE 16
102# endif 184# endif
103#endif 185#endif
104 186
105#ifndef EV_USE_REALTIME 187#ifndef EV_INOTIFY_HASHSIZE
106# define EV_USE_REALTIME 1 188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
107#endif 193#endif
108 194
109/**/ 195/**/
110 196
111#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
116#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
119#endif 205#endif
120 206
207#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
121/**/ 219/**/
122 220
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127
128#include "ev.h"
129 224
130#if __GNUC__ >= 3 225#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
132# define inline inline 229# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
133#else 235#else
134# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
237# define inline_speed static
135# define inline static 238# define inline_size static
239# define noinline
136#endif 240#endif
137 241
138#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
139#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
140 244
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 247
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */
250
144typedef struct ev_watcher *W; 251typedef ev_watcher *W;
145typedef struct ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
147 254
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 256
150#if WIN32 257#ifdef _WIN32
151/* note: the comment below could not be substantiated, but what would I care */ 258# include "ev_win32.c"
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif 259#endif
155 260
156/*****************************************************************************/ 261/*****************************************************************************/
157 262
158static void (*syserr_cb)(const char *msg); 263static void (*syserr_cb)(const char *msg);
159 264
265void
160void ev_set_syserr_cb (void (*cb)(const char *msg)) 266ev_set_syserr_cb (void (*cb)(const char *msg))
161{ 267{
162 syserr_cb = cb; 268 syserr_cb = cb;
163} 269}
164 270
165static void 271static void noinline
166syserr (const char *msg) 272syserr (const char *msg)
167{ 273{
168 if (!msg) 274 if (!msg)
169 msg = "(libev) system error"; 275 msg = "(libev) system error";
170 276
175 perror (msg); 281 perror (msg);
176 abort (); 282 abort ();
177 } 283 }
178} 284}
179 285
180static void *(*alloc)(void *ptr, long size); 286static void *(*alloc)(void *ptr, size_t size) = realloc;
181 287
288void
182void ev_set_allocator (void *(*cb)(void *ptr, long size)) 289ev_set_allocator (void *(*cb)(void *ptr, size_t size))
183{ 290{
184 alloc = cb; 291 alloc = cb;
185} 292}
186 293
187static void * 294inline_speed void *
188ev_realloc (void *ptr, long size) 295ev_realloc (void *ptr, size_t size)
189{ 296{
190 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size); 297 ptr = alloc (ptr, size);
191 298
192 if (!ptr && size) 299 if (!ptr && size)
193 { 300 {
194 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size); 301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size);
195 abort (); 302 abort ();
196 } 303 }
197 304
198 return ptr; 305 return ptr;
199} 306}
206typedef struct 313typedef struct
207{ 314{
208 WL head; 315 WL head;
209 unsigned char events; 316 unsigned char events;
210 unsigned char reify; 317 unsigned char reify;
318#if EV_SELECT_IS_WINSOCKET
319 SOCKET handle;
320#endif
211} ANFD; 321} ANFD;
212 322
213typedef struct 323typedef struct
214{ 324{
215 W w; 325 W w;
216 int events; 326 int events;
217} ANPENDING; 327} ANPENDING;
218 328
329typedef struct
330{
331#if EV_USE_INOTIFY
332 WL head;
333#endif
334} ANFS;
335
219#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
220 337
221struct ev_loop 338 struct ev_loop
222{ 339 {
340 ev_tstamp ev_rt_now;
341 #define ev_rt_now ((loop)->ev_rt_now)
223# define VAR(name,decl) decl; 342 #define VAR(name,decl) decl;
224# include "ev_vars.h" 343 #include "ev_vars.h"
225};
226# undef VAR 344 #undef VAR
345 };
227# include "ev_wrap.h" 346 #include "ev_wrap.h"
347
348 static struct ev_loop default_loop_struct;
349 struct ev_loop *ev_default_loop_ptr;
228 350
229#else 351#else
230 352
353 ev_tstamp ev_rt_now;
231# define VAR(name,decl) static decl; 354 #define VAR(name,decl) static decl;
232# include "ev_vars.h" 355 #include "ev_vars.h"
233# undef VAR 356 #undef VAR
357
358 static int ev_default_loop_ptr;
234 359
235#endif 360#endif
236 361
237/*****************************************************************************/ 362/*****************************************************************************/
238 363
239inline ev_tstamp 364ev_tstamp
240ev_time (void) 365ev_time (void)
241{ 366{
242#if EV_USE_REALTIME 367#if EV_USE_REALTIME
243 struct timespec ts; 368 struct timespec ts;
244 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
248 gettimeofday (&tv, 0); 373 gettimeofday (&tv, 0);
249 return tv.tv_sec + tv.tv_usec * 1e-6; 374 return tv.tv_sec + tv.tv_usec * 1e-6;
250#endif 375#endif
251} 376}
252 377
253inline ev_tstamp 378ev_tstamp inline_size
254get_clock (void) 379get_clock (void)
255{ 380{
256#if EV_USE_MONOTONIC 381#if EV_USE_MONOTONIC
257 if (expect_true (have_monotonic)) 382 if (expect_true (have_monotonic))
258 { 383 {
263#endif 388#endif
264 389
265 return ev_time (); 390 return ev_time ();
266} 391}
267 392
393#if EV_MULTIPLICITY
268ev_tstamp 394ev_tstamp
269ev_now (EV_P) 395ev_now (EV_P)
270{ 396{
271 return rt_now; 397 return ev_rt_now;
272} 398}
399#endif
273 400
274#define array_roundsize(base,n) ((n) | 4 & ~3) 401#define array_roundsize(type,n) (((n) | 4) & ~3)
275 402
276#define array_needsize(base,cur,cnt,init) \ 403#define array_needsize(type,base,cur,cnt,init) \
277 if (expect_false ((cnt) > cur)) \ 404 if (expect_false ((cnt) > cur)) \
278 { \ 405 { \
279 int newcnt = cur; \ 406 int newcnt = cur; \
280 do \ 407 do \
281 { \ 408 { \
282 newcnt = array_roundsize (base, newcnt << 1); \ 409 newcnt = array_roundsize (type, newcnt << 1); \
283 } \ 410 } \
284 while ((cnt) > newcnt); \ 411 while ((cnt) > newcnt); \
285 \ 412 \
286 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
287 init (base + cur, newcnt - cur); \ 414 init (base + cur, newcnt - cur); \
288 cur = newcnt; \ 415 cur = newcnt; \
289 } 416 }
290 417
291#define array_slim(stem) \ 418#define array_slim(type,stem) \
292 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
293 { \ 420 { \
294 stem ## max = array_roundsize (stem ## cnt >> 1); \ 421 stem ## max = array_roundsize (stem ## cnt >> 1); \
295 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
296 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
297 } 424 }
298 425
299#define array_free(stem, idx) \ 426#define array_free(stem, idx) \
300 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
301 428
302/*****************************************************************************/ 429/*****************************************************************************/
303 430
304static void 431void noinline
432ev_feed_event (EV_P_ void *w, int revents)
433{
434 W w_ = (W)w;
435
436 if (expect_false (w_->pending))
437 {
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
439 return;
440 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446}
447
448void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type)
450{
451 int i;
452
453 for (i = 0; i < eventcnt; ++i)
454 ev_feed_event (EV_A_ events [i], type);
455}
456
457/*****************************************************************************/
458
459void inline_size
305anfds_init (ANFD *base, int count) 460anfds_init (ANFD *base, int count)
306{ 461{
307 while (count--) 462 while (count--)
308 { 463 {
309 base->head = 0; 464 base->head = 0;
312 467
313 ++base; 468 ++base;
314 } 469 }
315} 470}
316 471
317static void 472void inline_speed
318event (EV_P_ W w, int events)
319{
320 if (w->pending)
321 {
322 pendings [ABSPRI (w)][w->pending - 1].events |= events;
323 return;
324 }
325
326 w->pending = ++pendingcnt [ABSPRI (w)];
327 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
328 pendings [ABSPRI (w)][w->pending - 1].w = w;
329 pendings [ABSPRI (w)][w->pending - 1].events = events;
330}
331
332static void
333queue_events (EV_P_ W *events, int eventcnt, int type)
334{
335 int i;
336
337 for (i = 0; i < eventcnt; ++i)
338 event (EV_A_ events [i], type);
339}
340
341static void
342fd_event (EV_P_ int fd, int events) 473fd_event (EV_P_ int fd, int revents)
343{ 474{
344 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
345 struct ev_io *w; 476 ev_io *w;
346 477
347 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 478 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
348 { 479 {
349 int ev = w->events & events; 480 int ev = w->events & revents;
350 481
351 if (ev) 482 if (ev)
352 event (EV_A_ (W)w, ev); 483 ev_feed_event (EV_A_ (W)w, ev);
353 } 484 }
354} 485}
355 486
356/*****************************************************************************/ 487void
488ev_feed_fd_event (EV_P_ int fd, int revents)
489{
490 fd_event (EV_A_ fd, revents);
491}
357 492
358static void 493void inline_size
359fd_reify (EV_P) 494fd_reify (EV_P)
360{ 495{
361 int i; 496 int i;
362 497
363 for (i = 0; i < fdchangecnt; ++i) 498 for (i = 0; i < fdchangecnt; ++i)
364 { 499 {
365 int fd = fdchanges [i]; 500 int fd = fdchanges [i];
366 ANFD *anfd = anfds + fd; 501 ANFD *anfd = anfds + fd;
367 struct ev_io *w; 502 ev_io *w;
368 503
369 int events = 0; 504 int events = 0;
370 505
371 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
372 events |= w->events; 507 events |= w->events;
373 508
509#if EV_SELECT_IS_WINSOCKET
510 if (events)
511 {
512 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd);
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 }
516#endif
517
374 anfd->reify = 0; 518 anfd->reify = 0;
375 519
376 method_modify (EV_A_ fd, anfd->events, events); 520 backend_modify (EV_A_ fd, anfd->events, events);
377 anfd->events = events; 521 anfd->events = events;
378 } 522 }
379 523
380 fdchangecnt = 0; 524 fdchangecnt = 0;
381} 525}
382 526
383static void 527void inline_size
384fd_change (EV_P_ int fd) 528fd_change (EV_P_ int fd)
385{ 529{
386 if (anfds [fd].reify) 530 if (expect_false (anfds [fd].reify))
387 return; 531 return;
388 532
389 anfds [fd].reify = 1; 533 anfds [fd].reify = 1;
390 534
391 ++fdchangecnt; 535 ++fdchangecnt;
392 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
393 fdchanges [fdchangecnt - 1] = fd; 537 fdchanges [fdchangecnt - 1] = fd;
394} 538}
395 539
396static void 540void inline_speed
397fd_kill (EV_P_ int fd) 541fd_kill (EV_P_ int fd)
398{ 542{
399 struct ev_io *w; 543 ev_io *w;
400 544
401 while ((w = (struct ev_io *)anfds [fd].head)) 545 while ((w = (ev_io *)anfds [fd].head))
402 { 546 {
403 ev_io_stop (EV_A_ w); 547 ev_io_stop (EV_A_ w);
404 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 548 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
405 } 549 }
550}
551
552int inline_size
553fd_valid (int fd)
554{
555#ifdef _WIN32
556 return _get_osfhandle (fd) != -1;
557#else
558 return fcntl (fd, F_GETFD) != -1;
559#endif
406} 560}
407 561
408/* called on EBADF to verify fds */ 562/* called on EBADF to verify fds */
409static void 563static void noinline
410fd_ebadf (EV_P) 564fd_ebadf (EV_P)
411{ 565{
412 int fd; 566 int fd;
413 567
414 for (fd = 0; fd < anfdmax; ++fd) 568 for (fd = 0; fd < anfdmax; ++fd)
415 if (anfds [fd].events) 569 if (anfds [fd].events)
416 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 570 if (!fd_valid (fd) == -1 && errno == EBADF)
417 fd_kill (EV_A_ fd); 571 fd_kill (EV_A_ fd);
418} 572}
419 573
420/* called on ENOMEM in select/poll to kill some fds and retry */ 574/* called on ENOMEM in select/poll to kill some fds and retry */
421static void 575static void noinline
422fd_enomem (EV_P) 576fd_enomem (EV_P)
423{ 577{
424 int fd; 578 int fd;
425 579
426 for (fd = anfdmax; fd--; ) 580 for (fd = anfdmax; fd--; )
429 fd_kill (EV_A_ fd); 583 fd_kill (EV_A_ fd);
430 return; 584 return;
431 } 585 }
432} 586}
433 587
434/* usually called after fork if method needs to re-arm all fds from scratch */ 588/* usually called after fork if backend needs to re-arm all fds from scratch */
435static void 589static void noinline
436fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
437{ 591{
438 int fd; 592 int fd;
439 593
440 /* this should be highly optimised to not do anything but set a flag */ 594 /* this should be highly optimised to not do anything but set a flag */
446 } 600 }
447} 601}
448 602
449/*****************************************************************************/ 603/*****************************************************************************/
450 604
451static void 605void inline_speed
452upheap (WT *heap, int k) 606upheap (WT *heap, int k)
453{ 607{
454 WT w = heap [k]; 608 WT w = heap [k];
455 609
456 while (k && heap [k >> 1]->at > w->at) 610 while (k && heap [k >> 1]->at > w->at)
463 heap [k] = w; 617 heap [k] = w;
464 ((W)heap [k])->active = k + 1; 618 ((W)heap [k])->active = k + 1;
465 619
466} 620}
467 621
468static void 622void inline_speed
469downheap (WT *heap, int N, int k) 623downheap (WT *heap, int N, int k)
470{ 624{
471 WT w = heap [k]; 625 WT w = heap [k];
472 626
473 while (k < (N >> 1)) 627 while (k < (N >> 1))
487 641
488 heap [k] = w; 642 heap [k] = w;
489 ((W)heap [k])->active = k + 1; 643 ((W)heap [k])->active = k + 1;
490} 644}
491 645
646void inline_size
647adjustheap (WT *heap, int N, int k)
648{
649 upheap (heap, k);
650 downheap (heap, N, k);
651}
652
492/*****************************************************************************/ 653/*****************************************************************************/
493 654
494typedef struct 655typedef struct
495{ 656{
496 WL head; 657 WL head;
500static ANSIG *signals; 661static ANSIG *signals;
501static int signalmax; 662static int signalmax;
502 663
503static int sigpipe [2]; 664static int sigpipe [2];
504static sig_atomic_t volatile gotsig; 665static sig_atomic_t volatile gotsig;
505static struct ev_io sigev; 666static ev_io sigev;
506 667
507static void 668void inline_size
508signals_init (ANSIG *base, int count) 669signals_init (ANSIG *base, int count)
509{ 670{
510 while (count--) 671 while (count--)
511 { 672 {
512 base->head = 0; 673 base->head = 0;
517} 678}
518 679
519static void 680static void
520sighandler (int signum) 681sighandler (int signum)
521{ 682{
522#if WIN32 683#if _WIN32
523 signal (signum, sighandler); 684 signal (signum, sighandler);
524#endif 685#endif
525 686
526 signals [signum - 1].gotsig = 1; 687 signals [signum - 1].gotsig = 1;
527 688
532 write (sigpipe [1], &signum, 1); 693 write (sigpipe [1], &signum, 1);
533 errno = old_errno; 694 errno = old_errno;
534 } 695 }
535} 696}
536 697
698void noinline
699ev_feed_signal_event (EV_P_ int signum)
700{
701 WL w;
702
703#if EV_MULTIPLICITY
704 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
705#endif
706
707 --signum;
708
709 if (signum < 0 || signum >= signalmax)
710 return;
711
712 signals [signum].gotsig = 0;
713
714 for (w = signals [signum].head; w; w = w->next)
715 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
716}
717
537static void 718static void
538sigcb (EV_P_ struct ev_io *iow, int revents) 719sigcb (EV_P_ ev_io *iow, int revents)
539{ 720{
540 WL w;
541 int signum; 721 int signum;
542 722
543 read (sigpipe [0], &revents, 1); 723 read (sigpipe [0], &revents, 1);
544 gotsig = 0; 724 gotsig = 0;
545 725
546 for (signum = signalmax; signum--; ) 726 for (signum = signalmax; signum--; )
547 if (signals [signum].gotsig) 727 if (signals [signum].gotsig)
548 { 728 ev_feed_signal_event (EV_A_ signum + 1);
549 signals [signum].gotsig = 0;
550
551 for (w = signals [signum].head; w; w = w->next)
552 event (EV_A_ (W)w, EV_SIGNAL);
553 }
554} 729}
555 730
556static void 731void inline_size
732fd_intern (int fd)
733{
734#ifdef _WIN32
735 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
737#else
738 fcntl (fd, F_SETFD, FD_CLOEXEC);
739 fcntl (fd, F_SETFL, O_NONBLOCK);
740#endif
741}
742
743static void noinline
557siginit (EV_P) 744siginit (EV_P)
558{ 745{
559#ifndef WIN32 746 fd_intern (sigpipe [0]);
560 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 747 fd_intern (sigpipe [1]);
561 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
562
563 /* rather than sort out wether we really need nb, set it */
564 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
565 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
566#endif
567 748
568 ev_io_set (&sigev, sigpipe [0], EV_READ); 749 ev_io_set (&sigev, sigpipe [0], EV_READ);
569 ev_io_start (EV_A_ &sigev); 750 ev_io_start (EV_A_ &sigev);
570 ev_unref (EV_A); /* child watcher should not keep loop alive */ 751 ev_unref (EV_A); /* child watcher should not keep loop alive */
571} 752}
572 753
573/*****************************************************************************/ 754/*****************************************************************************/
574 755
756static ev_child *childs [EV_PID_HASHSIZE];
757
575#ifndef WIN32 758#ifndef _WIN32
576 759
577static struct ev_child *childs [PID_HASHSIZE];
578static struct ev_signal childev; 760static ev_signal childev;
579 761
580#ifndef WCONTINUED 762void inline_speed
581# define WCONTINUED 0
582#endif
583
584static void
585child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) 763child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
586{ 764{
587 struct ev_child *w; 765 ev_child *w;
588 766
589 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
590 if (w->pid == pid || !w->pid) 768 if (w->pid == pid || !w->pid)
591 { 769 {
592 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
593 w->rpid = pid; 771 w->rpid = pid;
594 w->rstatus = status; 772 w->rstatus = status;
595 event (EV_A_ (W)w, EV_CHILD); 773 ev_feed_event (EV_A_ (W)w, EV_CHILD);
596 } 774 }
597} 775}
598 776
777#ifndef WCONTINUED
778# define WCONTINUED 0
779#endif
780
599static void 781static void
600childcb (EV_P_ struct ev_signal *sw, int revents) 782childcb (EV_P_ ev_signal *sw, int revents)
601{ 783{
602 int pid, status; 784 int pid, status;
603 785
786 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
604 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 787 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
605 { 788 if (!WCONTINUED
789 || errno != EINVAL
790 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
791 return;
792
606 /* make sure we are called again until all childs have been reaped */ 793 /* make sure we are called again until all childs have been reaped */
794 /* we need to do it this way so that the callback gets called before we continue */
607 event (EV_A_ (W)sw, EV_SIGNAL); 795 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
608 796
609 child_reap (EV_A_ sw, pid, pid, status); 797 child_reap (EV_A_ sw, pid, pid, status);
798 if (EV_PID_HASHSIZE > 1)
610 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 799 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
611 }
612} 800}
613 801
614#endif 802#endif
615 803
616/*****************************************************************************/ 804/*****************************************************************************/
617 805
806#if EV_USE_PORT
807# include "ev_port.c"
808#endif
618#if EV_USE_KQUEUE 809#if EV_USE_KQUEUE
619# include "ev_kqueue.c" 810# include "ev_kqueue.c"
620#endif 811#endif
621#if EV_USE_EPOLL 812#if EV_USE_EPOLL
622# include "ev_epoll.c" 813# include "ev_epoll.c"
639{ 830{
640 return EV_VERSION_MINOR; 831 return EV_VERSION_MINOR;
641} 832}
642 833
643/* return true if we are running with elevated privileges and should ignore env variables */ 834/* return true if we are running with elevated privileges and should ignore env variables */
644static int 835int inline_size
645enable_secure (void) 836enable_secure (void)
646{ 837{
647#ifdef WIN32 838#ifdef _WIN32
648 return 0; 839 return 0;
649#else 840#else
650 return getuid () != geteuid () 841 return getuid () != geteuid ()
651 || getgid () != getegid (); 842 || getgid () != getegid ();
652#endif 843#endif
653} 844}
654 845
655int 846unsigned int
656ev_method (EV_P) 847ev_supported_backends (void)
657{ 848{
658 return method; 849 unsigned int flags = 0;
659}
660 850
661static void 851 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
662loop_init (EV_P_ int methods) 852 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
853 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
854 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
855 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
856
857 return flags;
858}
859
860unsigned int
861ev_recommended_backends (void)
663{ 862{
664 if (!method) 863 unsigned int flags = ev_supported_backends ();
864
865#ifndef __NetBSD__
866 /* kqueue is borked on everything but netbsd apparently */
867 /* it usually doesn't work correctly on anything but sockets and pipes */
868 flags &= ~EVBACKEND_KQUEUE;
869#endif
870#ifdef __APPLE__
871 // flags &= ~EVBACKEND_KQUEUE; for documentation
872 flags &= ~EVBACKEND_POLL;
873#endif
874
875 return flags;
876}
877
878unsigned int
879ev_embeddable_backends (void)
880{
881 return EVBACKEND_EPOLL
882 | EVBACKEND_KQUEUE
883 | EVBACKEND_PORT;
884}
885
886unsigned int
887ev_backend (EV_P)
888{
889 return backend;
890}
891
892static void noinline
893loop_init (EV_P_ unsigned int flags)
894{
895 if (!backend)
665 { 896 {
666#if EV_USE_MONOTONIC 897#if EV_USE_MONOTONIC
667 { 898 {
668 struct timespec ts; 899 struct timespec ts;
669 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 900 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
670 have_monotonic = 1; 901 have_monotonic = 1;
671 } 902 }
672#endif 903#endif
673 904
674 rt_now = ev_time (); 905 ev_rt_now = ev_time ();
675 mn_now = get_clock (); 906 mn_now = get_clock ();
676 now_floor = mn_now; 907 now_floor = mn_now;
677 rtmn_diff = rt_now - mn_now; 908 rtmn_diff = ev_rt_now - mn_now;
678 909
679 if (methods == EVMETHOD_AUTO) 910 if (!(flags & EVFLAG_NOENV)
680 if (!enable_secure () && getenv ("LIBEV_METHODS")) 911 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS"))
681 methods = atoi (getenv ("LIBEV_METHODS")); 913 flags = atoi (getenv ("LIBEV_FLAGS"));
682 else
683 methods = EVMETHOD_ANY;
684 914
685 method = 0; 915 if (!(flags & 0x0000ffffUL))
916 flags |= ev_recommended_backends ();
917
918 backend = 0;
919 backend_fd = -1;
686#if EV_USE_WIN32 920#if EV_USE_INOTIFY
687 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 921 fs_fd = -2;
922#endif
923
924#if EV_USE_PORT
925 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
688#endif 926#endif
689#if EV_USE_KQUEUE 927#if EV_USE_KQUEUE
690 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 928 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
691#endif 929#endif
692#if EV_USE_EPOLL 930#if EV_USE_EPOLL
693 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 931 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
694#endif 932#endif
695#if EV_USE_POLL 933#if EV_USE_POLL
696 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 934 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
697#endif 935#endif
698#if EV_USE_SELECT 936#if EV_USE_SELECT
699 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 937 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
700#endif 938#endif
701 939
702 ev_watcher_init (&sigev, sigcb); 940 ev_init (&sigev, sigcb);
703 ev_set_priority (&sigev, EV_MAXPRI); 941 ev_set_priority (&sigev, EV_MAXPRI);
704 } 942 }
705} 943}
706 944
707void 945static void noinline
708loop_destroy (EV_P) 946loop_destroy (EV_P)
709{ 947{
710 int i; 948 int i;
711 949
712#if EV_USE_WIN32 950#if EV_USE_INOTIFY
713 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 951 if (fs_fd >= 0)
952 close (fs_fd);
953#endif
954
955 if (backend_fd >= 0)
956 close (backend_fd);
957
958#if EV_USE_PORT
959 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
714#endif 960#endif
715#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
716 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 962 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
717#endif 963#endif
718#if EV_USE_EPOLL 964#if EV_USE_EPOLL
719 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 965 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
720#endif 966#endif
721#if EV_USE_POLL 967#if EV_USE_POLL
722 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 968 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
723#endif 969#endif
724#if EV_USE_SELECT 970#if EV_USE_SELECT
725 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
726#endif 972#endif
727 973
728 for (i = NUMPRI; i--; ) 974 for (i = NUMPRI; i--; )
729 array_free (pending, [i]); 975 array_free (pending, [i]);
730 976
977 /* have to use the microsoft-never-gets-it-right macro */
731 array_free (fdchange, ); 978 array_free (fdchange, EMPTY0);
732 array_free (timer, ); 979 array_free (timer, EMPTY0);
980#if EV_PERIODIC_ENABLE
733 array_free (periodic, ); 981 array_free (periodic, EMPTY0);
982#endif
734 array_free (idle, ); 983 array_free (idle, EMPTY0);
735 array_free (prepare, ); 984 array_free (prepare, EMPTY0);
736 array_free (check, ); 985 array_free (check, EMPTY0);
737 986
738 method = 0; 987 backend = 0;
739} 988}
740 989
741static void 990void inline_size
742loop_fork (EV_P) 991loop_fork (EV_P)
743{ 992{
993#if EV_USE_PORT
994 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
995#endif
996#if EV_USE_KQUEUE
997 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
998#endif
744#if EV_USE_EPOLL 999#if EV_USE_EPOLL
745 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1000 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
746#endif
747#if EV_USE_KQUEUE
748 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
749#endif 1001#endif
750 1002
751 if (ev_is_active (&sigev)) 1003 if (ev_is_active (&sigev))
752 { 1004 {
753 /* default loop */ 1005 /* default loop */
766 postfork = 0; 1018 postfork = 0;
767} 1019}
768 1020
769#if EV_MULTIPLICITY 1021#if EV_MULTIPLICITY
770struct ev_loop * 1022struct ev_loop *
771ev_loop_new (int methods) 1023ev_loop_new (unsigned int flags)
772{ 1024{
773 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 1025 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
774 1026
775 memset (loop, 0, sizeof (struct ev_loop)); 1027 memset (loop, 0, sizeof (struct ev_loop));
776 1028
777 loop_init (EV_A_ methods); 1029 loop_init (EV_A_ flags);
778 1030
779 if (ev_method (EV_A)) 1031 if (ev_backend (EV_A))
780 return loop; 1032 return loop;
781 1033
782 return 0; 1034 return 0;
783} 1035}
784 1036
796} 1048}
797 1049
798#endif 1050#endif
799 1051
800#if EV_MULTIPLICITY 1052#if EV_MULTIPLICITY
801struct ev_loop default_loop_struct;
802static struct ev_loop *default_loop;
803
804struct ev_loop * 1053struct ev_loop *
1054ev_default_loop_init (unsigned int flags)
805#else 1055#else
806static int default_loop;
807
808int 1056int
1057ev_default_loop (unsigned int flags)
809#endif 1058#endif
810ev_default_loop (int methods)
811{ 1059{
812 if (sigpipe [0] == sigpipe [1]) 1060 if (sigpipe [0] == sigpipe [1])
813 if (pipe (sigpipe)) 1061 if (pipe (sigpipe))
814 return 0; 1062 return 0;
815 1063
816 if (!default_loop) 1064 if (!ev_default_loop_ptr)
817 { 1065 {
818#if EV_MULTIPLICITY 1066#if EV_MULTIPLICITY
819 struct ev_loop *loop = default_loop = &default_loop_struct; 1067 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
820#else 1068#else
821 default_loop = 1; 1069 ev_default_loop_ptr = 1;
822#endif 1070#endif
823 1071
824 loop_init (EV_A_ methods); 1072 loop_init (EV_A_ flags);
825 1073
826 if (ev_method (EV_A)) 1074 if (ev_backend (EV_A))
827 { 1075 {
828 siginit (EV_A); 1076 siginit (EV_A);
829 1077
830#ifndef WIN32 1078#ifndef _WIN32
831 ev_signal_init (&childev, childcb, SIGCHLD); 1079 ev_signal_init (&childev, childcb, SIGCHLD);
832 ev_set_priority (&childev, EV_MAXPRI); 1080 ev_set_priority (&childev, EV_MAXPRI);
833 ev_signal_start (EV_A_ &childev); 1081 ev_signal_start (EV_A_ &childev);
834 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1082 ev_unref (EV_A); /* child watcher should not keep loop alive */
835#endif 1083#endif
836 } 1084 }
837 else 1085 else
838 default_loop = 0; 1086 ev_default_loop_ptr = 0;
839 } 1087 }
840 1088
841 return default_loop; 1089 return ev_default_loop_ptr;
842} 1090}
843 1091
844void 1092void
845ev_default_destroy (void) 1093ev_default_destroy (void)
846{ 1094{
847#if EV_MULTIPLICITY 1095#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 1096 struct ev_loop *loop = ev_default_loop_ptr;
849#endif 1097#endif
850 1098
1099#ifndef _WIN32
851 ev_ref (EV_A); /* child watcher */ 1100 ev_ref (EV_A); /* child watcher */
852 ev_signal_stop (EV_A_ &childev); 1101 ev_signal_stop (EV_A_ &childev);
1102#endif
853 1103
854 ev_ref (EV_A); /* signal watcher */ 1104 ev_ref (EV_A); /* signal watcher */
855 ev_io_stop (EV_A_ &sigev); 1105 ev_io_stop (EV_A_ &sigev);
856 1106
857 close (sigpipe [0]); sigpipe [0] = 0; 1107 close (sigpipe [0]); sigpipe [0] = 0;
862 1112
863void 1113void
864ev_default_fork (void) 1114ev_default_fork (void)
865{ 1115{
866#if EV_MULTIPLICITY 1116#if EV_MULTIPLICITY
867 struct ev_loop *loop = default_loop; 1117 struct ev_loop *loop = ev_default_loop_ptr;
868#endif 1118#endif
869 1119
870 if (method) 1120 if (backend)
871 postfork = 1; 1121 postfork = 1;
872} 1122}
873 1123
874/*****************************************************************************/ 1124/*****************************************************************************/
875 1125
876static void 1126int inline_size
1127any_pending (EV_P)
1128{
1129 int pri;
1130
1131 for (pri = NUMPRI; pri--; )
1132 if (pendingcnt [pri])
1133 return 1;
1134
1135 return 0;
1136}
1137
1138void inline_speed
877call_pending (EV_P) 1139call_pending (EV_P)
878{ 1140{
879 int pri; 1141 int pri;
880 1142
881 for (pri = NUMPRI; pri--; ) 1143 for (pri = NUMPRI; pri--; )
882 while (pendingcnt [pri]) 1144 while (pendingcnt [pri])
883 { 1145 {
884 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1146 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
885 1147
886 if (p->w) 1148 if (expect_true (p->w))
887 { 1149 {
1150 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1151
888 p->w->pending = 0; 1152 p->w->pending = 0;
889 p->w->cb (EV_A_ p->w, p->events); 1153 EV_CB_INVOKE (p->w, p->events);
890 } 1154 }
891 } 1155 }
892} 1156}
893 1157
894static void 1158void inline_size
895timers_reify (EV_P) 1159timers_reify (EV_P)
896{ 1160{
897 while (timercnt && ((WT)timers [0])->at <= mn_now) 1161 while (timercnt && ((WT)timers [0])->at <= mn_now)
898 { 1162 {
899 struct ev_timer *w = timers [0]; 1163 ev_timer *w = timers [0];
900 1164
901 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1165 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
902 1166
903 /* first reschedule or stop timer */ 1167 /* first reschedule or stop timer */
904 if (w->repeat) 1168 if (w->repeat)
905 { 1169 {
906 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1170 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1171
907 ((WT)w)->at = mn_now + w->repeat; 1172 ((WT)w)->at += w->repeat;
1173 if (((WT)w)->at < mn_now)
1174 ((WT)w)->at = mn_now;
1175
908 downheap ((WT *)timers, timercnt, 0); 1176 downheap ((WT *)timers, timercnt, 0);
909 } 1177 }
910 else 1178 else
911 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1179 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
912 1180
913 event (EV_A_ (W)w, EV_TIMEOUT); 1181 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
914 } 1182 }
915} 1183}
916 1184
917static void 1185#if EV_PERIODIC_ENABLE
1186void inline_size
918periodics_reify (EV_P) 1187periodics_reify (EV_P)
919{ 1188{
920 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1189 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
921 { 1190 {
922 struct ev_periodic *w = periodics [0]; 1191 ev_periodic *w = periodics [0];
923 1192
924 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
925 1194
926 /* first reschedule or stop timer */ 1195 /* first reschedule or stop timer */
927 if (w->interval) 1196 if (w->reschedule_cb)
928 { 1197 {
1198 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1199 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1200 downheap ((WT *)periodics, periodiccnt, 0);
1201 }
1202 else if (w->interval)
1203 {
929 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1204 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
930 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1205 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
931 downheap ((WT *)periodics, periodiccnt, 0); 1206 downheap ((WT *)periodics, periodiccnt, 0);
932 } 1207 }
933 else 1208 else
934 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1209 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
935 1210
936 event (EV_A_ (W)w, EV_PERIODIC); 1211 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
937 } 1212 }
938} 1213}
939 1214
940static void 1215static void noinline
941periodics_reschedule (EV_P) 1216periodics_reschedule (EV_P)
942{ 1217{
943 int i; 1218 int i;
944 1219
945 /* adjust periodics after time jump */ 1220 /* adjust periodics after time jump */
946 for (i = 0; i < periodiccnt; ++i) 1221 for (i = 0; i < periodiccnt; ++i)
947 { 1222 {
948 struct ev_periodic *w = periodics [i]; 1223 ev_periodic *w = periodics [i];
949 1224
1225 if (w->reschedule_cb)
1226 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
950 if (w->interval) 1227 else if (w->interval)
951 {
952 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1228 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
953
954 if (fabs (diff) >= 1e-4)
955 {
956 ev_periodic_stop (EV_A_ w);
957 ev_periodic_start (EV_A_ w);
958
959 i = 0; /* restart loop, inefficient, but time jumps should be rare */
960 }
961 }
962 } 1229 }
963}
964 1230
965inline int 1231 /* now rebuild the heap */
1232 for (i = periodiccnt >> 1; i--; )
1233 downheap ((WT *)periodics, periodiccnt, i);
1234}
1235#endif
1236
1237int inline_size
966time_update_monotonic (EV_P) 1238time_update_monotonic (EV_P)
967{ 1239{
968 mn_now = get_clock (); 1240 mn_now = get_clock ();
969 1241
970 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1242 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
971 { 1243 {
972 rt_now = rtmn_diff + mn_now; 1244 ev_rt_now = rtmn_diff + mn_now;
973 return 0; 1245 return 0;
974 } 1246 }
975 else 1247 else
976 { 1248 {
977 now_floor = mn_now; 1249 now_floor = mn_now;
978 rt_now = ev_time (); 1250 ev_rt_now = ev_time ();
979 return 1; 1251 return 1;
980 } 1252 }
981} 1253}
982 1254
983static void 1255void inline_size
984time_update (EV_P) 1256time_update (EV_P)
985{ 1257{
986 int i; 1258 int i;
987 1259
988#if EV_USE_MONOTONIC 1260#if EV_USE_MONOTONIC
990 { 1262 {
991 if (time_update_monotonic (EV_A)) 1263 if (time_update_monotonic (EV_A))
992 { 1264 {
993 ev_tstamp odiff = rtmn_diff; 1265 ev_tstamp odiff = rtmn_diff;
994 1266
995 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1267 /* loop a few times, before making important decisions.
1268 * on the choice of "4": one iteration isn't enough,
1269 * in case we get preempted during the calls to
1270 * ev_time and get_clock. a second call is almost guarenteed
1271 * to succeed in that case, though. and looping a few more times
1272 * doesn't hurt either as we only do this on time-jumps or
1273 * in the unlikely event of getting preempted here.
1274 */
1275 for (i = 4; --i; )
996 { 1276 {
997 rtmn_diff = rt_now - mn_now; 1277 rtmn_diff = ev_rt_now - mn_now;
998 1278
999 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1279 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1000 return; /* all is well */ 1280 return; /* all is well */
1001 1281
1002 rt_now = ev_time (); 1282 ev_rt_now = ev_time ();
1003 mn_now = get_clock (); 1283 mn_now = get_clock ();
1004 now_floor = mn_now; 1284 now_floor = mn_now;
1005 } 1285 }
1006 1286
1287# if EV_PERIODIC_ENABLE
1007 periodics_reschedule (EV_A); 1288 periodics_reschedule (EV_A);
1289# endif
1008 /* no timer adjustment, as the monotonic clock doesn't jump */ 1290 /* no timer adjustment, as the monotonic clock doesn't jump */
1009 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1291 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1010 } 1292 }
1011 } 1293 }
1012 else 1294 else
1013#endif 1295#endif
1014 { 1296 {
1015 rt_now = ev_time (); 1297 ev_rt_now = ev_time ();
1016 1298
1017 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1299 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1018 { 1300 {
1301#if EV_PERIODIC_ENABLE
1019 periodics_reschedule (EV_A); 1302 periodics_reschedule (EV_A);
1303#endif
1020 1304
1021 /* adjust timers. this is easy, as the offset is the same for all */ 1305 /* adjust timers. this is easy, as the offset is the same for all */
1022 for (i = 0; i < timercnt; ++i) 1306 for (i = 0; i < timercnt; ++i)
1023 ((WT)timers [i])->at += rt_now - mn_now; 1307 ((WT)timers [i])->at += ev_rt_now - mn_now;
1024 } 1308 }
1025 1309
1026 mn_now = rt_now; 1310 mn_now = ev_rt_now;
1027 } 1311 }
1028} 1312}
1029 1313
1030void 1314void
1031ev_ref (EV_P) 1315ev_ref (EV_P)
1042static int loop_done; 1326static int loop_done;
1043 1327
1044void 1328void
1045ev_loop (EV_P_ int flags) 1329ev_loop (EV_P_ int flags)
1046{ 1330{
1047 double block;
1048 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1331 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1332 ? EVUNLOOP_ONE
1333 : EVUNLOOP_CANCEL;
1049 1334
1050 do 1335 while (activecnt)
1051 { 1336 {
1337 /* we might have forked, so reify kernel state if necessary */
1338 #if EV_FORK_ENABLE
1339 if (expect_false (postfork))
1340 if (forkcnt)
1341 {
1342 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1343 call_pending (EV_A);
1344 }
1345 #endif
1346
1052 /* queue check watchers (and execute them) */ 1347 /* queue check watchers (and execute them) */
1053 if (expect_false (preparecnt)) 1348 if (expect_false (preparecnt))
1054 { 1349 {
1055 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1350 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1056 call_pending (EV_A); 1351 call_pending (EV_A);
1062 1357
1063 /* update fd-related kernel structures */ 1358 /* update fd-related kernel structures */
1064 fd_reify (EV_A); 1359 fd_reify (EV_A);
1065 1360
1066 /* calculate blocking time */ 1361 /* calculate blocking time */
1362 {
1363 double block;
1067 1364
1068 /* we only need this for !monotonic clockor timers, but as we basically 1365 if (flags & EVLOOP_NONBLOCK || idlecnt)
1069 always have timers, we just calculate it always */ 1366 block = 0.; /* do not block at all */
1367 else
1368 {
1369 /* update time to cancel out callback processing overhead */
1070#if EV_USE_MONOTONIC 1370#if EV_USE_MONOTONIC
1071 if (expect_true (have_monotonic)) 1371 if (expect_true (have_monotonic))
1072 time_update_monotonic (EV_A); 1372 time_update_monotonic (EV_A);
1073 else 1373 else
1074#endif 1374#endif
1075 { 1375 {
1076 rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
1077 mn_now = rt_now; 1377 mn_now = ev_rt_now;
1078 } 1378 }
1079 1379
1080 if (flags & EVLOOP_NONBLOCK || idlecnt)
1081 block = 0.;
1082 else
1083 {
1084 block = MAX_BLOCKTIME; 1380 block = MAX_BLOCKTIME;
1085 1381
1086 if (timercnt) 1382 if (timercnt)
1087 { 1383 {
1088 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1384 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
1089 if (block > to) block = to; 1385 if (block > to) block = to;
1090 } 1386 }
1091 1387
1388#if EV_PERIODIC_ENABLE
1092 if (periodiccnt) 1389 if (periodiccnt)
1093 { 1390 {
1094 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1391 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1095 if (block > to) block = to; 1392 if (block > to) block = to;
1096 } 1393 }
1394#endif
1097 1395
1098 if (block < 0.) block = 0.; 1396 if (expect_false (block < 0.)) block = 0.;
1099 } 1397 }
1100 1398
1101 method_poll (EV_A_ block); 1399 backend_poll (EV_A_ block);
1400 }
1102 1401
1103 /* update rt_now, do magic */ 1402 /* update ev_rt_now, do magic */
1104 time_update (EV_A); 1403 time_update (EV_A);
1105 1404
1106 /* queue pending timers and reschedule them */ 1405 /* queue pending timers and reschedule them */
1107 timers_reify (EV_A); /* relative timers called last */ 1406 timers_reify (EV_A); /* relative timers called last */
1407#if EV_PERIODIC_ENABLE
1108 periodics_reify (EV_A); /* absolute timers called first */ 1408 periodics_reify (EV_A); /* absolute timers called first */
1409#endif
1109 1410
1110 /* queue idle watchers unless io or timers are pending */ 1411 /* queue idle watchers unless other events are pending */
1111 if (!pendingcnt) 1412 if (idlecnt && !any_pending (EV_A))
1112 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1413 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1113 1414
1114 /* queue check watchers, to be executed first */ 1415 /* queue check watchers, to be executed first */
1115 if (checkcnt) 1416 if (expect_false (checkcnt))
1116 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1417 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1117 1418
1118 call_pending (EV_A); 1419 call_pending (EV_A);
1119 }
1120 while (activecnt && !loop_done);
1121 1420
1122 if (loop_done != 2) 1421 if (expect_false (loop_done))
1123 loop_done = 0; 1422 break;
1423 }
1424
1425 if (loop_done == EVUNLOOP_ONE)
1426 loop_done = EVUNLOOP_CANCEL;
1124} 1427}
1125 1428
1126void 1429void
1127ev_unloop (EV_P_ int how) 1430ev_unloop (EV_P_ int how)
1128{ 1431{
1129 loop_done = how; 1432 loop_done = how;
1130} 1433}
1131 1434
1132/*****************************************************************************/ 1435/*****************************************************************************/
1133 1436
1134inline void 1437void inline_size
1135wlist_add (WL *head, WL elem) 1438wlist_add (WL *head, WL elem)
1136{ 1439{
1137 elem->next = *head; 1440 elem->next = *head;
1138 *head = elem; 1441 *head = elem;
1139} 1442}
1140 1443
1141inline void 1444void inline_size
1142wlist_del (WL *head, WL elem) 1445wlist_del (WL *head, WL elem)
1143{ 1446{
1144 while (*head) 1447 while (*head)
1145 { 1448 {
1146 if (*head == elem) 1449 if (*head == elem)
1151 1454
1152 head = &(*head)->next; 1455 head = &(*head)->next;
1153 } 1456 }
1154} 1457}
1155 1458
1156inline void 1459void inline_speed
1157ev_clear_pending (EV_P_ W w) 1460ev_clear_pending (EV_P_ W w)
1158{ 1461{
1159 if (w->pending) 1462 if (w->pending)
1160 { 1463 {
1161 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1464 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1162 w->pending = 0; 1465 w->pending = 0;
1163 } 1466 }
1164} 1467}
1165 1468
1166inline void 1469void inline_speed
1167ev_start (EV_P_ W w, int active) 1470ev_start (EV_P_ W w, int active)
1168{ 1471{
1169 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1472 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1170 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 1473 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1171 1474
1172 w->active = active; 1475 w->active = active;
1173 ev_ref (EV_A); 1476 ev_ref (EV_A);
1174} 1477}
1175 1478
1176inline void 1479void inline_size
1177ev_stop (EV_P_ W w) 1480ev_stop (EV_P_ W w)
1178{ 1481{
1179 ev_unref (EV_A); 1482 ev_unref (EV_A);
1180 w->active = 0; 1483 w->active = 0;
1181} 1484}
1182 1485
1183/*****************************************************************************/ 1486/*****************************************************************************/
1184 1487
1185void 1488void
1186ev_io_start (EV_P_ struct ev_io *w) 1489ev_io_start (EV_P_ ev_io *w)
1187{ 1490{
1188 int fd = w->fd; 1491 int fd = w->fd;
1189 1492
1190 if (ev_is_active (w)) 1493 if (expect_false (ev_is_active (w)))
1191 return; 1494 return;
1192 1495
1193 assert (("ev_io_start called with negative fd", fd >= 0)); 1496 assert (("ev_io_start called with negative fd", fd >= 0));
1194 1497
1195 ev_start (EV_A_ (W)w, 1); 1498 ev_start (EV_A_ (W)w, 1);
1196 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1499 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1197 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1500 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1198 1501
1199 fd_change (EV_A_ fd); 1502 fd_change (EV_A_ fd);
1200} 1503}
1201 1504
1202void 1505void
1203ev_io_stop (EV_P_ struct ev_io *w) 1506ev_io_stop (EV_P_ ev_io *w)
1204{ 1507{
1205 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1206 if (!ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1207 return; 1510 return;
1511
1512 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1208 1513
1209 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1514 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1210 ev_stop (EV_A_ (W)w); 1515 ev_stop (EV_A_ (W)w);
1211 1516
1212 fd_change (EV_A_ w->fd); 1517 fd_change (EV_A_ w->fd);
1213} 1518}
1214 1519
1215void 1520void
1216ev_timer_start (EV_P_ struct ev_timer *w) 1521ev_timer_start (EV_P_ ev_timer *w)
1217{ 1522{
1218 if (ev_is_active (w)) 1523 if (expect_false (ev_is_active (w)))
1219 return; 1524 return;
1220 1525
1221 ((WT)w)->at += mn_now; 1526 ((WT)w)->at += mn_now;
1222 1527
1223 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1528 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1224 1529
1225 ev_start (EV_A_ (W)w, ++timercnt); 1530 ev_start (EV_A_ (W)w, ++timercnt);
1226 array_needsize (timers, timermax, timercnt, ); 1531 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1227 timers [timercnt - 1] = w; 1532 timers [timercnt - 1] = w;
1228 upheap ((WT *)timers, timercnt - 1); 1533 upheap ((WT *)timers, timercnt - 1);
1229 1534
1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1536}
1537
1538void
1539ev_timer_stop (EV_P_ ev_timer *w)
1540{
1541 ev_clear_pending (EV_A_ (W)w);
1542 if (expect_false (!ev_is_active (w)))
1543 return;
1544
1230 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1231}
1232 1546
1233void 1547 {
1234ev_timer_stop (EV_P_ struct ev_timer *w) 1548 int active = ((W)w)->active;
1235{
1236 ev_clear_pending (EV_A_ (W)w);
1237 if (!ev_is_active (w))
1238 return;
1239 1549
1240 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1550 if (expect_true (--active < --timercnt))
1241
1242 if (((W)w)->active < timercnt--)
1243 { 1551 {
1244 timers [((W)w)->active - 1] = timers [timercnt]; 1552 timers [active] = timers [timercnt];
1245 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1553 adjustheap ((WT *)timers, timercnt, active);
1246 } 1554 }
1555 }
1247 1556
1248 ((WT)w)->at = w->repeat; 1557 ((WT)w)->at -= mn_now;
1249 1558
1250 ev_stop (EV_A_ (W)w); 1559 ev_stop (EV_A_ (W)w);
1251} 1560}
1252 1561
1253void 1562void
1254ev_timer_again (EV_P_ struct ev_timer *w) 1563ev_timer_again (EV_P_ ev_timer *w)
1255{ 1564{
1256 if (ev_is_active (w)) 1565 if (ev_is_active (w))
1257 { 1566 {
1258 if (w->repeat) 1567 if (w->repeat)
1259 { 1568 {
1260 ((WT)w)->at = mn_now + w->repeat; 1569 ((WT)w)->at = mn_now + w->repeat;
1261 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1570 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1262 } 1571 }
1263 else 1572 else
1264 ev_timer_stop (EV_A_ w); 1573 ev_timer_stop (EV_A_ w);
1265 } 1574 }
1266 else if (w->repeat) 1575 else if (w->repeat)
1576 {
1577 w->at = w->repeat;
1267 ev_timer_start (EV_A_ w); 1578 ev_timer_start (EV_A_ w);
1579 }
1268} 1580}
1269 1581
1582#if EV_PERIODIC_ENABLE
1270void 1583void
1271ev_periodic_start (EV_P_ struct ev_periodic *w) 1584ev_periodic_start (EV_P_ ev_periodic *w)
1272{ 1585{
1273 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1274 return; 1587 return;
1275 1588
1589 if (w->reschedule_cb)
1590 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1591 else if (w->interval)
1592 {
1276 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1593 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1277
1278 /* this formula differs from the one in periodic_reify because we do not always round up */ 1594 /* this formula differs from the one in periodic_reify because we do not always round up */
1279 if (w->interval)
1280 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1595 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1596 }
1281 1597
1282 ev_start (EV_A_ (W)w, ++periodiccnt); 1598 ev_start (EV_A_ (W)w, ++periodiccnt);
1283 array_needsize (periodics, periodicmax, periodiccnt, ); 1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1284 periodics [periodiccnt - 1] = w; 1600 periodics [periodiccnt - 1] = w;
1285 upheap ((WT *)periodics, periodiccnt - 1); 1601 upheap ((WT *)periodics, periodiccnt - 1);
1286 1602
1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1604}
1605
1606void
1607ev_periodic_stop (EV_P_ ev_periodic *w)
1608{
1609 ev_clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w)))
1611 return;
1612
1287 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1288}
1289 1614
1290void 1615 {
1291ev_periodic_stop (EV_P_ struct ev_periodic *w) 1616 int active = ((W)w)->active;
1292{
1293 ev_clear_pending (EV_A_ (W)w);
1294 if (!ev_is_active (w))
1295 return;
1296 1617
1297 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1618 if (expect_true (--active < --periodiccnt))
1298
1299 if (((W)w)->active < periodiccnt--)
1300 { 1619 {
1301 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1620 periodics [active] = periodics [periodiccnt];
1302 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1621 adjustheap ((WT *)periodics, periodiccnt, active);
1303 } 1622 }
1623 }
1304 1624
1305 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1306} 1626}
1307 1627
1308void 1628void
1309ev_idle_start (EV_P_ struct ev_idle *w) 1629ev_periodic_again (EV_P_ ev_periodic *w)
1310{ 1630{
1311 if (ev_is_active (w)) 1631 /* TODO: use adjustheap and recalculation */
1312 return;
1313
1314 ev_start (EV_A_ (W)w, ++idlecnt);
1315 array_needsize (idles, idlemax, idlecnt, );
1316 idles [idlecnt - 1] = w;
1317}
1318
1319void
1320ev_idle_stop (EV_P_ struct ev_idle *w)
1321{
1322 ev_clear_pending (EV_A_ (W)w);
1323 if (ev_is_active (w))
1324 return;
1325
1326 idles [((W)w)->active - 1] = idles [--idlecnt];
1327 ev_stop (EV_A_ (W)w); 1632 ev_periodic_stop (EV_A_ w);
1633 ev_periodic_start (EV_A_ w);
1328} 1634}
1329 1635#endif
1330void
1331ev_prepare_start (EV_P_ struct ev_prepare *w)
1332{
1333 if (ev_is_active (w))
1334 return;
1335
1336 ev_start (EV_A_ (W)w, ++preparecnt);
1337 array_needsize (prepares, preparemax, preparecnt, );
1338 prepares [preparecnt - 1] = w;
1339}
1340
1341void
1342ev_prepare_stop (EV_P_ struct ev_prepare *w)
1343{
1344 ev_clear_pending (EV_A_ (W)w);
1345 if (ev_is_active (w))
1346 return;
1347
1348 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1349 ev_stop (EV_A_ (W)w);
1350}
1351
1352void
1353ev_check_start (EV_P_ struct ev_check *w)
1354{
1355 if (ev_is_active (w))
1356 return;
1357
1358 ev_start (EV_A_ (W)w, ++checkcnt);
1359 array_needsize (checks, checkmax, checkcnt, );
1360 checks [checkcnt - 1] = w;
1361}
1362
1363void
1364ev_check_stop (EV_P_ struct ev_check *w)
1365{
1366 ev_clear_pending (EV_A_ (W)w);
1367 if (ev_is_active (w))
1368 return;
1369
1370 checks [((W)w)->active - 1] = checks [--checkcnt];
1371 ev_stop (EV_A_ (W)w);
1372}
1373 1636
1374#ifndef SA_RESTART 1637#ifndef SA_RESTART
1375# define SA_RESTART 0 1638# define SA_RESTART 0
1376#endif 1639#endif
1377 1640
1378void 1641void
1379ev_signal_start (EV_P_ struct ev_signal *w) 1642ev_signal_start (EV_P_ ev_signal *w)
1380{ 1643{
1381#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1382 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1645 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1383#endif 1646#endif
1384 if (ev_is_active (w)) 1647 if (expect_false (ev_is_active (w)))
1385 return; 1648 return;
1386 1649
1387 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1650 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1388 1651
1389 ev_start (EV_A_ (W)w, 1); 1652 ev_start (EV_A_ (W)w, 1);
1390 array_needsize (signals, signalmax, w->signum, signals_init); 1653 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1391 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1654 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1392 1655
1393 if (!((WL)w)->next) 1656 if (!((WL)w)->next)
1394 { 1657 {
1395#if WIN32 1658#if _WIN32
1396 signal (w->signum, sighandler); 1659 signal (w->signum, sighandler);
1397#else 1660#else
1398 struct sigaction sa; 1661 struct sigaction sa;
1399 sa.sa_handler = sighandler; 1662 sa.sa_handler = sighandler;
1400 sigfillset (&sa.sa_mask); 1663 sigfillset (&sa.sa_mask);
1403#endif 1666#endif
1404 } 1667 }
1405} 1668}
1406 1669
1407void 1670void
1408ev_signal_stop (EV_P_ struct ev_signal *w) 1671ev_signal_stop (EV_P_ ev_signal *w)
1409{ 1672{
1410 ev_clear_pending (EV_A_ (W)w); 1673 ev_clear_pending (EV_A_ (W)w);
1411 if (!ev_is_active (w)) 1674 if (expect_false (!ev_is_active (w)))
1412 return; 1675 return;
1413 1676
1414 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1677 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1415 ev_stop (EV_A_ (W)w); 1678 ev_stop (EV_A_ (W)w);
1416 1679
1417 if (!signals [w->signum - 1].head) 1680 if (!signals [w->signum - 1].head)
1418 signal (w->signum, SIG_DFL); 1681 signal (w->signum, SIG_DFL);
1419} 1682}
1420 1683
1421void 1684void
1422ev_child_start (EV_P_ struct ev_child *w) 1685ev_child_start (EV_P_ ev_child *w)
1423{ 1686{
1424#if EV_MULTIPLICITY 1687#if EV_MULTIPLICITY
1425 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1688 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1426#endif 1689#endif
1427 if (ev_is_active (w)) 1690 if (expect_false (ev_is_active (w)))
1428 return; 1691 return;
1429 1692
1430 ev_start (EV_A_ (W)w, 1); 1693 ev_start (EV_A_ (W)w, 1);
1431 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1694 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1432} 1695}
1433 1696
1434void 1697void
1435ev_child_stop (EV_P_ struct ev_child *w) 1698ev_child_stop (EV_P_ ev_child *w)
1436{ 1699{
1437 ev_clear_pending (EV_A_ (W)w); 1700 ev_clear_pending (EV_A_ (W)w);
1438 if (ev_is_active (w)) 1701 if (expect_false (!ev_is_active (w)))
1439 return; 1702 return;
1440 1703
1441 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1442 ev_stop (EV_A_ (W)w); 1705 ev_stop (EV_A_ (W)w);
1443} 1706}
1444 1707
1708#if EV_STAT_ENABLE
1709
1710# ifdef _WIN32
1711# undef lstat
1712# define lstat(a,b) _stati64 (a,b)
1713# endif
1714
1715#define DEF_STAT_INTERVAL 5.0074891
1716#define MIN_STAT_INTERVAL 0.1074891
1717
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719
1720#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE ((PATH_MAX + sizeof (struct inotify_event)) + 2048)
1722
1723static void noinline
1724infy_add (EV_P_ ev_stat *w)
1725{
1726 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1727
1728 if (w->wd < 0)
1729 {
1730 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1731
1732 /* monitor some parent directory for speedup hints */
1733 if (errno == ENOENT || errno == EACCES)
1734 {
1735 char path [PATH_MAX];
1736 strcpy (path, w->path);
1737
1738 do
1739 {
1740 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1741 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1742
1743 char *pend = strrchr (path, '/');
1744
1745 if (!pend)
1746 break; /* whoops, no '/', complain to your admin */
1747
1748 *pend = 0;
1749 w->wd = inotify_add_watch (fs_fd, path, IN_DELETE_SELF | IN_CREATE | IN_MOVED_TO | IN_MASK_ADD);
1750 }
1751 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1752 }
1753 }
1754 else
1755 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1756
1757 if (w->wd >= 0)
1758 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1759}
1760
1761static void noinline
1762infy_del (EV_P_ ev_stat *w)
1763{
1764 WL w_;
1765 int slot;
1766 int wd = w->wd;
1767
1768 if (wd < 0)
1769 return;
1770
1771 w->wd = -2;
1772 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1773 wlist_del (&fs_hash [slot].head, (WL)w);
1774
1775 /* remove this watcher, if others are watching it, they will rearm */
1776 inotify_rm_watch (fs_fd, wd);
1777}
1778
1779static void noinline
1780infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1781{
1782 if (slot < 0)
1783 /* overflow, need to check for all hahs slots */
1784 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1785 infy_wd (EV_A_ slot, wd, ev);
1786 else
1787 {
1788 WL w_;
1789
1790 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1791 {
1792 ev_stat *w = (ev_stat *)w_;
1793 w_ = w_->next; /* lets us remove this watcher and all before it */
1794
1795 if (w->wd == wd || wd == -1)
1796 {
1797 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1798 {
1799 w->wd = -1;
1800 infy_add (EV_A_ w); /* re-add, no matter what */
1801 }
1802
1803 stat_timer_cb (EV_P_ &w->timer, 0);
1804 }
1805 }
1806 }
1807}
1808
1809static void
1810infy_cb (EV_P_ ev_io *w, int revents)
1811{
1812 char buf [EV_INOTIFY_BUFSIZE];
1813 struct inotify_event *ev = (struct inotify_event *)buf;
1814 int ofs;
1815 int len = read (fs_fd, buf, sizeof (buf));
1816
1817 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1818 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1819}
1820
1821void inline_size
1822infy_init (EV_P)
1823{
1824 if (fs_fd != -2)
1825 return;
1826
1827 fs_fd = inotify_init ();
1828
1829 if (fs_fd >= 0)
1830 {
1831 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1832 ev_set_priority (&fs_w, EV_MAXPRI);
1833 ev_io_start (EV_A_ &fs_w);
1834 }
1835}
1836
1837#endif
1838
1839void
1840ev_stat_stat (EV_P_ ev_stat *w)
1841{
1842 if (lstat (w->path, &w->attr) < 0)
1843 w->attr.st_nlink = 0;
1844 else if (!w->attr.st_nlink)
1845 w->attr.st_nlink = 1;
1846}
1847
1848void noinline
1849stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1850{
1851 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1852
1853 /* we copy this here each the time so that */
1854 /* prev has the old value when the callback gets invoked */
1855 w->prev = w->attr;
1856 ev_stat_stat (EV_A_ w);
1857
1858 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1859 {
1860 #if EV_USE_INOTIFY
1861 infy_del (EV_A_ w);
1862 infy_add (EV_A_ w);
1863 ev_stat_stat (EV_A_ w); /* avoid race... */
1864 #endif
1865
1866 ev_feed_event (EV_A_ w, EV_STAT);
1867 }
1868}
1869
1870void
1871ev_stat_start (EV_P_ ev_stat *w)
1872{
1873 if (expect_false (ev_is_active (w)))
1874 return;
1875
1876 /* since we use memcmp, we need to clear any padding data etc. */
1877 memset (&w->prev, 0, sizeof (ev_statdata));
1878 memset (&w->attr, 0, sizeof (ev_statdata));
1879
1880 ev_stat_stat (EV_A_ w);
1881
1882 if (w->interval < MIN_STAT_INTERVAL)
1883 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1884
1885 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1886 ev_set_priority (&w->timer, ev_priority (w));
1887
1888#if EV_USE_INOTIFY
1889 infy_init (EV_A);
1890
1891 if (fs_fd >= 0)
1892 infy_add (EV_A_ w);
1893 else
1894#endif
1895 ev_timer_start (EV_A_ &w->timer);
1896
1897 ev_start (EV_A_ (W)w, 1);
1898}
1899
1900void
1901ev_stat_stop (EV_P_ ev_stat *w)
1902{
1903 ev_clear_pending (EV_A_ (W)w);
1904 if (expect_false (!ev_is_active (w)))
1905 return;
1906
1907#if EV_USE_INOTIFY
1908 infy_del (EV_A_ w);
1909#endif
1910 ev_timer_stop (EV_A_ &w->timer);
1911
1912 ev_stop (EV_A_ (W)w);
1913}
1914#endif
1915
1916void
1917ev_idle_start (EV_P_ ev_idle *w)
1918{
1919 if (expect_false (ev_is_active (w)))
1920 return;
1921
1922 ev_start (EV_A_ (W)w, ++idlecnt);
1923 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1924 idles [idlecnt - 1] = w;
1925}
1926
1927void
1928ev_idle_stop (EV_P_ ev_idle *w)
1929{
1930 ev_clear_pending (EV_A_ (W)w);
1931 if (expect_false (!ev_is_active (w)))
1932 return;
1933
1934 {
1935 int active = ((W)w)->active;
1936 idles [active - 1] = idles [--idlecnt];
1937 ((W)idles [active - 1])->active = active;
1938 }
1939
1940 ev_stop (EV_A_ (W)w);
1941}
1942
1943void
1944ev_prepare_start (EV_P_ ev_prepare *w)
1945{
1946 if (expect_false (ev_is_active (w)))
1947 return;
1948
1949 ev_start (EV_A_ (W)w, ++preparecnt);
1950 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1951 prepares [preparecnt - 1] = w;
1952}
1953
1954void
1955ev_prepare_stop (EV_P_ ev_prepare *w)
1956{
1957 ev_clear_pending (EV_A_ (W)w);
1958 if (expect_false (!ev_is_active (w)))
1959 return;
1960
1961 {
1962 int active = ((W)w)->active;
1963 prepares [active - 1] = prepares [--preparecnt];
1964 ((W)prepares [active - 1])->active = active;
1965 }
1966
1967 ev_stop (EV_A_ (W)w);
1968}
1969
1970void
1971ev_check_start (EV_P_ ev_check *w)
1972{
1973 if (expect_false (ev_is_active (w)))
1974 return;
1975
1976 ev_start (EV_A_ (W)w, ++checkcnt);
1977 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1978 checks [checkcnt - 1] = w;
1979}
1980
1981void
1982ev_check_stop (EV_P_ ev_check *w)
1983{
1984 ev_clear_pending (EV_A_ (W)w);
1985 if (expect_false (!ev_is_active (w)))
1986 return;
1987
1988 {
1989 int active = ((W)w)->active;
1990 checks [active - 1] = checks [--checkcnt];
1991 ((W)checks [active - 1])->active = active;
1992 }
1993
1994 ev_stop (EV_A_ (W)w);
1995}
1996
1997#if EV_EMBED_ENABLE
1998void noinline
1999ev_embed_sweep (EV_P_ ev_embed *w)
2000{
2001 ev_loop (w->loop, EVLOOP_NONBLOCK);
2002}
2003
2004static void
2005embed_cb (EV_P_ ev_io *io, int revents)
2006{
2007 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2008
2009 if (ev_cb (w))
2010 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2011 else
2012 ev_embed_sweep (loop, w);
2013}
2014
2015void
2016ev_embed_start (EV_P_ ev_embed *w)
2017{
2018 if (expect_false (ev_is_active (w)))
2019 return;
2020
2021 {
2022 struct ev_loop *loop = w->loop;
2023 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2024 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2025 }
2026
2027 ev_set_priority (&w->io, ev_priority (w));
2028 ev_io_start (EV_A_ &w->io);
2029
2030 ev_start (EV_A_ (W)w, 1);
2031}
2032
2033void
2034ev_embed_stop (EV_P_ ev_embed *w)
2035{
2036 ev_clear_pending (EV_A_ (W)w);
2037 if (expect_false (!ev_is_active (w)))
2038 return;
2039
2040 ev_io_stop (EV_A_ &w->io);
2041
2042 ev_stop (EV_A_ (W)w);
2043}
2044#endif
2045
2046#if EV_FORK_ENABLE
2047void
2048ev_fork_start (EV_P_ ev_fork *w)
2049{
2050 if (expect_false (ev_is_active (w)))
2051 return;
2052
2053 ev_start (EV_A_ (W)w, ++forkcnt);
2054 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2055 forks [forkcnt - 1] = w;
2056}
2057
2058void
2059ev_fork_stop (EV_P_ ev_fork *w)
2060{
2061 ev_clear_pending (EV_A_ (W)w);
2062 if (expect_false (!ev_is_active (w)))
2063 return;
2064
2065 {
2066 int active = ((W)w)->active;
2067 forks [active - 1] = forks [--forkcnt];
2068 ((W)forks [active - 1])->active = active;
2069 }
2070
2071 ev_stop (EV_A_ (W)w);
2072}
2073#endif
2074
1445/*****************************************************************************/ 2075/*****************************************************************************/
1446 2076
1447struct ev_once 2077struct ev_once
1448{ 2078{
1449 struct ev_io io; 2079 ev_io io;
1450 struct ev_timer to; 2080 ev_timer to;
1451 void (*cb)(int revents, void *arg); 2081 void (*cb)(int revents, void *arg);
1452 void *arg; 2082 void *arg;
1453}; 2083};
1454 2084
1455static void 2085static void
1464 2094
1465 cb (revents, arg); 2095 cb (revents, arg);
1466} 2096}
1467 2097
1468static void 2098static void
1469once_cb_io (EV_P_ struct ev_io *w, int revents) 2099once_cb_io (EV_P_ ev_io *w, int revents)
1470{ 2100{
1471 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 2101 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1472} 2102}
1473 2103
1474static void 2104static void
1475once_cb_to (EV_P_ struct ev_timer *w, int revents) 2105once_cb_to (EV_P_ ev_timer *w, int revents)
1476{ 2106{
1477 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 2107 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1478} 2108}
1479 2109
1480void 2110void
1481ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 2111ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1482{ 2112{
1483 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 2113 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1484 2114
1485 if (!once) 2115 if (expect_false (!once))
2116 {
1486 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 2117 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1487 else 2118 return;
1488 { 2119 }
2120
1489 once->cb = cb; 2121 once->cb = cb;
1490 once->arg = arg; 2122 once->arg = arg;
1491 2123
1492 ev_watcher_init (&once->io, once_cb_io); 2124 ev_init (&once->io, once_cb_io);
1493 if (fd >= 0) 2125 if (fd >= 0)
1494 { 2126 {
1495 ev_io_set (&once->io, fd, events); 2127 ev_io_set (&once->io, fd, events);
1496 ev_io_start (EV_A_ &once->io); 2128 ev_io_start (EV_A_ &once->io);
1497 } 2129 }
1498 2130
1499 ev_watcher_init (&once->to, once_cb_to); 2131 ev_init (&once->to, once_cb_to);
1500 if (timeout >= 0.) 2132 if (timeout >= 0.)
1501 { 2133 {
1502 ev_timer_set (&once->to, timeout, 0.); 2134 ev_timer_set (&once->to, timeout, 0.);
1503 ev_timer_start (EV_A_ &once->to); 2135 ev_timer_start (EV_A_ &once->to);
1504 }
1505 } 2136 }
1506} 2137}
1507 2138
2139#ifdef __cplusplus
2140}
2141#endif
2142

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines