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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines