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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines