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

Comparing libev/ev.c (file contents):
Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines