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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines