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

Comparing libev/ev.c (file contents):
Revision 1.20 by root, Wed Oct 31 18:28:00 2007 UTC vs.
Revision 1.45 by root, Sat Nov 3 09:19:58 2007 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines