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

Comparing libev/ev.c (file contents):
Revision 1.56 by root, Sun Nov 4 15:58:49 2007 UTC vs.
Revision 1.72 by root, Tue Nov 6 16:09:37 2007 UTC

… …
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#ifndef EV_STANDALONE 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>
38#include <fcntl.h> 59#include <fcntl.h>
39#include <signal.h>
40#include <stddef.h> 60#include <stddef.h>
41 61
42#include <stdio.h> 62#include <stdio.h>
43 63
44#include <assert.h> 64#include <assert.h>
45#include <errno.h> 65#include <errno.h>
46#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
47#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
48# include <sys/wait.h> 74# include <sys/wait.h>
49#endif 75#endif
50#include <sys/time.h>
51#include <time.h>
52
53/**/ 76/**/
54 77
55#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
56# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
57#endif 80#endif
58 81
59#ifndef EV_USE_SELECT 82#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1 83# define EV_USE_SELECT 1
61#endif 84#endif
62 85
63#ifndef EV_USEV_POLL 86#ifndef EV_USE_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ 87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif 88#endif
66 89
67#ifndef EV_USE_EPOLL 90#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0 91# define EV_USE_EPOLL 0
69#endif 92#endif
70 93
71#ifndef EV_USE_KQUEUE 94#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
73#endif 106#endif
74 107
75#ifndef EV_USE_REALTIME 108#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 109# define EV_USE_REALTIME 1
77#endif 110#endif
… …
115typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
117 150
118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
119 152
153#if WIN32
154/* note: the comment below could not be substantiated, but what would I care */
155/* MSDN says this is required to handle SIGFPE */
156volatile double SIGFPE_REQ = 0.0f;
157
158static int
159ev_socketpair_tcp (int filedes [2])
160{
161 struct sockaddr_in addr = { 0 };
162 int addr_size = sizeof (addr);
163 SOCKET listener;
164 SOCKET sock [2] = { -1, -1 };
165
166 if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
167 return -1;
168
169 addr.sin_family = AF_INET;
170 addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
171 addr.sin_port = 0;
172
173 if (bind (listener, (struct sockaddr *)&addr, addr_size))
174 goto fail;
175
176 if (getsockname(listener, (struct sockaddr *)&addr, &addr_size))
177 goto fail;
178
179 if (listen (listener, 1))
180 goto fail;
181
182 if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
183 goto fail;
184
185 if (connect (sock[0], (struct sockaddr *)&addr, addr_size))
186 goto fail;
187
188 if ((sock[1] = accept (listener, 0, 0)) < 0)
189 goto fail;
190
191 closesocket (listener);
192
193 filedes [0] = sock [0];
194 filedes [1] = sock [1];
195
196 return 0;
197
198fail:
199 closesocket (listener);
200
201 if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
202 if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
203
204 return -1;
205}
206
207# define ev_pipe(filedes) ev_socketpair_tcp (filedes)
208#else
209# define ev_pipe(filedes) pipe (filedes)
210#endif
211
120/*****************************************************************************/ 212/*****************************************************************************/
121 213
214static void (*syserr_cb)(const char *msg);
215
216void ev_set_syserr_cb (void (*cb)(const char *msg))
217{
218 syserr_cb = cb;
219}
220
221static void
222syserr (const char *msg)
223{
224 if (!msg)
225 msg = "(libev) system error";
226
227 if (syserr_cb)
228 syserr_cb (msg);
229 else
230 {
231 perror (msg);
232 abort ();
233 }
234}
235
236static void *(*alloc)(void *ptr, long size);
237
238void ev_set_allocator (void *(*cb)(void *ptr, long size))
239{
240 alloc = cb;
241}
242
243static void *
244ev_realloc (void *ptr, long size)
245{
246 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
247
248 if (!ptr && size)
249 {
250 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
251 abort ();
252 }
253
254 return ptr;
255}
256
257#define ev_malloc(size) ev_realloc (0, (size))
258#define ev_free(ptr) ev_realloc ((ptr), 0)
259
260/*****************************************************************************/
261
122typedef struct 262typedef struct
123{ 263{
124 struct ev_watcher_list *head; 264 WL head;
125 unsigned char events; 265 unsigned char events;
126 unsigned char reify; 266 unsigned char reify;
127} ANFD; 267} ANFD;
128 268
129typedef struct 269typedef struct
… …
187 return rt_now; 327 return rt_now;
188} 328}
189 329
190#define array_roundsize(base,n) ((n) | 4 & ~3) 330#define array_roundsize(base,n) ((n) | 4 & ~3)
191 331
192#define array_needsize(base,cur,cnt,init) \ 332#define array_needsize(base,cur,cnt,init) \
193 if (expect_false ((cnt) > cur)) \ 333 if (expect_false ((cnt) > cur)) \
194 { \ 334 { \
195 int newcnt = cur; \ 335 int newcnt = cur; \
196 do \ 336 do \
197 { \ 337 { \
198 newcnt = array_roundsize (base, newcnt << 1); \ 338 newcnt = array_roundsize (base, newcnt << 1); \
199 } \ 339 } \
200 while ((cnt) > newcnt); \ 340 while ((cnt) > newcnt); \
201 \ 341 \
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 342 base = ev_realloc (base, sizeof (*base) * (newcnt)); \
203 init (base + cur, newcnt - cur); \ 343 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 344 cur = newcnt; \
205 } 345 }
346
347#define array_slim(stem) \
348 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
349 { \
350 stem ## max = array_roundsize (stem ## cnt >> 1); \
351 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \
352 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
353 }
354
355/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
356/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
357#define array_free_microshit(stem) \
358 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
359
360#define array_free(stem, idx) \
361 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
206 362
207/*****************************************************************************/ 363/*****************************************************************************/
208 364
209static void 365static void
210anfds_init (ANFD *base, int count) 366anfds_init (ANFD *base, int count)
… …
227 pendings [ABSPRI (w)][w->pending - 1].events |= events; 383 pendings [ABSPRI (w)][w->pending - 1].events |= events;
228 return; 384 return;
229 } 385 }
230 386
231 w->pending = ++pendingcnt [ABSPRI (w)]; 387 w->pending = ++pendingcnt [ABSPRI (w)];
232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 388 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
233 pendings [ABSPRI (w)][w->pending - 1].w = w; 389 pendings [ABSPRI (w)][w->pending - 1].w = w;
234 pendings [ABSPRI (w)][w->pending - 1].events = events; 390 pendings [ABSPRI (w)][w->pending - 1].events = events;
235} 391}
236 392
237static void 393static void
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 432 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 433 events |= w->events;
278 434
279 anfd->reify = 0; 435 anfd->reify = 0;
280 436
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 437 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 438 anfd->events = events;
285 }
286 } 439 }
287 440
288 fdchangecnt = 0; 441 fdchangecnt = 0;
289} 442}
290 443
291static void 444static void
292fd_change (EV_P_ int fd) 445fd_change (EV_P_ int fd)
293{ 446{
294 if (anfds [fd].reify || fdchangecnt < 0) 447 if (anfds [fd].reify)
295 return; 448 return;
296 449
297 anfds [fd].reify = 1; 450 anfds [fd].reify = 1;
298 451
299 ++fdchangecnt; 452 ++fdchangecnt;
300 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 453 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void));
301 fdchanges [fdchangecnt - 1] = fd; 454 fdchanges [fdchangecnt - 1] = fd;
302} 455}
303 456
304static void 457static void
305fd_kill (EV_P_ int fd) 458fd_kill (EV_P_ int fd)
… …
311 ev_io_stop (EV_A_ w); 464 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 465 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 } 466 }
314} 467}
315 468
469static int
470fd_valid (int fd)
471{
472#ifdef WIN32
473 return !!win32_get_osfhandle (fd);
474#else
475 return fcntl (fd, F_GETFD) != -1;
476#endif
477}
478
316/* called on EBADF to verify fds */ 479/* called on EBADF to verify fds */
317static void 480static void
318fd_ebadf (EV_P) 481fd_ebadf (EV_P)
319{ 482{
320 int fd; 483 int fd;
321 484
322 for (fd = 0; fd < anfdmax; ++fd) 485 for (fd = 0; fd < anfdmax; ++fd)
323 if (anfds [fd].events) 486 if (anfds [fd].events)
324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 487 if (!fd_valid (fd) == -1 && errno == EBADF)
325 fd_kill (EV_A_ fd); 488 fd_kill (EV_A_ fd);
326} 489}
327 490
328/* called on ENOMEM in select/poll to kill some fds and retry */ 491/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 492static void
330fd_enomem (EV_P) 493fd_enomem (EV_P)
331{ 494{
332 int fd = anfdmax; 495 int fd;
333 496
334 while (fd--) 497 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 498 if (anfds [fd].events)
336 { 499 {
337 close (fd);
338 fd_kill (EV_A_ fd); 500 fd_kill (EV_A_ fd);
339 return; 501 return;
340 } 502 }
341} 503}
342 504
343/* susually called after fork if method needs to re-arm all fds from scratch */ 505/* usually called after fork if method needs to re-arm all fds from scratch */
344static void 506static void
345fd_rearm_all (EV_P) 507fd_rearm_all (EV_P)
346{ 508{
347 int fd; 509 int fd;
348 510
349 /* this should be highly optimised to not do anything but set a flag */ 511 /* this should be highly optimised to not do anything but set a flag */
350 for (fd = 0; fd < anfdmax; ++fd) 512 for (fd = 0; fd < anfdmax; ++fd)
351 if (anfds [fd].events) 513 if (anfds [fd].events)
352 { 514 {
353 anfds [fd].events = 0; 515 anfds [fd].events = 0;
354 fd_change (fd); 516 fd_change (EV_A_ fd);
355 } 517 }
356} 518}
357 519
358/*****************************************************************************/ 520/*****************************************************************************/
359 521
… …
363 WT w = heap [k]; 525 WT w = heap [k];
364 526
365 while (k && heap [k >> 1]->at > w->at) 527 while (k && heap [k >> 1]->at > w->at)
366 { 528 {
367 heap [k] = heap [k >> 1]; 529 heap [k] = heap [k >> 1];
368 heap [k]->active = k + 1; 530 ((W)heap [k])->active = k + 1;
369 k >>= 1; 531 k >>= 1;
370 } 532 }
371 533
372 heap [k] = w; 534 heap [k] = w;
373 heap [k]->active = k + 1; 535 ((W)heap [k])->active = k + 1;
374 536
375} 537}
376 538
377static void 539static void
378downheap (WT *heap, int N, int k) 540downheap (WT *heap, int N, int k)
… …
388 550
389 if (w->at <= heap [j]->at) 551 if (w->at <= heap [j]->at)
390 break; 552 break;
391 553
392 heap [k] = heap [j]; 554 heap [k] = heap [j];
393 heap [k]->active = k + 1; 555 ((W)heap [k])->active = k + 1;
394 k = j; 556 k = j;
395 } 557 }
396 558
397 heap [k] = w; 559 heap [k] = w;
398 heap [k]->active = k + 1; 560 ((W)heap [k])->active = k + 1;
399} 561}
400 562
401/*****************************************************************************/ 563/*****************************************************************************/
402 564
403typedef struct 565typedef struct
404{ 566{
405 struct ev_watcher_list *head; 567 WL head;
406 sig_atomic_t volatile gotsig; 568 sig_atomic_t volatile gotsig;
407} ANSIG; 569} ANSIG;
408 570
409static ANSIG *signals; 571static ANSIG *signals;
410static int signalmax; 572static int signalmax;
411 573
412static int sigpipe [2]; 574static int sigpipe [2];
413static sig_atomic_t volatile gotsig; 575static sig_atomic_t volatile gotsig;
576static struct ev_io sigev;
414 577
415static void 578static void
416signals_init (ANSIG *base, int count) 579signals_init (ANSIG *base, int count)
417{ 580{
418 while (count--) 581 while (count--)
… …
425} 588}
426 589
427static void 590static void
428sighandler (int signum) 591sighandler (int signum)
429{ 592{
593#if WIN32
594 signal (signum, sighandler);
595#endif
596
430 signals [signum - 1].gotsig = 1; 597 signals [signum - 1].gotsig = 1;
431 598
432 if (!gotsig) 599 if (!gotsig)
433 { 600 {
434 int old_errno = errno; 601 int old_errno = errno;
… …
439} 606}
440 607
441static void 608static void
442sigcb (EV_P_ struct ev_io *iow, int revents) 609sigcb (EV_P_ struct ev_io *iow, int revents)
443{ 610{
444 struct ev_watcher_list *w; 611 WL w;
445 int signum; 612 int signum;
446 613
447 read (sigpipe [0], &revents, 1); 614 read (sigpipe [0], &revents, 1);
448 gotsig = 0; 615 gotsig = 0;
449 616
… …
474 ev_unref (EV_A); /* child watcher should not keep loop alive */ 641 ev_unref (EV_A); /* child watcher should not keep loop alive */
475} 642}
476 643
477/*****************************************************************************/ 644/*****************************************************************************/
478 645
646static struct ev_child *childs [PID_HASHSIZE];
647
479#ifndef WIN32 648#ifndef WIN32
649
650static struct ev_signal childev;
480 651
481#ifndef WCONTINUED 652#ifndef WCONTINUED
482# define WCONTINUED 0 653# define WCONTINUED 0
483#endif 654#endif
484 655
… …
488 struct ev_child *w; 659 struct ev_child *w;
489 660
490 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 661 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
491 if (w->pid == pid || !w->pid) 662 if (w->pid == pid || !w->pid)
492 { 663 {
493 w->priority = sw->priority; /* need to do it *now* */ 664 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
494 w->rpid = pid; 665 w->rpid = pid;
495 w->rstatus = status; 666 w->rstatus = status;
496 event (EV_A_ (W)w, EV_CHILD); 667 event (EV_A_ (W)w, EV_CHILD);
497 } 668 }
498} 669}
499 670
500static void 671static void
… …
520# include "ev_kqueue.c" 691# include "ev_kqueue.c"
521#endif 692#endif
522#if EV_USE_EPOLL 693#if EV_USE_EPOLL
523# include "ev_epoll.c" 694# include "ev_epoll.c"
524#endif 695#endif
525#if EV_USEV_POLL 696#if EV_USE_POLL
526# include "ev_poll.c" 697# include "ev_poll.c"
527#endif 698#endif
528#if EV_USE_SELECT 699#if EV_USE_SELECT
529# include "ev_select.c" 700# include "ev_select.c"
530#endif 701#endif
… …
582 methods = atoi (getenv ("LIBEV_METHODS")); 753 methods = atoi (getenv ("LIBEV_METHODS"));
583 else 754 else
584 methods = EVMETHOD_ANY; 755 methods = EVMETHOD_ANY;
585 756
586 method = 0; 757 method = 0;
758#if EV_USE_WIN32
759 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
760#endif
587#if EV_USE_KQUEUE 761#if EV_USE_KQUEUE
588 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 762 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
589#endif 763#endif
590#if EV_USE_EPOLL 764#if EV_USE_EPOLL
591 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 765 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
592#endif 766#endif
593#if EV_USEV_POLL 767#if EV_USE_POLL
594 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 768 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
595#endif 769#endif
596#if EV_USE_SELECT 770#if EV_USE_SELECT
597 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 771 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
598#endif 772#endif
773
774 ev_watcher_init (&sigev, sigcb);
775 ev_set_priority (&sigev, EV_MAXPRI);
599 } 776 }
600} 777}
601 778
602void 779void
603loop_destroy (EV_P) 780loop_destroy (EV_P)
604{ 781{
782 int i;
783
784#if EV_USE_WIN32
785 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
786#endif
605#if EV_USE_KQUEUE 787#if EV_USE_KQUEUE
606 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 788 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
607#endif 789#endif
608#if EV_USE_EPOLL 790#if EV_USE_EPOLL
609 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 791 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
610#endif 792#endif
611#if EV_USEV_POLL 793#if EV_USE_POLL
612 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 794 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
613#endif 795#endif
614#if EV_USE_SELECT 796#if EV_USE_SELECT
615 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 797 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
616#endif 798#endif
617 799
800 for (i = NUMPRI; i--; )
801 array_free (pending, [i]);
802
803 /* have to use the microsoft-never-gets-it-right macro */
804 array_free_microshit (fdchange);
805 array_free_microshit (timer);
806 array_free_microshit (periodic);
807 array_free_microshit (idle);
808 array_free_microshit (prepare);
809 array_free_microshit (check);
810
618 method = 0; 811 method = 0;
619 /*TODO*/
620} 812}
621 813
622void 814static void
623loop_fork (EV_P) 815loop_fork (EV_P)
624{ 816{
625 /*TODO*/
626#if EV_USE_EPOLL 817#if EV_USE_EPOLL
627 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 818 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
628#endif 819#endif
629#if EV_USE_KQUEUE 820#if EV_USE_KQUEUE
630 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 821 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
631#endif 822#endif
823
824 if (ev_is_active (&sigev))
825 {
826 /* default loop */
827
828 ev_ref (EV_A);
829 ev_io_stop (EV_A_ &sigev);
830 close (sigpipe [0]);
831 close (sigpipe [1]);
832
833 while (ev_pipe (sigpipe))
834 syserr ("(libev) error creating pipe");
835
836 siginit (EV_A);
837 }
838
839 postfork = 0;
632} 840}
633 841
634#if EV_MULTIPLICITY 842#if EV_MULTIPLICITY
635struct ev_loop * 843struct ev_loop *
636ev_loop_new (int methods) 844ev_loop_new (int methods)
637{ 845{
638 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 846 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
847
848 memset (loop, 0, sizeof (struct ev_loop));
639 849
640 loop_init (EV_A_ methods); 850 loop_init (EV_A_ methods);
641 851
642 if (ev_methods (EV_A)) 852 if (ev_method (EV_A))
643 return loop; 853 return loop;
644 854
645 return 0; 855 return 0;
646} 856}
647 857
648void 858void
649ev_loop_destroy (EV_P) 859ev_loop_destroy (EV_P)
650{ 860{
651 loop_destroy (EV_A); 861 loop_destroy (EV_A);
652 free (loop); 862 ev_free (loop);
653} 863}
654 864
655void 865void
656ev_loop_fork (EV_P) 866ev_loop_fork (EV_P)
657{ 867{
658 loop_fork (EV_A); 868 postfork = 1;
659} 869}
660 870
661#endif 871#endif
662 872
663#if EV_MULTIPLICITY 873#if EV_MULTIPLICITY
… …
671int 881int
672#endif 882#endif
673ev_default_loop (int methods) 883ev_default_loop (int methods)
674{ 884{
675 if (sigpipe [0] == sigpipe [1]) 885 if (sigpipe [0] == sigpipe [1])
676 if (pipe (sigpipe)) 886 if (ev_pipe (sigpipe))
677 return 0; 887 return 0;
678 888
679 if (!default_loop) 889 if (!default_loop)
680 { 890 {
681#if EV_MULTIPLICITY 891#if EV_MULTIPLICITY
… …
686 896
687 loop_init (EV_A_ methods); 897 loop_init (EV_A_ methods);
688 898
689 if (ev_method (EV_A)) 899 if (ev_method (EV_A))
690 { 900 {
691 ev_watcher_init (&sigev, sigcb);
692 ev_set_priority (&sigev, EV_MAXPRI);
693 siginit (EV_A); 901 siginit (EV_A);
694 902
695#ifndef WIN32 903#ifndef WIN32
696 ev_signal_init (&childev, childcb, SIGCHLD); 904 ev_signal_init (&childev, childcb, SIGCHLD);
697 ev_set_priority (&childev, EV_MAXPRI); 905 ev_set_priority (&childev, EV_MAXPRI);
… …
707} 915}
708 916
709void 917void
710ev_default_destroy (void) 918ev_default_destroy (void)
711{ 919{
920#if EV_MULTIPLICITY
712 struct ev_loop *loop = default_loop; 921 struct ev_loop *loop = default_loop;
922#endif
713 923
924#ifndef WIN32
714 ev_ref (EV_A); /* child watcher */ 925 ev_ref (EV_A); /* child watcher */
715 ev_signal_stop (EV_A_ &childev); 926 ev_signal_stop (EV_A_ &childev);
927#endif
716 928
717 ev_ref (EV_A); /* signal watcher */ 929 ev_ref (EV_A); /* signal watcher */
718 ev_io_stop (EV_A_ &sigev); 930 ev_io_stop (EV_A_ &sigev);
719 931
720 close (sigpipe [0]); sigpipe [0] = 0; 932 close (sigpipe [0]); sigpipe [0] = 0;
… …
722 934
723 loop_destroy (EV_A); 935 loop_destroy (EV_A);
724} 936}
725 937
726void 938void
727ev_default_fork (EV_P) 939ev_default_fork (void)
728{ 940{
729 loop_fork (EV_A); 941#if EV_MULTIPLICITY
942 struct ev_loop *loop = default_loop;
943#endif
730 944
731 ev_io_stop (EV_A_ &sigev); 945 if (method)
732 close (sigpipe [0]); 946 postfork = 1;
733 close (sigpipe [1]);
734 pipe (sigpipe);
735
736 ev_ref (EV_A); /* signal watcher */
737 siginit (EV_A);
738} 947}
739 948
740/*****************************************************************************/ 949/*****************************************************************************/
741 950
742static void 951static void
… …
758} 967}
759 968
760static void 969static void
761timers_reify (EV_P) 970timers_reify (EV_P)
762{ 971{
763 while (timercnt && timers [0]->at <= mn_now) 972 while (timercnt && ((WT)timers [0])->at <= mn_now)
764 { 973 {
765 struct ev_timer *w = timers [0]; 974 struct ev_timer *w = timers [0];
975
976 assert (("inactive timer on timer heap detected", ev_is_active (w)));
766 977
767 /* first reschedule or stop timer */ 978 /* first reschedule or stop timer */
768 if (w->repeat) 979 if (w->repeat)
769 { 980 {
770 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 981 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
771 w->at = mn_now + w->repeat; 982 ((WT)w)->at = mn_now + w->repeat;
772 downheap ((WT *)timers, timercnt, 0); 983 downheap ((WT *)timers, timercnt, 0);
773 } 984 }
774 else 985 else
775 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 986 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
776 987
… …
779} 990}
780 991
781static void 992static void
782periodics_reify (EV_P) 993periodics_reify (EV_P)
783{ 994{
784 while (periodiccnt && periodics [0]->at <= rt_now) 995 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
785 { 996 {
786 struct ev_periodic *w = periodics [0]; 997 struct ev_periodic *w = periodics [0];
998
999 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
787 1000
788 /* first reschedule or stop timer */ 1001 /* first reschedule or stop timer */
789 if (w->interval) 1002 if (w->interval)
790 { 1003 {
791 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 1004 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
792 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 1005 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
793 downheap ((WT *)periodics, periodiccnt, 0); 1006 downheap ((WT *)periodics, periodiccnt, 0);
794 } 1007 }
795 else 1008 else
796 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1009 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
797 1010
… …
809 { 1022 {
810 struct ev_periodic *w = periodics [i]; 1023 struct ev_periodic *w = periodics [i];
811 1024
812 if (w->interval) 1025 if (w->interval)
813 { 1026 {
814 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1027 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
815 1028
816 if (fabs (diff) >= 1e-4) 1029 if (fabs (diff) >= 1e-4)
817 { 1030 {
818 ev_periodic_stop (EV_A_ w); 1031 ev_periodic_stop (EV_A_ w);
819 ev_periodic_start (EV_A_ w); 1032 ev_periodic_start (EV_A_ w);
… …
880 { 1093 {
881 periodics_reschedule (EV_A); 1094 periodics_reschedule (EV_A);
882 1095
883 /* adjust timers. this is easy, as the offset is the same for all */ 1096 /* adjust timers. this is easy, as the offset is the same for all */
884 for (i = 0; i < timercnt; ++i) 1097 for (i = 0; i < timercnt; ++i)
885 timers [i]->at += rt_now - mn_now; 1098 ((WT)timers [i])->at += rt_now - mn_now;
886 } 1099 }
887 1100
888 mn_now = rt_now; 1101 mn_now = rt_now;
889 } 1102 }
890} 1103}
… …
916 { 1129 {
917 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1130 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
918 call_pending (EV_A); 1131 call_pending (EV_A);
919 } 1132 }
920 1133
1134 /* we might have forked, so reify kernel state if necessary */
1135 if (expect_false (postfork))
1136 loop_fork (EV_A);
1137
921 /* update fd-related kernel structures */ 1138 /* update fd-related kernel structures */
922 fd_reify (EV_A); 1139 fd_reify (EV_A);
923 1140
924 /* calculate blocking time */ 1141 /* calculate blocking time */
925 1142
… …
941 { 1158 {
942 block = MAX_BLOCKTIME; 1159 block = MAX_BLOCKTIME;
943 1160
944 if (timercnt) 1161 if (timercnt)
945 { 1162 {
946 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1163 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
947 if (block > to) block = to; 1164 if (block > to) block = to;
948 } 1165 }
949 1166
950 if (periodiccnt) 1167 if (periodiccnt)
951 { 1168 {
952 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1169 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
953 if (block > to) block = to; 1170 if (block > to) block = to;
954 } 1171 }
955 1172
956 if (block < 0.) block = 0.; 1173 if (block < 0.) block = 0.;
957 } 1174 }
… …
1074ev_timer_start (EV_P_ struct ev_timer *w) 1291ev_timer_start (EV_P_ struct ev_timer *w)
1075{ 1292{
1076 if (ev_is_active (w)) 1293 if (ev_is_active (w))
1077 return; 1294 return;
1078 1295
1079 w->at += mn_now; 1296 ((WT)w)->at += mn_now;
1080 1297
1081 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1298 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1082 1299
1083 ev_start (EV_A_ (W)w, ++timercnt); 1300 ev_start (EV_A_ (W)w, ++timercnt);
1084 array_needsize (timers, timermax, timercnt, ); 1301 array_needsize (timers, timermax, timercnt, (void));
1085 timers [timercnt - 1] = w; 1302 timers [timercnt - 1] = w;
1086 upheap ((WT *)timers, timercnt - 1); 1303 upheap ((WT *)timers, timercnt - 1);
1304
1305 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1087} 1306}
1088 1307
1089void 1308void
1090ev_timer_stop (EV_P_ struct ev_timer *w) 1309ev_timer_stop (EV_P_ struct ev_timer *w)
1091{ 1310{
1092 ev_clear_pending (EV_A_ (W)w); 1311 ev_clear_pending (EV_A_ (W)w);
1093 if (!ev_is_active (w)) 1312 if (!ev_is_active (w))
1094 return; 1313 return;
1095 1314
1315 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1316
1096 if (w->active < timercnt--) 1317 if (((W)w)->active < timercnt--)
1097 { 1318 {
1098 timers [w->active - 1] = timers [timercnt]; 1319 timers [((W)w)->active - 1] = timers [timercnt];
1099 downheap ((WT *)timers, timercnt, w->active - 1); 1320 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1100 } 1321 }
1101 1322
1102 w->at = w->repeat; 1323 ((WT)w)->at = w->repeat;
1103 1324
1104 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1105} 1326}
1106 1327
1107void 1328void
… …
1109{ 1330{
1110 if (ev_is_active (w)) 1331 if (ev_is_active (w))
1111 { 1332 {
1112 if (w->repeat) 1333 if (w->repeat)
1113 { 1334 {
1114 w->at = mn_now + w->repeat; 1335 ((WT)w)->at = mn_now + w->repeat;
1115 downheap ((WT *)timers, timercnt, w->active - 1); 1336 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1116 } 1337 }
1117 else 1338 else
1118 ev_timer_stop (EV_A_ w); 1339 ev_timer_stop (EV_A_ w);
1119 } 1340 }
1120 else if (w->repeat) 1341 else if (w->repeat)
… …
1129 1350
1130 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1351 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1131 1352
1132 /* this formula differs from the one in periodic_reify because we do not always round up */ 1353 /* this formula differs from the one in periodic_reify because we do not always round up */
1133 if (w->interval) 1354 if (w->interval)
1134 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1355 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1135 1356
1136 ev_start (EV_A_ (W)w, ++periodiccnt); 1357 ev_start (EV_A_ (W)w, ++periodiccnt);
1137 array_needsize (periodics, periodicmax, periodiccnt, ); 1358 array_needsize (periodics, periodicmax, periodiccnt, (void));
1138 periodics [periodiccnt - 1] = w; 1359 periodics [periodiccnt - 1] = w;
1139 upheap ((WT *)periodics, periodiccnt - 1); 1360 upheap ((WT *)periodics, periodiccnt - 1);
1361
1362 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1140} 1363}
1141 1364
1142void 1365void
1143ev_periodic_stop (EV_P_ struct ev_periodic *w) 1366ev_periodic_stop (EV_P_ struct ev_periodic *w)
1144{ 1367{
1145 ev_clear_pending (EV_A_ (W)w); 1368 ev_clear_pending (EV_A_ (W)w);
1146 if (!ev_is_active (w)) 1369 if (!ev_is_active (w))
1147 return; 1370 return;
1148 1371
1372 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1373
1149 if (w->active < periodiccnt--) 1374 if (((W)w)->active < periodiccnt--)
1150 { 1375 {
1151 periodics [w->active - 1] = periodics [periodiccnt]; 1376 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1152 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1377 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1153 } 1378 }
1154 1379
1155 ev_stop (EV_A_ (W)w); 1380 ev_stop (EV_A_ (W)w);
1156} 1381}
1157 1382
… …
1160{ 1385{
1161 if (ev_is_active (w)) 1386 if (ev_is_active (w))
1162 return; 1387 return;
1163 1388
1164 ev_start (EV_A_ (W)w, ++idlecnt); 1389 ev_start (EV_A_ (W)w, ++idlecnt);
1165 array_needsize (idles, idlemax, idlecnt, ); 1390 array_needsize (idles, idlemax, idlecnt, (void));
1166 idles [idlecnt - 1] = w; 1391 idles [idlecnt - 1] = w;
1167} 1392}
1168 1393
1169void 1394void
1170ev_idle_stop (EV_P_ struct ev_idle *w) 1395ev_idle_stop (EV_P_ struct ev_idle *w)
1171{ 1396{
1172 ev_clear_pending (EV_A_ (W)w); 1397 ev_clear_pending (EV_A_ (W)w);
1173 if (ev_is_active (w)) 1398 if (ev_is_active (w))
1174 return; 1399 return;
1175 1400
1176 idles [w->active - 1] = idles [--idlecnt]; 1401 idles [((W)w)->active - 1] = idles [--idlecnt];
1177 ev_stop (EV_A_ (W)w); 1402 ev_stop (EV_A_ (W)w);
1178} 1403}
1179 1404
1180void 1405void
1181ev_prepare_start (EV_P_ struct ev_prepare *w) 1406ev_prepare_start (EV_P_ struct ev_prepare *w)
1182{ 1407{
1183 if (ev_is_active (w)) 1408 if (ev_is_active (w))
1184 return; 1409 return;
1185 1410
1186 ev_start (EV_A_ (W)w, ++preparecnt); 1411 ev_start (EV_A_ (W)w, ++preparecnt);
1187 array_needsize (prepares, preparemax, preparecnt, ); 1412 array_needsize (prepares, preparemax, preparecnt, (void));
1188 prepares [preparecnt - 1] = w; 1413 prepares [preparecnt - 1] = w;
1189} 1414}
1190 1415
1191void 1416void
1192ev_prepare_stop (EV_P_ struct ev_prepare *w) 1417ev_prepare_stop (EV_P_ struct ev_prepare *w)
1193{ 1418{
1194 ev_clear_pending (EV_A_ (W)w); 1419 ev_clear_pending (EV_A_ (W)w);
1195 if (ev_is_active (w)) 1420 if (ev_is_active (w))
1196 return; 1421 return;
1197 1422
1198 prepares [w->active - 1] = prepares [--preparecnt]; 1423 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1199 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1200} 1425}
1201 1426
1202void 1427void
1203ev_check_start (EV_P_ struct ev_check *w) 1428ev_check_start (EV_P_ struct ev_check *w)
1204{ 1429{
1205 if (ev_is_active (w)) 1430 if (ev_is_active (w))
1206 return; 1431 return;
1207 1432
1208 ev_start (EV_A_ (W)w, ++checkcnt); 1433 ev_start (EV_A_ (W)w, ++checkcnt);
1209 array_needsize (checks, checkmax, checkcnt, ); 1434 array_needsize (checks, checkmax, checkcnt, (void));
1210 checks [checkcnt - 1] = w; 1435 checks [checkcnt - 1] = w;
1211} 1436}
1212 1437
1213void 1438void
1214ev_check_stop (EV_P_ struct ev_check *w) 1439ev_check_stop (EV_P_ struct ev_check *w)
1215{ 1440{
1216 ev_clear_pending (EV_A_ (W)w); 1441 ev_clear_pending (EV_A_ (W)w);
1217 if (ev_is_active (w)) 1442 if (ev_is_active (w))
1218 return; 1443 return;
1219 1444
1220 checks [w->active - 1] = checks [--checkcnt]; 1445 checks [((W)w)->active - 1] = checks [--checkcnt];
1221 ev_stop (EV_A_ (W)w); 1446 ev_stop (EV_A_ (W)w);
1222} 1447}
1223 1448
1224#ifndef SA_RESTART 1449#ifndef SA_RESTART
1225# define SA_RESTART 0 1450# define SA_RESTART 0
… …
1238 1463
1239 ev_start (EV_A_ (W)w, 1); 1464 ev_start (EV_A_ (W)w, 1);
1240 array_needsize (signals, signalmax, w->signum, signals_init); 1465 array_needsize (signals, signalmax, w->signum, signals_init);
1241 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1466 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1242 1467
1243 if (!w->next) 1468 if (!((WL)w)->next)
1244 { 1469 {
1470#if WIN32
1471 signal (w->signum, sighandler);
1472#else
1245 struct sigaction sa; 1473 struct sigaction sa;
1246 sa.sa_handler = sighandler; 1474 sa.sa_handler = sighandler;
1247 sigfillset (&sa.sa_mask); 1475 sigfillset (&sa.sa_mask);
1248 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1476 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1249 sigaction (w->signum, &sa, 0); 1477 sigaction (w->signum, &sa, 0);
1478#endif
1250 } 1479 }
1251} 1480}
1252 1481
1253void 1482void
1254ev_signal_stop (EV_P_ struct ev_signal *w) 1483ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1304 void (*cb)(int revents, void *arg) = once->cb; 1533 void (*cb)(int revents, void *arg) = once->cb;
1305 void *arg = once->arg; 1534 void *arg = once->arg;
1306 1535
1307 ev_io_stop (EV_A_ &once->io); 1536 ev_io_stop (EV_A_ &once->io);
1308 ev_timer_stop (EV_A_ &once->to); 1537 ev_timer_stop (EV_A_ &once->to);
1309 free (once); 1538 ev_free (once);
1310 1539
1311 cb (revents, arg); 1540 cb (revents, arg);
1312} 1541}
1313 1542
1314static void 1543static void
… …
1324} 1553}
1325 1554
1326void 1555void
1327ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1556ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1328{ 1557{
1329 struct ev_once *once = malloc (sizeof (struct ev_once)); 1558 struct ev_once *once = ev_malloc (sizeof (struct ev_once));
1330 1559
1331 if (!once) 1560 if (!once)
1332 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1561 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1333 else 1562 else
1334 { 1563 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines