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

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines