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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines