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

Comparing libev/ev.c (file contents):
Revision 1.41 by root, Fri Nov 2 16:54:34 2007 UTC vs.
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines