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

Comparing libev/ev.c (file contents):
Revision 1.66 by root, Sun Nov 4 23:30:53 2007 UTC vs.
Revision 1.76 by root, Wed Nov 7 18:47:26 2007 UTC

… …
54 54
55#endif 55#endif
56 56
57#include <math.h> 57#include <math.h>
58#include <stdlib.h> 58#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 59#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 60#include <stddef.h>
63 61
64#include <stdio.h> 62#include <stdio.h>
65 63
66#include <assert.h> 64#include <assert.h>
67#include <errno.h> 65#include <errno.h>
68#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
69#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
70# include <sys/wait.h> 74# include <sys/wait.h>
71#endif 75#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 76/**/
76 77
77#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
79#endif 80#endif
… …
94# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
95#endif 96#endif
96 97
97#ifndef EV_USE_WIN32 98#ifndef EV_USE_WIN32
98# ifdef WIN32 99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 102# define EV_USE_SELECT 1
100# else 103# else
101# define EV_USE_WIN32 0 104# define EV_USE_WIN32 0
102# endif 105# endif
103#endif 106#endif
104 107
… …
145typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
147 150
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 152
153#include "ev_win32.c"
154
150/*****************************************************************************/ 155/*****************************************************************************/
151 156
157static void (*syserr_cb)(const char *msg);
158
159void ev_set_syserr_cb (void (*cb)(const char *msg))
160{
161 syserr_cb = cb;
162}
163
164static void
165syserr (const char *msg)
166{
167 if (!msg)
168 msg = "(libev) system error";
169
170 if (syserr_cb)
171 syserr_cb (msg);
172 else
173 {
174 perror (msg);
175 abort ();
176 }
177}
178
179static void *(*alloc)(void *ptr, long size);
180
181void ev_set_allocator (void *(*cb)(void *ptr, long size))
182{
183 alloc = cb;
184}
185
186static void *
187ev_realloc (void *ptr, long size)
188{
189 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
190
191 if (!ptr && size)
192 {
193 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
194 abort ();
195 }
196
197 return ptr;
198}
199
200#define ev_malloc(size) ev_realloc (0, (size))
201#define ev_free(ptr) ev_realloc ((ptr), 0)
202
203/*****************************************************************************/
204
152typedef struct 205typedef struct
153{ 206{
154 struct ev_watcher_list *head; 207 WL head;
155 unsigned char events; 208 unsigned char events;
156 unsigned char reify; 209 unsigned char reify;
157} ANFD; 210} ANFD;
158 211
159typedef struct 212typedef struct
… …
215ev_now (EV_P) 268ev_now (EV_P)
216{ 269{
217 return rt_now; 270 return rt_now;
218} 271}
219 272
220#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
221 274
222#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
224 { \ 277 { \
225 int newcnt = cur; \ 278 int newcnt = cur; \
226 do \ 279 do \
227 { \ 280 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 282 } \
230 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
231 \ 284 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 287 cur = newcnt; \
235 } 288 }
289
290#define array_slim(type,stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
296 }
297
298/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
299/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
300#define array_free_microshit(stem) \
301 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
236 302
237#define array_free(stem, idx) \ 303#define array_free(stem, idx) \
238 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
239 305
240/*****************************************************************************/ 306/*****************************************************************************/
241 307
242static void 308static void
243anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
260 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
261 return; 327 return;
262 } 328 }
263 329
264 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
265 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 331 array_needsize (ANPENDING, pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
266 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
267 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
268} 334}
269 335
270static void 336static void
… …
319} 385}
320 386
321static void 387static void
322fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
323{ 389{
324 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
325 return; 391 return;
326 392
327 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
328 394
329 ++fdchangecnt; 395 ++fdchangecnt;
330 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
331 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
332} 398}
333 399
334static void 400static void
335fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
341 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
342 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
343 } 409 }
344} 410}
345 411
412static int
413fd_valid (int fd)
414{
415#ifdef WIN32
416 return !!win32_get_osfhandle (fd);
417#else
418 return fcntl (fd, F_GETFD) != -1;
419#endif
420}
421
346/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
347static void 423static void
348fd_ebadf (EV_P) 424fd_ebadf (EV_P)
349{ 425{
350 int fd; 426 int fd;
351 427
352 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
353 if (anfds [fd].events) 429 if (anfds [fd].events)
354 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
355 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
356} 432}
357 433
358/* called on ENOMEM in select/poll to kill some fds and retry */ 434/* called on ENOMEM in select/poll to kill some fds and retry */
359static void 435static void
… …
362 int fd; 438 int fd;
363 439
364 for (fd = anfdmax; fd--; ) 440 for (fd = anfdmax; fd--; )
365 if (anfds [fd].events) 441 if (anfds [fd].events)
366 { 442 {
367 close (fd);
368 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
369 return; 444 return;
370 } 445 }
371} 446}
372 447
373/* susually called after fork if method needs to re-arm all fds from scratch */ 448/* usually called after fork if method needs to re-arm all fds from scratch */
374static void 449static void
375fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
376{ 451{
377 int fd; 452 int fd;
378 453
… …
430 505
431/*****************************************************************************/ 506/*****************************************************************************/
432 507
433typedef struct 508typedef struct
434{ 509{
435 struct ev_watcher_list *head; 510 WL head;
436 sig_atomic_t volatile gotsig; 511 sig_atomic_t volatile gotsig;
437} ANSIG; 512} ANSIG;
438 513
439static ANSIG *signals; 514static ANSIG *signals;
440static int signalmax; 515static int signalmax;
… …
456} 531}
457 532
458static void 533static void
459sighandler (int signum) 534sighandler (int signum)
460{ 535{
536#if WIN32
537 signal (signum, sighandler);
538#endif
539
461 signals [signum - 1].gotsig = 1; 540 signals [signum - 1].gotsig = 1;
462 541
463 if (!gotsig) 542 if (!gotsig)
464 { 543 {
465 int old_errno = errno; 544 int old_errno = errno;
466 gotsig = 1; 545 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
467 write (sigpipe [1], &signum, 1); 549 write (sigpipe [1], &signum, 1);
550#endif
468 errno = old_errno; 551 errno = old_errno;
469 } 552 }
470} 553}
471 554
472static void 555static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 556sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 557{
475 struct ev_watcher_list *w; 558 WL w;
476 int signum; 559 int signum;
477 560
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
478 read (sigpipe [0], &revents, 1); 564 read (sigpipe [0], &revents, 1);
565#endif
479 gotsig = 0; 566 gotsig = 0;
480 567
481 for (signum = signalmax; signum--; ) 568 for (signum = signalmax; signum--; )
482 if (signals [signum].gotsig) 569 if (signals [signum].gotsig)
483 { 570 {
… …
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 592 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 593}
507 594
508/*****************************************************************************/ 595/*****************************************************************************/
509 596
597static struct ev_child *childs [PID_HASHSIZE];
598
510#ifndef WIN32 599#ifndef WIN32
511 600
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev; 601static struct ev_signal childev;
514 602
515#ifndef WCONTINUED 603#ifndef WCONTINUED
516# define WCONTINUED 0 604# define WCONTINUED 0
517#endif 605#endif
… …
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
632#endif 720#endif
633#if EV_USE_SELECT 721#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
635#endif 723#endif
724
725 ev_watcher_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI);
636 } 727 }
637} 728}
638 729
639void 730void
640loop_destroy (EV_P) 731loop_destroy (EV_P)
… …
658#endif 749#endif
659 750
660 for (i = NUMPRI; i--; ) 751 for (i = NUMPRI; i--; )
661 array_free (pending, [i]); 752 array_free (pending, [i]);
662 753
754 /* have to use the microsoft-never-gets-it-right macro */
663 array_free (fdchange, ); 755 array_free_microshit (fdchange);
664 array_free (timer, ); 756 array_free_microshit (timer);
665 array_free (periodic, ); 757 array_free_microshit (periodic);
666 array_free (idle, ); 758 array_free_microshit (idle);
667 array_free (prepare, ); 759 array_free_microshit (prepare);
668 array_free (check, ); 760 array_free_microshit (check);
669 761
670 method = 0; 762 method = 0;
671 /*TODO*/
672} 763}
673 764
674void 765static void
675loop_fork (EV_P) 766loop_fork (EV_P)
676{ 767{
677 /*TODO*/
678#if EV_USE_EPOLL 768#if EV_USE_EPOLL
679 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
680#endif 770#endif
681#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
682 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
683#endif 773#endif
774
775 if (ev_is_active (&sigev))
776 {
777 /* default loop */
778
779 ev_ref (EV_A);
780 ev_io_stop (EV_A_ &sigev);
781 close (sigpipe [0]);
782 close (sigpipe [1]);
783
784 while (pipe (sigpipe))
785 syserr ("(libev) error creating pipe");
786
787 siginit (EV_A);
788 }
789
790 postfork = 0;
684} 791}
685 792
686#if EV_MULTIPLICITY 793#if EV_MULTIPLICITY
687struct ev_loop * 794struct ev_loop *
688ev_loop_new (int methods) 795ev_loop_new (int methods)
689{ 796{
690 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 797 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
798
799 memset (loop, 0, sizeof (struct ev_loop));
691 800
692 loop_init (EV_A_ methods); 801 loop_init (EV_A_ methods);
693 802
694 if (ev_method (EV_A)) 803 if (ev_method (EV_A))
695 return loop; 804 return loop;
… …
699 808
700void 809void
701ev_loop_destroy (EV_P) 810ev_loop_destroy (EV_P)
702{ 811{
703 loop_destroy (EV_A); 812 loop_destroy (EV_A);
704 free (loop); 813 ev_free (loop);
705} 814}
706 815
707void 816void
708ev_loop_fork (EV_P) 817ev_loop_fork (EV_P)
709{ 818{
710 loop_fork (EV_A); 819 postfork = 1;
711} 820}
712 821
713#endif 822#endif
714 823
715#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
… …
738 847
739 loop_init (EV_A_ methods); 848 loop_init (EV_A_ methods);
740 849
741 if (ev_method (EV_A)) 850 if (ev_method (EV_A))
742 { 851 {
743 ev_watcher_init (&sigev, sigcb);
744 ev_set_priority (&sigev, EV_MAXPRI);
745 siginit (EV_A); 852 siginit (EV_A);
746 853
747#ifndef WIN32 854#ifndef WIN32
748 ev_signal_init (&childev, childcb, SIGCHLD); 855 ev_signal_init (&childev, childcb, SIGCHLD);
749 ev_set_priority (&childev, EV_MAXPRI); 856 ev_set_priority (&childev, EV_MAXPRI);
… …
763{ 870{
764#if EV_MULTIPLICITY 871#if EV_MULTIPLICITY
765 struct ev_loop *loop = default_loop; 872 struct ev_loop *loop = default_loop;
766#endif 873#endif
767 874
875#ifndef WIN32
768 ev_ref (EV_A); /* child watcher */ 876 ev_ref (EV_A); /* child watcher */
769 ev_signal_stop (EV_A_ &childev); 877 ev_signal_stop (EV_A_ &childev);
878#endif
770 879
771 ev_ref (EV_A); /* signal watcher */ 880 ev_ref (EV_A); /* signal watcher */
772 ev_io_stop (EV_A_ &sigev); 881 ev_io_stop (EV_A_ &sigev);
773 882
774 close (sigpipe [0]); sigpipe [0] = 0; 883 close (sigpipe [0]); sigpipe [0] = 0;
… …
782{ 891{
783#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
784 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
785#endif 894#endif
786 895
787 loop_fork (EV_A); 896 if (method)
788 897 postfork = 1;
789 ev_io_stop (EV_A_ &sigev);
790 close (sigpipe [0]);
791 close (sigpipe [1]);
792 pipe (sigpipe);
793
794 ev_ref (EV_A); /* signal watcher */
795 siginit (EV_A);
796} 898}
797 899
798/*****************************************************************************/ 900/*****************************************************************************/
901
902static int
903any_pending (EV_P)
904{
905 int pri;
906
907 for (pri = NUMPRI; pri--; )
908 if (pendingcnt [pri])
909 return 1;
910
911 return 0;
912}
799 913
800static void 914static void
801call_pending (EV_P) 915call_pending (EV_P)
802{ 916{
803 int pri; 917 int pri;
… …
978 { 1092 {
979 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1093 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
980 call_pending (EV_A); 1094 call_pending (EV_A);
981 } 1095 }
982 1096
1097 /* we might have forked, so reify kernel state if necessary */
1098 if (expect_false (postfork))
1099 loop_fork (EV_A);
1100
983 /* update fd-related kernel structures */ 1101 /* update fd-related kernel structures */
984 fd_reify (EV_A); 1102 fd_reify (EV_A);
985 1103
986 /* calculate blocking time */ 1104 /* calculate blocking time */
987 1105
988 /* we only need this for !monotonic clockor timers, but as we basically 1106 /* we only need this for !monotonic clock or timers, but as we basically
989 always have timers, we just calculate it always */ 1107 always have timers, we just calculate it always */
990#if EV_USE_MONOTONIC 1108#if EV_USE_MONOTONIC
991 if (expect_true (have_monotonic)) 1109 if (expect_true (have_monotonic))
992 time_update_monotonic (EV_A); 1110 time_update_monotonic (EV_A);
993 else 1111 else
… …
1026 /* queue pending timers and reschedule them */ 1144 /* queue pending timers and reschedule them */
1027 timers_reify (EV_A); /* relative timers called last */ 1145 timers_reify (EV_A); /* relative timers called last */
1028 periodics_reify (EV_A); /* absolute timers called first */ 1146 periodics_reify (EV_A); /* absolute timers called first */
1029 1147
1030 /* queue idle watchers unless io or timers are pending */ 1148 /* queue idle watchers unless io or timers are pending */
1031 if (!pendingcnt) 1149 if (idlecnt && !any_pending (EV_A))
1032 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1150 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1033 1151
1034 /* queue check watchers, to be executed first */ 1152 /* queue check watchers, to be executed first */
1035 if (checkcnt) 1153 if (checkcnt)
1036 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1111 return; 1229 return;
1112 1230
1113 assert (("ev_io_start called with negative fd", fd >= 0)); 1231 assert (("ev_io_start called with negative fd", fd >= 0));
1114 1232
1115 ev_start (EV_A_ (W)w, 1); 1233 ev_start (EV_A_ (W)w, 1);
1116 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1234 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1117 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1235 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1118 1236
1119 fd_change (EV_A_ fd); 1237 fd_change (EV_A_ fd);
1120} 1238}
1121 1239
… …
1141 ((WT)w)->at += mn_now; 1259 ((WT)w)->at += mn_now;
1142 1260
1143 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1261 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1144 1262
1145 ev_start (EV_A_ (W)w, ++timercnt); 1263 ev_start (EV_A_ (W)w, ++timercnt);
1146 array_needsize (timers, timermax, timercnt, ); 1264 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1147 timers [timercnt - 1] = w; 1265 timers [timercnt - 1] = w;
1148 upheap ((WT *)timers, timercnt - 1); 1266 upheap ((WT *)timers, timercnt - 1);
1149 1267
1150 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1268 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1151} 1269}
… …
1198 /* this formula differs from the one in periodic_reify because we do not always round up */ 1316 /* this formula differs from the one in periodic_reify because we do not always round up */
1199 if (w->interval) 1317 if (w->interval)
1200 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1318 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1201 1319
1202 ev_start (EV_A_ (W)w, ++periodiccnt); 1320 ev_start (EV_A_ (W)w, ++periodiccnt);
1203 array_needsize (periodics, periodicmax, periodiccnt, ); 1321 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1204 periodics [periodiccnt - 1] = w; 1322 periodics [periodiccnt - 1] = w;
1205 upheap ((WT *)periodics, periodiccnt - 1); 1323 upheap ((WT *)periodics, periodiccnt - 1);
1206 1324
1207 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1325 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1208} 1326}
… …
1230{ 1348{
1231 if (ev_is_active (w)) 1349 if (ev_is_active (w))
1232 return; 1350 return;
1233 1351
1234 ev_start (EV_A_ (W)w, ++idlecnt); 1352 ev_start (EV_A_ (W)w, ++idlecnt);
1235 array_needsize (idles, idlemax, idlecnt, ); 1353 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1236 idles [idlecnt - 1] = w; 1354 idles [idlecnt - 1] = w;
1237} 1355}
1238 1356
1239void 1357void
1240ev_idle_stop (EV_P_ struct ev_idle *w) 1358ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1252{ 1370{
1253 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1254 return; 1372 return;
1255 1373
1256 ev_start (EV_A_ (W)w, ++preparecnt); 1374 ev_start (EV_A_ (W)w, ++preparecnt);
1257 array_needsize (prepares, preparemax, preparecnt, ); 1375 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1258 prepares [preparecnt - 1] = w; 1376 prepares [preparecnt - 1] = w;
1259} 1377}
1260 1378
1261void 1379void
1262ev_prepare_stop (EV_P_ struct ev_prepare *w) 1380ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1274{ 1392{
1275 if (ev_is_active (w)) 1393 if (ev_is_active (w))
1276 return; 1394 return;
1277 1395
1278 ev_start (EV_A_ (W)w, ++checkcnt); 1396 ev_start (EV_A_ (W)w, ++checkcnt);
1279 array_needsize (checks, checkmax, checkcnt, ); 1397 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1280 checks [checkcnt - 1] = w; 1398 checks [checkcnt - 1] = w;
1281} 1399}
1282 1400
1283void 1401void
1284ev_check_stop (EV_P_ struct ev_check *w) 1402ev_check_stop (EV_P_ struct ev_check *w)
… …
1305 return; 1423 return;
1306 1424
1307 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1425 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1308 1426
1309 ev_start (EV_A_ (W)w, 1); 1427 ev_start (EV_A_ (W)w, 1);
1310 array_needsize (signals, signalmax, w->signum, signals_init); 1428 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1311 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1429 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1312 1430
1313 if (!((WL)w)->next) 1431 if (!((WL)w)->next)
1314 { 1432 {
1433#if WIN32
1434 signal (w->signum, sighandler);
1435#else
1315 struct sigaction sa; 1436 struct sigaction sa;
1316 sa.sa_handler = sighandler; 1437 sa.sa_handler = sighandler;
1317 sigfillset (&sa.sa_mask); 1438 sigfillset (&sa.sa_mask);
1318 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1439 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1319 sigaction (w->signum, &sa, 0); 1440 sigaction (w->signum, &sa, 0);
1441#endif
1320 } 1442 }
1321} 1443}
1322 1444
1323void 1445void
1324ev_signal_stop (EV_P_ struct ev_signal *w) 1446ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1374 void (*cb)(int revents, void *arg) = once->cb; 1496 void (*cb)(int revents, void *arg) = once->cb;
1375 void *arg = once->arg; 1497 void *arg = once->arg;
1376 1498
1377 ev_io_stop (EV_A_ &once->io); 1499 ev_io_stop (EV_A_ &once->io);
1378 ev_timer_stop (EV_A_ &once->to); 1500 ev_timer_stop (EV_A_ &once->to);
1379 free (once); 1501 ev_free (once);
1380 1502
1381 cb (revents, arg); 1503 cb (revents, arg);
1382} 1504}
1383 1505
1384static void 1506static void
… …
1394} 1516}
1395 1517
1396void 1518void
1397ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1519ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1398{ 1520{
1399 struct ev_once *once = malloc (sizeof (struct ev_once)); 1521 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1400 1522
1401 if (!once) 1523 if (!once)
1402 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1524 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1403 else 1525 else
1404 { 1526 {

Diff Legend

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