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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines