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

Comparing libev/ev.c (file contents):
Revision 1.42 by root, Fri Nov 2 20:05:05 2007 UTC vs.
Revision 1.55 by root, Sun Nov 4 00:39:24 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#if 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
547inline int
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#if 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 if (loop_init (EV_A_ methods))
614 return loop;
615
616 ev_loop_delete (loop);
617
618 return 0;
619}
620
621void
622ev_loop_delete (EV_P)
623{
624 /*TODO*/
625 free (loop);
626}
627
628#else
629
630int
631ev_init (int methods)
632{
633 return loop_init (methods);
634}
635
636#endif
566 637
567/*****************************************************************************/ 638/*****************************************************************************/
568 639
569void 640void
570ev_fork_prepare (void) 641ev_fork_prepare (void)
579} 650}
580 651
581void 652void
582ev_fork_child (void) 653ev_fork_child (void)
583{ 654{
655 /*TODO*/
656#if !EV_MULTIPLICITY
584#if EV_USE_EPOLL 657#if EV_USE_EPOLL
585 if (ev_method == EVMETHOD_EPOLL) 658 if (method == EVMETHOD_EPOLL)
586 epoll_postfork_child (); 659 epoll_postfork_child (EV_A);
587#endif 660#endif
588 661
589 ev_io_stop (&sigev); 662 ev_io_stop (EV_A_ &sigev);
590 close (sigpipe [0]); 663 close (sigpipe [0]);
591 close (sigpipe [1]); 664 close (sigpipe [1]);
592 pipe (sigpipe); 665 pipe (sigpipe);
593 siginit (); 666 siginit (EV_A);
667#endif
594} 668}
595 669
596/*****************************************************************************/ 670/*****************************************************************************/
597 671
598static void 672static void
599call_pending (void) 673call_pending (EV_P)
600{ 674{
601 int pri; 675 int pri;
602 676
603 for (pri = NUMPRI; pri--; ) 677 for (pri = NUMPRI; pri--; )
604 while (pendingcnt [pri]) 678 while (pendingcnt [pri])
606 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 680 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
607 681
608 if (p->w) 682 if (p->w)
609 { 683 {
610 p->w->pending = 0; 684 p->w->pending = 0;
611 p->w->cb (p->w, p->events); 685 p->w->cb (EV_A_ p->w, p->events);
612 } 686 }
613 } 687 }
614} 688}
615 689
616static void 690static void
617timers_reify (void) 691timers_reify (EV_P)
618{ 692{
619 while (timercnt && timers [0]->at <= now) 693 while (timercnt && timers [0]->at <= mn_now)
620 { 694 {
621 struct ev_timer *w = timers [0]; 695 struct ev_timer *w = timers [0];
622 696
623 /* first reschedule or stop timer */ 697 /* first reschedule or stop timer */
624 if (w->repeat) 698 if (w->repeat)
625 { 699 {
626 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 700 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
627 w->at = now + w->repeat; 701 w->at = mn_now + w->repeat;
628 downheap ((WT *)timers, timercnt, 0); 702 downheap ((WT *)timers, timercnt, 0);
629 } 703 }
630 else 704 else
631 ev_timer_stop (w); /* nonrepeating: stop timer */ 705 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
632 706
633 event ((W)w, EV_TIMEOUT); 707 event (EV_A_ (W)w, EV_TIMEOUT);
634 } 708 }
635} 709}
636 710
637static void 711static void
638periodics_reify (void) 712periodics_reify (EV_P)
639{ 713{
640 while (periodiccnt && periodics [0]->at <= ev_now) 714 while (periodiccnt && periodics [0]->at <= rt_now)
641 { 715 {
642 struct ev_periodic *w = periodics [0]; 716 struct ev_periodic *w = periodics [0];
643 717
644 /* first reschedule or stop timer */ 718 /* first reschedule or stop timer */
645 if (w->interval) 719 if (w->interval)
646 { 720 {
647 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 721 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)); 722 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
649 downheap ((WT *)periodics, periodiccnt, 0); 723 downheap ((WT *)periodics, periodiccnt, 0);
650 } 724 }
651 else 725 else
652 ev_periodic_stop (w); /* nonrepeating: stop timer */ 726 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
653 727
654 event ((W)w, EV_PERIODIC); 728 event (EV_A_ (W)w, EV_PERIODIC);
655 } 729 }
656} 730}
657 731
658static void 732static void
659periodics_reschedule (ev_tstamp diff) 733periodics_reschedule (EV_P)
660{ 734{
661 int i; 735 int i;
662 736
663 /* adjust periodics after time jump */ 737 /* adjust periodics after time jump */
664 for (i = 0; i < periodiccnt; ++i) 738 for (i = 0; i < periodiccnt; ++i)
665 { 739 {
666 struct ev_periodic *w = periodics [i]; 740 struct ev_periodic *w = periodics [i];
667 741
668 if (w->interval) 742 if (w->interval)
669 { 743 {
670 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 744 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
671 745
672 if (fabs (diff) >= 1e-4) 746 if (fabs (diff) >= 1e-4)
673 { 747 {
674 ev_periodic_stop (w); 748 ev_periodic_stop (EV_A_ w);
675 ev_periodic_start (w); 749 ev_periodic_start (EV_A_ w);
676 750
677 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 751 i = 0; /* restart loop, inefficient, but time jumps should be rare */
678 } 752 }
679 } 753 }
680 } 754 }
681} 755}
682 756
683static int 757inline int
684time_update_monotonic (void) 758time_update_monotonic (EV_P)
685{ 759{
686 now = get_clock (); 760 mn_now = get_clock ();
687 761
688 if (expect_true (now - now_floor < MIN_TIMEJUMP * .5)) 762 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
689 { 763 {
690 ev_now = now + diff; 764 rt_now = rtmn_diff + mn_now;
691 return 0; 765 return 0;
692 } 766 }
693 else 767 else
694 { 768 {
695 now_floor = now; 769 now_floor = mn_now;
696 ev_now = ev_time (); 770 rt_now = ev_time ();
697 return 1; 771 return 1;
698 } 772 }
699} 773}
700 774
701static void 775static void
702time_update (void) 776time_update (EV_P)
703{ 777{
704 int i; 778 int i;
705 779
706#if EV_USE_MONOTONIC 780#if EV_USE_MONOTONIC
707 if (expect_true (have_monotonic)) 781 if (expect_true (have_monotonic))
708 { 782 {
709 if (time_update_monotonic ()) 783 if (time_update_monotonic (EV_A))
710 { 784 {
711 ev_tstamp odiff = diff; 785 ev_tstamp odiff = rtmn_diff;
712 786
713 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 787 for (i = 4; --i; ) /* loop a few times, before making important decisions */
714 { 788 {
715 diff = ev_now - now; 789 rtmn_diff = rt_now - mn_now;
716 790
717 if (fabs (odiff - diff) < MIN_TIMEJUMP) 791 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
718 return; /* all is well */ 792 return; /* all is well */
719 793
720 ev_now = ev_time (); 794 rt_now = ev_time ();
721 now = get_clock (); 795 mn_now = get_clock ();
722 now_floor = now; 796 now_floor = mn_now;
723 } 797 }
724 798
725 periodics_reschedule (diff - odiff); 799 periodics_reschedule (EV_A);
726 /* no timer adjustment, as the monotonic clock doesn't jump */ 800 /* no timer adjustment, as the monotonic clock doesn't jump */
801 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
727 } 802 }
728 } 803 }
729 else 804 else
730#endif 805#endif
731 { 806 {
732 ev_now = ev_time (); 807 rt_now = ev_time ();
733 808
734 if (expect_false (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 809 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
735 { 810 {
736 periodics_reschedule (ev_now - now); 811 periodics_reschedule (EV_A);
737 812
738 /* adjust timers. this is easy, as the offset is the same for all */ 813 /* adjust timers. this is easy, as the offset is the same for all */
739 for (i = 0; i < timercnt; ++i) 814 for (i = 0; i < timercnt; ++i)
740 timers [i]->at += diff; 815 timers [i]->at += rt_now - mn_now;
741 } 816 }
742 817
743 now = ev_now; 818 mn_now = rt_now;
744 } 819 }
745} 820}
746 821
747int ev_loop_done; 822void
823ev_ref (EV_P)
824{
825 ++activecnt;
826}
748 827
828void
829ev_unref (EV_P)
830{
831 --activecnt;
832}
833
834static int loop_done;
835
836void
749void ev_loop (int flags) 837ev_loop (EV_P_ int flags)
750{ 838{
751 double block; 839 double block;
752 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 840 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
753 841
754 do 842 do
755 { 843 {
756 /* queue check watchers (and execute them) */ 844 /* queue check watchers (and execute them) */
757 if (expect_false (preparecnt)) 845 if (expect_false (preparecnt))
758 { 846 {
759 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 847 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
760 call_pending (); 848 call_pending (EV_A);
761 } 849 }
762 850
763 /* update fd-related kernel structures */ 851 /* update fd-related kernel structures */
764 fd_reify (); 852 fd_reify (EV_A);
765 853
766 /* calculate blocking time */ 854 /* calculate blocking time */
767 855
768 /* we only need this for !monotonic clockor timers, but as we basically 856 /* we only need this for !monotonic clockor timers, but as we basically
769 always have timers, we just calculate it always */ 857 always have timers, we just calculate it always */
770#if EV_USE_MONOTONIC 858#if EV_USE_MONOTONIC
771 if (expect_true (have_monotonic)) 859 if (expect_true (have_monotonic))
772 time_update_monotonic (); 860 time_update_monotonic (EV_A);
773 else 861 else
774#endif 862#endif
775 { 863 {
776 ev_now = ev_time (); 864 rt_now = ev_time ();
777 now = ev_now; 865 mn_now = rt_now;
778 } 866 }
779 867
780 if (flags & EVLOOP_NONBLOCK || idlecnt) 868 if (flags & EVLOOP_NONBLOCK || idlecnt)
781 block = 0.; 869 block = 0.;
782 else 870 else
783 { 871 {
784 block = MAX_BLOCKTIME; 872 block = MAX_BLOCKTIME;
785 873
786 if (timercnt) 874 if (timercnt)
787 { 875 {
788 ev_tstamp to = timers [0]->at - now + method_fudge; 876 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
789 if (block > to) block = to; 877 if (block > to) block = to;
790 } 878 }
791 879
792 if (periodiccnt) 880 if (periodiccnt)
793 { 881 {
794 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 882 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
795 if (block > to) block = to; 883 if (block > to) block = to;
796 } 884 }
797 885
798 if (block < 0.) block = 0.; 886 if (block < 0.) block = 0.;
799 } 887 }
800 888
801 method_poll (block); 889 method_poll (EV_A_ block);
802 890
803 /* update ev_now, do magic */ 891 /* update rt_now, do magic */
804 time_update (); 892 time_update (EV_A);
805 893
806 /* queue pending timers and reschedule them */ 894 /* queue pending timers and reschedule them */
807 timers_reify (); /* relative timers called last */ 895 timers_reify (EV_A); /* relative timers called last */
808 periodics_reify (); /* absolute timers called first */ 896 periodics_reify (EV_A); /* absolute timers called first */
809 897
810 /* queue idle watchers unless io or timers are pending */ 898 /* queue idle watchers unless io or timers are pending */
811 if (!pendingcnt) 899 if (!pendingcnt)
812 queue_events ((W *)idles, idlecnt, EV_IDLE); 900 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
813 901
814 /* queue check watchers, to be executed first */ 902 /* queue check watchers, to be executed first */
815 if (checkcnt) 903 if (checkcnt)
816 queue_events ((W *)checks, checkcnt, EV_CHECK); 904 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
817 905
818 call_pending (); 906 call_pending (EV_A);
819 } 907 }
820 while (!ev_loop_done); 908 while (activecnt && !loop_done);
821 909
822 if (ev_loop_done != 2) 910 if (loop_done != 2)
823 ev_loop_done = 0; 911 loop_done = 0;
912}
913
914void
915ev_unloop (EV_P_ int how)
916{
917 loop_done = how;
824} 918}
825 919
826/*****************************************************************************/ 920/*****************************************************************************/
827 921
828static void 922inline void
829wlist_add (WL *head, WL elem) 923wlist_add (WL *head, WL elem)
830{ 924{
831 elem->next = *head; 925 elem->next = *head;
832 *head = elem; 926 *head = elem;
833} 927}
834 928
835static void 929inline void
836wlist_del (WL *head, WL elem) 930wlist_del (WL *head, WL elem)
837{ 931{
838 while (*head) 932 while (*head)
839 { 933 {
840 if (*head == elem) 934 if (*head == elem)
845 939
846 head = &(*head)->next; 940 head = &(*head)->next;
847 } 941 }
848} 942}
849 943
850static void 944inline void
851ev_clear_pending (W w) 945ev_clear_pending (EV_P_ W w)
852{ 946{
853 if (w->pending) 947 if (w->pending)
854 { 948 {
855 pendings [ABSPRI (w)][w->pending - 1].w = 0; 949 pendings [ABSPRI (w)][w->pending - 1].w = 0;
856 w->pending = 0; 950 w->pending = 0;
857 } 951 }
858} 952}
859 953
860static void 954inline void
861ev_start (W w, int active) 955ev_start (EV_P_ W w, int active)
862{ 956{
957 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
958 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
959
863 w->active = active; 960 w->active = active;
961 ev_ref (EV_A);
864} 962}
865 963
866static void 964inline void
867ev_stop (W w) 965ev_stop (EV_P_ W w)
868{ 966{
967 ev_unref (EV_A);
869 w->active = 0; 968 w->active = 0;
870} 969}
871 970
872/*****************************************************************************/ 971/*****************************************************************************/
873 972
874void 973void
875ev_io_start (struct ev_io *w) 974ev_io_start (EV_P_ struct ev_io *w)
876{ 975{
877 int fd = w->fd; 976 int fd = w->fd;
878 977
879 if (ev_is_active (w)) 978 if (ev_is_active (w))
880 return; 979 return;
881 980
882 assert (("ev_io_start called with negative fd", fd >= 0)); 981 assert (("ev_io_start called with negative fd", fd >= 0));
883 982
884 ev_start ((W)w, 1); 983 ev_start (EV_A_ (W)w, 1);
885 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 984 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
886 wlist_add ((WL *)&anfds[fd].head, (WL)w); 985 wlist_add ((WL *)&anfds[fd].head, (WL)w);
887 986
888 fd_change (fd); 987 fd_change (EV_A_ fd);
889} 988}
890 989
891void 990void
892ev_io_stop (struct ev_io *w) 991ev_io_stop (EV_P_ struct ev_io *w)
893{ 992{
894 ev_clear_pending ((W)w); 993 ev_clear_pending (EV_A_ (W)w);
895 if (!ev_is_active (w)) 994 if (!ev_is_active (w))
896 return; 995 return;
897 996
898 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 997 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
899 ev_stop ((W)w); 998 ev_stop (EV_A_ (W)w);
900 999
901 fd_change (w->fd); 1000 fd_change (EV_A_ w->fd);
902} 1001}
903 1002
904void 1003void
905ev_timer_start (struct ev_timer *w) 1004ev_timer_start (EV_P_ struct ev_timer *w)
906{ 1005{
907 if (ev_is_active (w)) 1006 if (ev_is_active (w))
908 return; 1007 return;
909 1008
910 w->at += now; 1009 w->at += mn_now;
911 1010
912 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1011 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
913 1012
914 ev_start ((W)w, ++timercnt); 1013 ev_start (EV_A_ (W)w, ++timercnt);
915 array_needsize (timers, timermax, timercnt, ); 1014 array_needsize (timers, timermax, timercnt, );
916 timers [timercnt - 1] = w; 1015 timers [timercnt - 1] = w;
917 upheap ((WT *)timers, timercnt - 1); 1016 upheap ((WT *)timers, timercnt - 1);
918} 1017}
919 1018
920void 1019void
921ev_timer_stop (struct ev_timer *w) 1020ev_timer_stop (EV_P_ struct ev_timer *w)
922{ 1021{
923 ev_clear_pending ((W)w); 1022 ev_clear_pending (EV_A_ (W)w);
924 if (!ev_is_active (w)) 1023 if (!ev_is_active (w))
925 return; 1024 return;
926 1025
927 if (w->active < timercnt--) 1026 if (w->active < timercnt--)
928 { 1027 {
930 downheap ((WT *)timers, timercnt, w->active - 1); 1029 downheap ((WT *)timers, timercnt, w->active - 1);
931 } 1030 }
932 1031
933 w->at = w->repeat; 1032 w->at = w->repeat;
934 1033
935 ev_stop ((W)w); 1034 ev_stop (EV_A_ (W)w);
936} 1035}
937 1036
938void 1037void
939ev_timer_again (struct ev_timer *w) 1038ev_timer_again (EV_P_ struct ev_timer *w)
940{ 1039{
941 if (ev_is_active (w)) 1040 if (ev_is_active (w))
942 { 1041 {
943 if (w->repeat) 1042 if (w->repeat)
944 { 1043 {
945 w->at = now + w->repeat; 1044 w->at = mn_now + w->repeat;
946 downheap ((WT *)timers, timercnt, w->active - 1); 1045 downheap ((WT *)timers, timercnt, w->active - 1);
947 } 1046 }
948 else 1047 else
949 ev_timer_stop (w); 1048 ev_timer_stop (EV_A_ w);
950 } 1049 }
951 else if (w->repeat) 1050 else if (w->repeat)
952 ev_timer_start (w); 1051 ev_timer_start (EV_A_ w);
953} 1052}
954 1053
955void 1054void
956ev_periodic_start (struct ev_periodic *w) 1055ev_periodic_start (EV_P_ struct ev_periodic *w)
957{ 1056{
958 if (ev_is_active (w)) 1057 if (ev_is_active (w))
959 return; 1058 return;
960 1059
961 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1060 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
962 1061
963 /* this formula differs from the one in periodic_reify because we do not always round up */ 1062 /* this formula differs from the one in periodic_reify because we do not always round up */
964 if (w->interval) 1063 if (w->interval)
965 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1064 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
966 1065
967 ev_start ((W)w, ++periodiccnt); 1066 ev_start (EV_A_ (W)w, ++periodiccnt);
968 array_needsize (periodics, periodicmax, periodiccnt, ); 1067 array_needsize (periodics, periodicmax, periodiccnt, );
969 periodics [periodiccnt - 1] = w; 1068 periodics [periodiccnt - 1] = w;
970 upheap ((WT *)periodics, periodiccnt - 1); 1069 upheap ((WT *)periodics, periodiccnt - 1);
971} 1070}
972 1071
973void 1072void
974ev_periodic_stop (struct ev_periodic *w) 1073ev_periodic_stop (EV_P_ struct ev_periodic *w)
975{ 1074{
976 ev_clear_pending ((W)w); 1075 ev_clear_pending (EV_A_ (W)w);
977 if (!ev_is_active (w)) 1076 if (!ev_is_active (w))
978 return; 1077 return;
979 1078
980 if (w->active < periodiccnt--) 1079 if (w->active < periodiccnt--)
981 { 1080 {
982 periodics [w->active - 1] = periodics [periodiccnt]; 1081 periodics [w->active - 1] = periodics [periodiccnt];
983 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1082 downheap ((WT *)periodics, periodiccnt, w->active - 1);
984 } 1083 }
985 1084
986 ev_stop ((W)w); 1085 ev_stop (EV_A_ (W)w);
987} 1086}
988 1087
1088#ifndef SA_RESTART
1089# define SA_RESTART 0
1090#endif
1091
989void 1092void
990ev_signal_start (struct ev_signal *w) 1093ev_signal_start (EV_P_ struct ev_signal *w)
991{ 1094{
992 if (ev_is_active (w)) 1095 if (ev_is_active (w))
993 return; 1096 return;
994 1097
995 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1098 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
996 1099
997 ev_start ((W)w, 1); 1100 ev_start (EV_A_ (W)w, 1);
998 array_needsize (signals, signalmax, w->signum, signals_init); 1101 array_needsize (signals, signalmax, w->signum, signals_init);
999 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1102 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1000 1103
1001 if (!w->next) 1104 if (!w->next)
1002 { 1105 {
1003 struct sigaction sa; 1106 struct sigaction sa;
1004 sa.sa_handler = sighandler; 1107 sa.sa_handler = sighandler;
1005 sigfillset (&sa.sa_mask); 1108 sigfillset (&sa.sa_mask);
1006 sa.sa_flags = 0; 1109 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1007 sigaction (w->signum, &sa, 0); 1110 sigaction (w->signum, &sa, 0);
1008 } 1111 }
1009} 1112}
1010 1113
1011void 1114void
1012ev_signal_stop (struct ev_signal *w) 1115ev_signal_stop (EV_P_ struct ev_signal *w)
1013{ 1116{
1014 ev_clear_pending ((W)w); 1117 ev_clear_pending (EV_A_ (W)w);
1015 if (!ev_is_active (w)) 1118 if (!ev_is_active (w))
1016 return; 1119 return;
1017 1120
1018 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1121 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1019 ev_stop ((W)w); 1122 ev_stop (EV_A_ (W)w);
1020 1123
1021 if (!signals [w->signum - 1].head) 1124 if (!signals [w->signum - 1].head)
1022 signal (w->signum, SIG_DFL); 1125 signal (w->signum, SIG_DFL);
1023} 1126}
1024 1127
1025void 1128void
1026ev_idle_start (struct ev_idle *w) 1129ev_idle_start (EV_P_ struct ev_idle *w)
1027{ 1130{
1028 if (ev_is_active (w)) 1131 if (ev_is_active (w))
1029 return; 1132 return;
1030 1133
1031 ev_start ((W)w, ++idlecnt); 1134 ev_start (EV_A_ (W)w, ++idlecnt);
1032 array_needsize (idles, idlemax, idlecnt, ); 1135 array_needsize (idles, idlemax, idlecnt, );
1033 idles [idlecnt - 1] = w; 1136 idles [idlecnt - 1] = w;
1034} 1137}
1035 1138
1036void 1139void
1037ev_idle_stop (struct ev_idle *w) 1140ev_idle_stop (EV_P_ struct ev_idle *w)
1038{ 1141{
1039 ev_clear_pending ((W)w); 1142 ev_clear_pending (EV_A_ (W)w);
1040 if (ev_is_active (w)) 1143 if (ev_is_active (w))
1041 return; 1144 return;
1042 1145
1043 idles [w->active - 1] = idles [--idlecnt]; 1146 idles [w->active - 1] = idles [--idlecnt];
1044 ev_stop ((W)w); 1147 ev_stop (EV_A_ (W)w);
1045} 1148}
1046 1149
1047void 1150void
1048ev_prepare_start (struct ev_prepare *w) 1151ev_prepare_start (EV_P_ struct ev_prepare *w)
1049{ 1152{
1050 if (ev_is_active (w)) 1153 if (ev_is_active (w))
1051 return; 1154 return;
1052 1155
1053 ev_start ((W)w, ++preparecnt); 1156 ev_start (EV_A_ (W)w, ++preparecnt);
1054 array_needsize (prepares, preparemax, preparecnt, ); 1157 array_needsize (prepares, preparemax, preparecnt, );
1055 prepares [preparecnt - 1] = w; 1158 prepares [preparecnt - 1] = w;
1056} 1159}
1057 1160
1058void 1161void
1059ev_prepare_stop (struct ev_prepare *w) 1162ev_prepare_stop (EV_P_ struct ev_prepare *w)
1060{ 1163{
1061 ev_clear_pending ((W)w); 1164 ev_clear_pending (EV_A_ (W)w);
1062 if (ev_is_active (w)) 1165 if (ev_is_active (w))
1063 return; 1166 return;
1064 1167
1065 prepares [w->active - 1] = prepares [--preparecnt]; 1168 prepares [w->active - 1] = prepares [--preparecnt];
1066 ev_stop ((W)w); 1169 ev_stop (EV_A_ (W)w);
1067} 1170}
1068 1171
1069void 1172void
1070ev_check_start (struct ev_check *w) 1173ev_check_start (EV_P_ struct ev_check *w)
1071{ 1174{
1072 if (ev_is_active (w)) 1175 if (ev_is_active (w))
1073 return; 1176 return;
1074 1177
1075 ev_start ((W)w, ++checkcnt); 1178 ev_start (EV_A_ (W)w, ++checkcnt);
1076 array_needsize (checks, checkmax, checkcnt, ); 1179 array_needsize (checks, checkmax, checkcnt, );
1077 checks [checkcnt - 1] = w; 1180 checks [checkcnt - 1] = w;
1078} 1181}
1079 1182
1080void 1183void
1081ev_check_stop (struct ev_check *w) 1184ev_check_stop (EV_P_ struct ev_check *w)
1082{ 1185{
1083 ev_clear_pending ((W)w); 1186 ev_clear_pending (EV_A_ (W)w);
1084 if (ev_is_active (w)) 1187 if (ev_is_active (w))
1085 return; 1188 return;
1086 1189
1087 checks [w->active - 1] = checks [--checkcnt]; 1190 checks [w->active - 1] = checks [--checkcnt];
1088 ev_stop ((W)w); 1191 ev_stop (EV_A_ (W)w);
1089} 1192}
1090 1193
1091void 1194void
1092ev_child_start (struct ev_child *w) 1195ev_child_start (EV_P_ struct ev_child *w)
1093{ 1196{
1094 if (ev_is_active (w)) 1197 if (ev_is_active (w))
1095 return; 1198 return;
1096 1199
1097 ev_start ((W)w, 1); 1200 ev_start (EV_A_ (W)w, 1);
1098 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1201 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1099} 1202}
1100 1203
1101void 1204void
1102ev_child_stop (struct ev_child *w) 1205ev_child_stop (EV_P_ struct ev_child *w)
1103{ 1206{
1104 ev_clear_pending ((W)w); 1207 ev_clear_pending (EV_A_ (W)w);
1105 if (ev_is_active (w)) 1208 if (ev_is_active (w))
1106 return; 1209 return;
1107 1210
1108 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1211 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1109 ev_stop ((W)w); 1212 ev_stop (EV_A_ (W)w);
1110} 1213}
1111 1214
1112/*****************************************************************************/ 1215/*****************************************************************************/
1113 1216
1114struct ev_once 1217struct ev_once
1118 void (*cb)(int revents, void *arg); 1221 void (*cb)(int revents, void *arg);
1119 void *arg; 1222 void *arg;
1120}; 1223};
1121 1224
1122static void 1225static void
1123once_cb (struct ev_once *once, int revents) 1226once_cb (EV_P_ struct ev_once *once, int revents)
1124{ 1227{
1125 void (*cb)(int revents, void *arg) = once->cb; 1228 void (*cb)(int revents, void *arg) = once->cb;
1126 void *arg = once->arg; 1229 void *arg = once->arg;
1127 1230
1128 ev_io_stop (&once->io); 1231 ev_io_stop (EV_A_ &once->io);
1129 ev_timer_stop (&once->to); 1232 ev_timer_stop (EV_A_ &once->to);
1130 free (once); 1233 free (once);
1131 1234
1132 cb (revents, arg); 1235 cb (revents, arg);
1133} 1236}
1134 1237
1135static void 1238static void
1136once_cb_io (struct ev_io *w, int revents) 1239once_cb_io (EV_P_ struct ev_io *w, int revents)
1137{ 1240{
1138 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1241 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1139} 1242}
1140 1243
1141static void 1244static void
1142once_cb_to (struct ev_timer *w, int revents) 1245once_cb_to (EV_P_ struct ev_timer *w, int revents)
1143{ 1246{
1144 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1247 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1145} 1248}
1146 1249
1147void 1250void
1148ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1251ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1149{ 1252{
1150 struct ev_once *once = malloc (sizeof (struct ev_once)); 1253 struct ev_once *once = malloc (sizeof (struct ev_once));
1151 1254
1152 if (!once) 1255 if (!once)
1153 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1256 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1158 1261
1159 ev_watcher_init (&once->io, once_cb_io); 1262 ev_watcher_init (&once->io, once_cb_io);
1160 if (fd >= 0) 1263 if (fd >= 0)
1161 { 1264 {
1162 ev_io_set (&once->io, fd, events); 1265 ev_io_set (&once->io, fd, events);
1163 ev_io_start (&once->io); 1266 ev_io_start (EV_A_ &once->io);
1164 } 1267 }
1165 1268
1166 ev_watcher_init (&once->to, once_cb_to); 1269 ev_watcher_init (&once->to, once_cb_to);
1167 if (timeout >= 0.) 1270 if (timeout >= 0.)
1168 { 1271 {
1169 ev_timer_set (&once->to, timeout, 0.); 1272 ev_timer_set (&once->to, timeout, 0.);
1170 ev_timer_start (&once->to); 1273 ev_timer_start (EV_A_ &once->to);
1171 } 1274 }
1172 } 1275 }
1173} 1276}
1174 1277
1175/*****************************************************************************/ 1278/*****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines