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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines