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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines