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

Comparing libev/ev.c (file contents):
Revision 1.28 by root, Thu Nov 1 06:48:49 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 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#ifdef 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 ev_io_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 ev_io_set (&sigev, sigpipe [0], EV_READ); 457 ev_io_set (&sigev, sigpipe [0], EV_READ);
376 ev_io_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
547static void
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 ev_watcher_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 ev_signal_init (&childev, childcb, SIGCHLD); 595 ev_signal_init (&childev, childcb, SIGCHLD);
596 ev_set_priority (&childev, EV_MAXPRI);
468 ev_signal_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#ifdef 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 loop_init (EV_A_ methods);
614
615 return loop;
616}
617
618void
619ev_loop_delete (EV_P)
620{
621 /*TODO*/
622 free (loop);
623}
624
625#else
626
627int
628ev_init (int methods)
629{
630 loop_init ();
631}
632
633#endif
474 634
475/*****************************************************************************/ 635/*****************************************************************************/
476 636
477void 637void
478ev_prefork (void) 638ev_fork_prepare (void)
479{ 639{
480 /* nop */ 640 /* nop */
481} 641}
482 642
483void 643void
484ev_postfork_parent (void) 644ev_fork_parent (void)
485{ 645{
486 /* nop */ 646 /* nop */
487} 647}
488 648
489void 649void
490ev_postfork_child (void) 650ev_fork_child (void)
491{ 651{
652 /*TODO*/
653#if !EV_MULTIPLICITY
492#if HAVE_EPOLL 654#if EV_USE_EPOLL
493 if (ev_method == EVMETHOD_EPOLL) 655 if (method == EVMETHOD_EPOLL)
494 epoll_postfork_child (); 656 epoll_postfork_child (EV_A);
495#endif 657#endif
496 658
497 ev_io_stop (&sigev); 659 ev_io_stop (EV_A_ &sigev);
498 close (sigpipe [0]); 660 close (sigpipe [0]);
499 close (sigpipe [1]); 661 close (sigpipe [1]);
500 pipe (sigpipe); 662 pipe (sigpipe);
501 siginit (); 663 siginit (EV_A);
664#endif
502} 665}
503 666
504/*****************************************************************************/ 667/*****************************************************************************/
505 668
506static void 669static void
507call_pending (void) 670call_pending (EV_P)
508{ 671{
672 int pri;
673
674 for (pri = NUMPRI; pri--; )
509 while (pendingcnt) 675 while (pendingcnt [pri])
510 { 676 {
511 ANPENDING *p = pendings + --pendingcnt; 677 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
512 678
513 if (p->w) 679 if (p->w)
514 { 680 {
515 p->w->pending = 0; 681 p->w->pending = 0;
516 p->w->cb (p->w, p->events); 682 p->w->cb (EV_A_ p->w, p->events);
517 } 683 }
518 } 684 }
519} 685}
520 686
521static void 687static void
522timers_reify (void) 688timers_reify (EV_P)
523{ 689{
524 while (timercnt && timers [0]->at <= now) 690 while (timercnt && timers [0]->at <= mn_now)
525 { 691 {
526 struct ev_timer *w = timers [0]; 692 struct ev_timer *w = timers [0];
527
528 event ((W)w, EV_TIMEOUT);
529 693
530 /* first reschedule or stop timer */ 694 /* first reschedule or stop timer */
531 if (w->repeat) 695 if (w->repeat)
532 { 696 {
697 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
533 w->at = now + w->repeat; 698 w->at = mn_now + w->repeat;
534 assert (("timer timeout in the past, negative repeat?", w->at > now));
535 downheap ((WT *)timers, timercnt, 0); 699 downheap ((WT *)timers, timercnt, 0);
536 } 700 }
537 else 701 else
538 ev_timer_stop (w); /* nonrepeating: stop timer */ 702 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
539 }
540}
541 703
704 event (EV_A_ (W)w, EV_TIMEOUT);
705 }
706}
707
542static void 708static void
543periodics_reify (void) 709periodics_reify (EV_P)
544{ 710{
545 while (periodiccnt && periodics [0]->at <= ev_now) 711 while (periodiccnt && periodics [0]->at <= rt_now)
546 { 712 {
547 struct ev_periodic *w = periodics [0]; 713 struct ev_periodic *w = periodics [0];
548 714
549 /* first reschedule or stop timer */ 715 /* first reschedule or stop timer */
550 if (w->interval) 716 if (w->interval)
551 { 717 {
552 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 718 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)); 719 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
554 downheap ((WT *)periodics, periodiccnt, 0); 720 downheap ((WT *)periodics, periodiccnt, 0);
555 } 721 }
556 else 722 else
557 ev_periodic_stop (w); /* nonrepeating: stop timer */ 723 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
558 724
559 event ((W)w, EV_TIMEOUT); 725 event (EV_A_ (W)w, EV_PERIODIC);
560 } 726 }
561} 727}
562 728
563static void 729static void
564periodics_reschedule (ev_tstamp diff) 730periodics_reschedule (EV_P)
565{ 731{
566 int i; 732 int i;
567 733
568 /* adjust periodics after time jump */ 734 /* adjust periodics after time jump */
569 for (i = 0; i < periodiccnt; ++i) 735 for (i = 0; i < periodiccnt; ++i)
570 { 736 {
571 struct ev_periodic *w = periodics [i]; 737 struct ev_periodic *w = periodics [i];
572 738
573 if (w->interval) 739 if (w->interval)
574 { 740 {
575 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 741 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
576 742
577 if (fabs (diff) >= 1e-4) 743 if (fabs (diff) >= 1e-4)
578 { 744 {
579 ev_periodic_stop (w); 745 ev_periodic_stop (EV_A_ w);
580 ev_periodic_start (w); 746 ev_periodic_start (EV_A_ w);
581 747
582 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 748 i = 0; /* restart loop, inefficient, but time jumps should be rare */
583 } 749 }
584 } 750 }
585 } 751 }
586} 752}
587 753
754inline int
755time_update_monotonic (EV_P)
756{
757 mn_now = get_clock ();
758
759 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
760 {
761 rt_now = rtmn_diff + mn_now;
762 return 0;
763 }
764 else
765 {
766 now_floor = mn_now;
767 rt_now = ev_time ();
768 return 1;
769 }
770}
771
588static void 772static void
589time_update (void) 773time_update (EV_P)
590{ 774{
591 int i; 775 int i;
592 776
593 ev_now = ev_time (); 777#if EV_USE_MONOTONIC
594
595 if (have_monotonic) 778 if (expect_true (have_monotonic))
596 { 779 {
597 ev_tstamp odiff = diff; 780 if (time_update_monotonic (EV_A))
598
599 for (i = 4; --i; ) /* loop a few times, before making important decisions */
600 { 781 {
601 now = get_clock (); 782 ev_tstamp odiff = rtmn_diff;
783
784 for (i = 4; --i; ) /* loop a few times, before making important decisions */
785 {
602 diff = ev_now - now; 786 rtmn_diff = rt_now - mn_now;
603 787
604 if (fabs (odiff - diff) < MIN_TIMEJUMP) 788 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
605 return; /* all is well */ 789 return; /* all is well */
606 790
607 ev_now = ev_time (); 791 rt_now = ev_time ();
792 mn_now = get_clock ();
793 now_floor = mn_now;
794 }
795
796 periodics_reschedule (EV_A);
797 /* no timer adjustment, as the monotonic clock doesn't jump */
798 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
608 } 799 }
609
610 periodics_reschedule (diff - odiff);
611 /* no timer adjustment, as the monotonic clock doesn't jump */
612 } 800 }
613 else 801 else
802#endif
614 { 803 {
615 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 804 rt_now = ev_time ();
805
806 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
616 { 807 {
617 periodics_reschedule (ev_now - now); 808 periodics_reschedule (EV_A);
618 809
619 /* adjust timers. this is easy, as the offset is the same for all */ 810 /* adjust timers. this is easy, as the offset is the same for all */
620 for (i = 0; i < timercnt; ++i) 811 for (i = 0; i < timercnt; ++i)
621 timers [i]->at += diff; 812 timers [i]->at += rt_now - mn_now;
622 } 813 }
623 814
624 now = ev_now; 815 mn_now = rt_now;
625 } 816 }
626} 817}
627 818
628int ev_loop_done; 819void
820ev_ref (EV_P)
821{
822 ++activecnt;
823}
629 824
825void
826ev_unref (EV_P)
827{
828 --activecnt;
829}
830
831static int loop_done;
832
833void
630void ev_loop (int flags) 834ev_loop (EV_P_ int flags)
631{ 835{
632 double block; 836 double block;
633 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 837 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
634 838
635 do 839 do
636 { 840 {
637 /* queue check watchers (and execute them) */ 841 /* queue check watchers (and execute them) */
638 if (preparecnt) 842 if (expect_false (preparecnt))
639 { 843 {
640 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 844 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
641 call_pending (); 845 call_pending (EV_A);
642 } 846 }
643 847
644 /* update fd-related kernel structures */ 848 /* update fd-related kernel structures */
645 fd_reify (); 849 fd_reify (EV_A);
646 850
647 /* calculate blocking time */ 851 /* calculate blocking time */
648 852
649 /* we only need this for !monotonic clockor timers, but as we basically 853 /* we only need this for !monotonic clockor timers, but as we basically
650 always have timers, we just calculate it always */ 854 always have timers, we just calculate it always */
855#if EV_USE_MONOTONIC
856 if (expect_true (have_monotonic))
857 time_update_monotonic (EV_A);
858 else
859#endif
860 {
651 ev_now = ev_time (); 861 rt_now = ev_time ();
862 mn_now = rt_now;
863 }
652 864
653 if (flags & EVLOOP_NONBLOCK || idlecnt) 865 if (flags & EVLOOP_NONBLOCK || idlecnt)
654 block = 0.; 866 block = 0.;
655 else 867 else
656 { 868 {
657 block = MAX_BLOCKTIME; 869 block = MAX_BLOCKTIME;
658 870
659 if (timercnt) 871 if (timercnt)
660 { 872 {
661 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 873 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
662 if (block > to) block = to; 874 if (block > to) block = to;
663 } 875 }
664 876
665 if (periodiccnt) 877 if (periodiccnt)
666 { 878 {
667 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 879 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
668 if (block > to) block = to; 880 if (block > to) block = to;
669 } 881 }
670 882
671 if (block < 0.) block = 0.; 883 if (block < 0.) block = 0.;
672 } 884 }
673 885
674 method_poll (block); 886 method_poll (EV_A_ block);
675 887
676 /* update ev_now, do magic */ 888 /* update rt_now, do magic */
677 time_update (); 889 time_update (EV_A);
678 890
679 /* queue pending timers and reschedule them */ 891 /* queue pending timers and reschedule them */
680 timers_reify (); /* relative timers called last */ 892 timers_reify (EV_A); /* relative timers called last */
681 periodics_reify (); /* absolute timers called first */ 893 periodics_reify (EV_A); /* absolute timers called first */
682 894
683 /* queue idle watchers unless io or timers are pending */ 895 /* queue idle watchers unless io or timers are pending */
684 if (!pendingcnt) 896 if (!pendingcnt)
685 queue_events ((W *)idles, idlecnt, EV_IDLE); 897 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
686 898
687 /* queue check watchers, to be executed first */ 899 /* queue check watchers, to be executed first */
688 if (checkcnt) 900 if (checkcnt)
689 queue_events ((W *)checks, checkcnt, EV_CHECK); 901 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
690 902
691 call_pending (); 903 call_pending (EV_A);
692 } 904 }
693 while (!ev_loop_done); 905 while (activecnt && !loop_done);
694 906
695 if (ev_loop_done != 2) 907 if (loop_done != 2)
696 ev_loop_done = 0; 908 loop_done = 0;
909}
910
911void
912ev_unloop (EV_P_ int how)
913{
914 loop_done = how;
697} 915}
698 916
699/*****************************************************************************/ 917/*****************************************************************************/
700 918
701static void 919inline void
702wlist_add (WL *head, WL elem) 920wlist_add (WL *head, WL elem)
703{ 921{
704 elem->next = *head; 922 elem->next = *head;
705 *head = elem; 923 *head = elem;
706} 924}
707 925
708static void 926inline void
709wlist_del (WL *head, WL elem) 927wlist_del (WL *head, WL elem)
710{ 928{
711 while (*head) 929 while (*head)
712 { 930 {
713 if (*head == elem) 931 if (*head == elem)
718 936
719 head = &(*head)->next; 937 head = &(*head)->next;
720 } 938 }
721} 939}
722 940
723static void 941inline void
724ev_clear (W w) 942ev_clear_pending (EV_P_ W w)
725{ 943{
726 if (w->pending) 944 if (w->pending)
727 { 945 {
728 pendings [w->pending - 1].w = 0; 946 pendings [ABSPRI (w)][w->pending - 1].w = 0;
729 w->pending = 0; 947 w->pending = 0;
730 } 948 }
731} 949}
732 950
733static void 951inline void
734ev_start (W w, int active) 952ev_start (EV_P_ W w, int active)
735{ 953{
954 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
955 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
956
736 w->active = active; 957 w->active = active;
958 ev_ref (EV_A);
737} 959}
738 960
739static void 961inline void
740ev_stop (W w) 962ev_stop (EV_P_ W w)
741{ 963{
964 ev_unref (EV_A);
742 w->active = 0; 965 w->active = 0;
743} 966}
744 967
745/*****************************************************************************/ 968/*****************************************************************************/
746 969
747void 970void
748ev_io_start (struct ev_io *w) 971ev_io_start (EV_P_ struct ev_io *w)
749{ 972{
973 int fd = w->fd;
974
750 if (ev_is_active (w)) 975 if (ev_is_active (w))
751 return; 976 return;
752 977
753 int fd = w->fd; 978 assert (("ev_io_start called with negative fd", fd >= 0));
754 979
755 ev_start ((W)w, 1); 980 ev_start (EV_A_ (W)w, 1);
756 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 981 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
757 wlist_add ((WL *)&anfds[fd].head, (WL)w); 982 wlist_add ((WL *)&anfds[fd].head, (WL)w);
758 983
759 fd_change (fd); 984 fd_change (EV_A_ fd);
760} 985}
761 986
762void 987void
763ev_io_stop (struct ev_io *w) 988ev_io_stop (EV_P_ struct ev_io *w)
764{ 989{
765 ev_clear ((W)w); 990 ev_clear_pending (EV_A_ (W)w);
766 if (!ev_is_active (w)) 991 if (!ev_is_active (w))
767 return; 992 return;
768 993
769 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 994 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
770 ev_stop ((W)w); 995 ev_stop (EV_A_ (W)w);
771 996
772 fd_change (w->fd); 997 fd_change (EV_A_ w->fd);
773} 998}
774 999
775void 1000void
776ev_timer_start (struct ev_timer *w) 1001ev_timer_start (EV_P_ struct ev_timer *w)
777{ 1002{
778 if (ev_is_active (w)) 1003 if (ev_is_active (w))
779 return; 1004 return;
780 1005
781 w->at += now; 1006 w->at += mn_now;
782 1007
783 assert (("timer repeat value less than zero not allowed", w->repeat >= 0.)); 1008 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
784 1009
785 ev_start ((W)w, ++timercnt); 1010 ev_start (EV_A_ (W)w, ++timercnt);
786 array_needsize (timers, timermax, timercnt, ); 1011 array_needsize (timers, timermax, timercnt, );
787 timers [timercnt - 1] = w; 1012 timers [timercnt - 1] = w;
788 upheap ((WT *)timers, timercnt - 1); 1013 upheap ((WT *)timers, timercnt - 1);
789} 1014}
790 1015
791void 1016void
792ev_timer_stop (struct ev_timer *w) 1017ev_timer_stop (EV_P_ struct ev_timer *w)
793{ 1018{
794 ev_clear ((W)w); 1019 ev_clear_pending (EV_A_ (W)w);
795 if (!ev_is_active (w)) 1020 if (!ev_is_active (w))
796 return; 1021 return;
797 1022
798 if (w->active < timercnt--) 1023 if (w->active < timercnt--)
799 { 1024 {
801 downheap ((WT *)timers, timercnt, w->active - 1); 1026 downheap ((WT *)timers, timercnt, w->active - 1);
802 } 1027 }
803 1028
804 w->at = w->repeat; 1029 w->at = w->repeat;
805 1030
806 ev_stop ((W)w); 1031 ev_stop (EV_A_ (W)w);
807} 1032}
808 1033
809void 1034void
810ev_timer_again (struct ev_timer *w) 1035ev_timer_again (EV_P_ struct ev_timer *w)
811{ 1036{
812 if (ev_is_active (w)) 1037 if (ev_is_active (w))
813 { 1038 {
814 if (w->repeat) 1039 if (w->repeat)
815 { 1040 {
816 w->at = now + w->repeat; 1041 w->at = mn_now + w->repeat;
817 downheap ((WT *)timers, timercnt, w->active - 1); 1042 downheap ((WT *)timers, timercnt, w->active - 1);
818 } 1043 }
819 else 1044 else
820 ev_timer_stop (w); 1045 ev_timer_stop (EV_A_ w);
821 } 1046 }
822 else if (w->repeat) 1047 else if (w->repeat)
823 ev_timer_start (w); 1048 ev_timer_start (EV_A_ w);
824} 1049}
825 1050
826void 1051void
827ev_periodic_start (struct ev_periodic *w) 1052ev_periodic_start (EV_P_ struct ev_periodic *w)
828{ 1053{
829 if (ev_is_active (w)) 1054 if (ev_is_active (w))
830 return; 1055 return;
831 1056
832 assert (("periodic interval value less than zero not allowed", w->interval >= 0.)); 1057 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
833 1058
834 /* this formula differs from the one in periodic_reify because we do not always round up */ 1059 /* this formula differs from the one in periodic_reify because we do not always round up */
835 if (w->interval) 1060 if (w->interval)
836 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1061 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
837 1062
838 ev_start ((W)w, ++periodiccnt); 1063 ev_start (EV_A_ (W)w, ++periodiccnt);
839 array_needsize (periodics, periodicmax, periodiccnt, ); 1064 array_needsize (periodics, periodicmax, periodiccnt, );
840 periodics [periodiccnt - 1] = w; 1065 periodics [periodiccnt - 1] = w;
841 upheap ((WT *)periodics, periodiccnt - 1); 1066 upheap ((WT *)periodics, periodiccnt - 1);
842} 1067}
843 1068
844void 1069void
845ev_periodic_stop (struct ev_periodic *w) 1070ev_periodic_stop (EV_P_ struct ev_periodic *w)
846{ 1071{
847 ev_clear ((W)w); 1072 ev_clear_pending (EV_A_ (W)w);
848 if (!ev_is_active (w)) 1073 if (!ev_is_active (w))
849 return; 1074 return;
850 1075
851 if (w->active < periodiccnt--) 1076 if (w->active < periodiccnt--)
852 { 1077 {
853 periodics [w->active - 1] = periodics [periodiccnt]; 1078 periodics [w->active - 1] = periodics [periodiccnt];
854 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1079 downheap ((WT *)periodics, periodiccnt, w->active - 1);
855 } 1080 }
856 1081
857 ev_stop ((W)w); 1082 ev_stop (EV_A_ (W)w);
858} 1083}
859 1084
1085#ifndef SA_RESTART
1086# define SA_RESTART 0
1087#endif
1088
860void 1089void
861ev_signal_start (struct ev_signal *w) 1090ev_signal_start (EV_P_ struct ev_signal *w)
862{ 1091{
863 if (ev_is_active (w)) 1092 if (ev_is_active (w))
864 return; 1093 return;
865 1094
1095 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1096
866 ev_start ((W)w, 1); 1097 ev_start (EV_A_ (W)w, 1);
867 array_needsize (signals, signalmax, w->signum, signals_init); 1098 array_needsize (signals, signalmax, w->signum, signals_init);
868 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1099 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
869 1100
870 if (!w->next) 1101 if (!w->next)
871 { 1102 {
872 struct sigaction sa; 1103 struct sigaction sa;
873 sa.sa_handler = sighandler; 1104 sa.sa_handler = sighandler;
874 sigfillset (&sa.sa_mask); 1105 sigfillset (&sa.sa_mask);
875 sa.sa_flags = 0; 1106 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
876 sigaction (w->signum, &sa, 0); 1107 sigaction (w->signum, &sa, 0);
877 } 1108 }
878} 1109}
879 1110
880void 1111void
881ev_signal_stop (struct ev_signal *w) 1112ev_signal_stop (EV_P_ struct ev_signal *w)
882{ 1113{
883 ev_clear ((W)w); 1114 ev_clear_pending (EV_A_ (W)w);
884 if (!ev_is_active (w)) 1115 if (!ev_is_active (w))
885 return; 1116 return;
886 1117
887 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1118 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
888 ev_stop ((W)w); 1119 ev_stop (EV_A_ (W)w);
889 1120
890 if (!signals [w->signum - 1].head) 1121 if (!signals [w->signum - 1].head)
891 signal (w->signum, SIG_DFL); 1122 signal (w->signum, SIG_DFL);
892} 1123}
893 1124
894void 1125void
895ev_idle_start (struct ev_idle *w) 1126ev_idle_start (EV_P_ struct ev_idle *w)
896{ 1127{
897 if (ev_is_active (w)) 1128 if (ev_is_active (w))
898 return; 1129 return;
899 1130
900 ev_start ((W)w, ++idlecnt); 1131 ev_start (EV_A_ (W)w, ++idlecnt);
901 array_needsize (idles, idlemax, idlecnt, ); 1132 array_needsize (idles, idlemax, idlecnt, );
902 idles [idlecnt - 1] = w; 1133 idles [idlecnt - 1] = w;
903} 1134}
904 1135
905void 1136void
906ev_idle_stop (struct ev_idle *w) 1137ev_idle_stop (EV_P_ struct ev_idle *w)
907{ 1138{
908 ev_clear ((W)w); 1139 ev_clear_pending (EV_A_ (W)w);
909 if (ev_is_active (w)) 1140 if (ev_is_active (w))
910 return; 1141 return;
911 1142
912 idles [w->active - 1] = idles [--idlecnt]; 1143 idles [w->active - 1] = idles [--idlecnt];
913 ev_stop ((W)w); 1144 ev_stop (EV_A_ (W)w);
914} 1145}
915 1146
916void 1147void
917ev_prepare_start (struct ev_prepare *w) 1148ev_prepare_start (EV_P_ struct ev_prepare *w)
918{ 1149{
919 if (ev_is_active (w)) 1150 if (ev_is_active (w))
920 return; 1151 return;
921 1152
922 ev_start ((W)w, ++preparecnt); 1153 ev_start (EV_A_ (W)w, ++preparecnt);
923 array_needsize (prepares, preparemax, preparecnt, ); 1154 array_needsize (prepares, preparemax, preparecnt, );
924 prepares [preparecnt - 1] = w; 1155 prepares [preparecnt - 1] = w;
925} 1156}
926 1157
927void 1158void
928ev_prepare_stop (struct ev_prepare *w) 1159ev_prepare_stop (EV_P_ struct ev_prepare *w)
929{ 1160{
930 ev_clear ((W)w); 1161 ev_clear_pending (EV_A_ (W)w);
931 if (ev_is_active (w)) 1162 if (ev_is_active (w))
932 return; 1163 return;
933 1164
934 prepares [w->active - 1] = prepares [--preparecnt]; 1165 prepares [w->active - 1] = prepares [--preparecnt];
935 ev_stop ((W)w); 1166 ev_stop (EV_A_ (W)w);
936} 1167}
937 1168
938void 1169void
939ev_check_start (struct ev_check *w) 1170ev_check_start (EV_P_ struct ev_check *w)
940{ 1171{
941 if (ev_is_active (w)) 1172 if (ev_is_active (w))
942 return; 1173 return;
943 1174
944 ev_start ((W)w, ++checkcnt); 1175 ev_start (EV_A_ (W)w, ++checkcnt);
945 array_needsize (checks, checkmax, checkcnt, ); 1176 array_needsize (checks, checkmax, checkcnt, );
946 checks [checkcnt - 1] = w; 1177 checks [checkcnt - 1] = w;
947} 1178}
948 1179
949void 1180void
950ev_check_stop (struct ev_check *w) 1181ev_check_stop (EV_P_ struct ev_check *w)
951{ 1182{
952 ev_clear ((W)w); 1183 ev_clear_pending (EV_A_ (W)w);
953 if (ev_is_active (w)) 1184 if (ev_is_active (w))
954 return; 1185 return;
955 1186
956 checks [w->active - 1] = checks [--checkcnt]; 1187 checks [w->active - 1] = checks [--checkcnt];
957 ev_stop ((W)w); 1188 ev_stop (EV_A_ (W)w);
958} 1189}
959 1190
960void 1191void
961ev_child_start (struct ev_child *w) 1192ev_child_start (EV_P_ struct ev_child *w)
962{ 1193{
963 if (ev_is_active (w)) 1194 if (ev_is_active (w))
964 return; 1195 return;
965 1196
966 ev_start ((W)w, 1); 1197 ev_start (EV_A_ (W)w, 1);
967 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1198 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
968} 1199}
969 1200
970void 1201void
971ev_child_stop (struct ev_child *w) 1202ev_child_stop (EV_P_ struct ev_child *w)
972{ 1203{
973 ev_clear ((W)w); 1204 ev_clear_pending (EV_A_ (W)w);
974 if (ev_is_active (w)) 1205 if (ev_is_active (w))
975 return; 1206 return;
976 1207
977 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1208 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
978 ev_stop ((W)w); 1209 ev_stop (EV_A_ (W)w);
979} 1210}
980 1211
981/*****************************************************************************/ 1212/*****************************************************************************/
982 1213
983struct ev_once 1214struct ev_once
987 void (*cb)(int revents, void *arg); 1218 void (*cb)(int revents, void *arg);
988 void *arg; 1219 void *arg;
989}; 1220};
990 1221
991static void 1222static void
992once_cb (struct ev_once *once, int revents) 1223once_cb (EV_P_ struct ev_once *once, int revents)
993{ 1224{
994 void (*cb)(int revents, void *arg) = once->cb; 1225 void (*cb)(int revents, void *arg) = once->cb;
995 void *arg = once->arg; 1226 void *arg = once->arg;
996 1227
997 ev_io_stop (&once->io); 1228 ev_io_stop (EV_A_ &once->io);
998 ev_timer_stop (&once->to); 1229 ev_timer_stop (EV_A_ &once->to);
999 free (once); 1230 free (once);
1000 1231
1001 cb (revents, arg); 1232 cb (revents, arg);
1002} 1233}
1003 1234
1004static void 1235static void
1005once_cb_io (struct ev_io *w, int revents) 1236once_cb_io (EV_P_ struct ev_io *w, int revents)
1006{ 1237{
1007 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1238 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1008} 1239}
1009 1240
1010static void 1241static void
1011once_cb_to (struct ev_timer *w, int revents) 1242once_cb_to (EV_P_ struct ev_timer *w, int revents)
1012{ 1243{
1013 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1244 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1014} 1245}
1015 1246
1016void 1247void
1017ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1248ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1018{ 1249{
1019 struct ev_once *once = malloc (sizeof (struct ev_once)); 1250 struct ev_once *once = malloc (sizeof (struct ev_once));
1020 1251
1021 if (!once) 1252 if (!once)
1022 cb (EV_ERROR, arg); 1253 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1023 else 1254 else
1024 { 1255 {
1025 once->cb = cb; 1256 once->cb = cb;
1026 once->arg = arg; 1257 once->arg = arg;
1027 1258
1028 ev_watcher_init (&once->io, once_cb_io); 1259 ev_watcher_init (&once->io, once_cb_io);
1029
1030 if (fd >= 0) 1260 if (fd >= 0)
1031 { 1261 {
1032 ev_io_set (&once->io, fd, events); 1262 ev_io_set (&once->io, fd, events);
1033 ev_io_start (&once->io); 1263 ev_io_start (EV_A_ &once->io);
1034 } 1264 }
1035 1265
1036 ev_watcher_init (&once->to, once_cb_to); 1266 ev_watcher_init (&once->to, once_cb_to);
1037
1038 if (timeout >= 0.) 1267 if (timeout >= 0.)
1039 { 1268 {
1040 ev_timer_set (&once->to, timeout, 0.); 1269 ev_timer_set (&once->to, timeout, 0.);
1041 ev_timer_start (&once->to); 1270 ev_timer_start (EV_A_ &once->to);
1042 } 1271 }
1043 } 1272 }
1044} 1273}
1045 1274
1046/*****************************************************************************/ 1275/*****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines