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

Comparing libev/ev.c (file contents):
Revision 1.69 by root, Tue Nov 6 00:10:04 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
150#if WIN32 153#include "ev_win32.c"
151/* note: the comment below could not be substantiated, but what would I care */
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif
155 154
156/*****************************************************************************/ 155/*****************************************************************************/
157 156
158static void (*syserr_cb)(void); 157static void (*syserr_cb)(const char *msg);
159 158
160void ev_set_syserr_cb (void (*cb)(void)) 159void ev_set_syserr_cb (void (*cb)(const char *msg))
161{ 160{
162 syserr_cb = cb; 161 syserr_cb = cb;
163} 162}
164 163
165static void 164static void
166syserr (void) 165syserr (const char *msg)
167{ 166{
167 if (!msg)
168 msg = "(libev) system error";
169
168 if (syserr_cb) 170 if (syserr_cb)
169 syserr_cb (); 171 syserr_cb (msg);
170 else 172 else
171 { 173 {
172 perror ("libev"); 174 perror (msg);
173 abort (); 175 abort ();
174 } 176 }
175} 177}
176 178
177static void *(*alloc)(void *ptr, long size); 179static void *(*alloc)(void *ptr, long size);
… …
266ev_now (EV_P) 268ev_now (EV_P)
267{ 269{
268 return rt_now; 270 return rt_now;
269} 271}
270 272
271#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
272 274
273#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
274 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
275 { \ 277 { \
276 int newcnt = cur; \ 278 int newcnt = cur; \
277 do \ 279 do \
278 { \ 280 { \
279 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
280 } \ 282 } \
281 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
282 \ 284 \
283 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
284 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
285 cur = newcnt; \ 287 cur = newcnt; \
286 } 288 }
287 289
288#define array_slim(stem) \ 290#define array_slim(type,stem) \
289 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
290 { \ 292 { \
291 stem ## max = array_roundsize (stem ## cnt >> 1); \ 293 stem ## max = array_roundsize (stem ## cnt >> 1); \
292 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
293 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
294 } 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;
295 302
296#define array_free(stem, idx) \ 303#define array_free(stem, idx) \
297 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
298 305
299/*****************************************************************************/ 306/*****************************************************************************/
… …
319 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
320 return; 327 return;
321 } 328 }
322 329
323 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
324 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));
325 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
326 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
327} 334}
328 335
329static void 336static void
… …
378} 385}
379 386
380static void 387static void
381fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
382{ 389{
383 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
384 return; 391 return;
385 392
386 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
387 394
388 ++fdchangecnt; 395 ++fdchangecnt;
389 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
390 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
391} 398}
392 399
393static void 400static void
394fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
400 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
401 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
402 } 409 }
403} 410}
404 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
405/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
406static void 423static void
407fd_ebadf (EV_P) 424fd_ebadf (EV_P)
408{ 425{
409 int fd; 426 int fd;
410 427
411 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
412 if (anfds [fd].events) 429 if (anfds [fd].events)
413 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
414 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
415} 432}
416 433
417/* 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 */
418static void 435static void
… …
426 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
427 return; 444 return;
428 } 445 }
429} 446}
430 447
431/* 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 */
432static void 449static void
433fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
434{ 451{
435 int fd; 452 int fd;
436 453
… …
524 541
525 if (!gotsig) 542 if (!gotsig)
526 { 543 {
527 int old_errno = errno; 544 int old_errno = errno;
528 gotsig = 1; 545 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
529 write (sigpipe [1], &signum, 1); 549 write (sigpipe [1], &signum, 1);
550#endif
530 errno = old_errno; 551 errno = old_errno;
531 } 552 }
532} 553}
533 554
534static void 555static void
535sigcb (EV_P_ struct ev_io *iow, int revents) 556sigcb (EV_P_ struct ev_io *iow, int revents)
536{ 557{
537 WL w; 558 WL w;
538 int signum; 559 int signum;
539 560
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
540 read (sigpipe [0], &revents, 1); 564 read (sigpipe [0], &revents, 1);
565#endif
541 gotsig = 0; 566 gotsig = 0;
542 567
543 for (signum = signalmax; signum--; ) 568 for (signum = signalmax; signum--; )
544 if (signals [signum].gotsig) 569 if (signals [signum].gotsig)
545 { 570 {
… …
567 ev_unref (EV_A); /* child watcher should not keep loop alive */ 592 ev_unref (EV_A); /* child watcher should not keep loop alive */
568} 593}
569 594
570/*****************************************************************************/ 595/*****************************************************************************/
571 596
597static struct ev_child *childs [PID_HASHSIZE];
598
572#ifndef WIN32 599#ifndef WIN32
573 600
574static struct ev_child *childs [PID_HASHSIZE];
575static struct ev_signal childev; 601static struct ev_signal childev;
576 602
577#ifndef WCONTINUED 603#ifndef WCONTINUED
578# define WCONTINUED 0 604# define WCONTINUED 0
579#endif 605#endif
… …
693 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
694#endif 720#endif
695#if EV_USE_SELECT 721#if EV_USE_SELECT
696 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
697#endif 723#endif
724
725 ev_watcher_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI);
698 } 727 }
699} 728}
700 729
701void 730void
702loop_destroy (EV_P) 731loop_destroy (EV_P)
… …
720#endif 749#endif
721 750
722 for (i = NUMPRI; i--; ) 751 for (i = NUMPRI; i--; )
723 array_free (pending, [i]); 752 array_free (pending, [i]);
724 753
754 /* have to use the microsoft-never-gets-it-right macro */
725 array_free (fdchange, ); 755 array_free_microshit (fdchange);
726 array_free (timer, ); 756 array_free_microshit (timer);
727 array_free (periodic, ); 757 array_free_microshit (periodic);
728 array_free (idle, ); 758 array_free_microshit (idle);
729 array_free (prepare, ); 759 array_free_microshit (prepare);
730 array_free (check, ); 760 array_free_microshit (check);
731 761
732 method = 0; 762 method = 0;
733 /*TODO*/
734} 763}
735 764
736void 765static void
737loop_fork (EV_P) 766loop_fork (EV_P)
738{ 767{
739 /*TODO*/
740#if EV_USE_EPOLL 768#if EV_USE_EPOLL
741 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
742#endif 770#endif
743#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
744 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
745#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;
746} 791}
747 792
748#if EV_MULTIPLICITY 793#if EV_MULTIPLICITY
749struct ev_loop * 794struct ev_loop *
750ev_loop_new (int methods) 795ev_loop_new (int methods)
… …
769} 814}
770 815
771void 816void
772ev_loop_fork (EV_P) 817ev_loop_fork (EV_P)
773{ 818{
774 loop_fork (EV_A); 819 postfork = 1;
775} 820}
776 821
777#endif 822#endif
778 823
779#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
… …
802 847
803 loop_init (EV_A_ methods); 848 loop_init (EV_A_ methods);
804 849
805 if (ev_method (EV_A)) 850 if (ev_method (EV_A))
806 { 851 {
807 ev_watcher_init (&sigev, sigcb);
808 ev_set_priority (&sigev, EV_MAXPRI);
809 siginit (EV_A); 852 siginit (EV_A);
810 853
811#ifndef WIN32 854#ifndef WIN32
812 ev_signal_init (&childev, childcb, SIGCHLD); 855 ev_signal_init (&childev, childcb, SIGCHLD);
813 ev_set_priority (&childev, EV_MAXPRI); 856 ev_set_priority (&childev, EV_MAXPRI);
… …
827{ 870{
828#if EV_MULTIPLICITY 871#if EV_MULTIPLICITY
829 struct ev_loop *loop = default_loop; 872 struct ev_loop *loop = default_loop;
830#endif 873#endif
831 874
875#ifndef WIN32
832 ev_ref (EV_A); /* child watcher */ 876 ev_ref (EV_A); /* child watcher */
833 ev_signal_stop (EV_A_ &childev); 877 ev_signal_stop (EV_A_ &childev);
878#endif
834 879
835 ev_ref (EV_A); /* signal watcher */ 880 ev_ref (EV_A); /* signal watcher */
836 ev_io_stop (EV_A_ &sigev); 881 ev_io_stop (EV_A_ &sigev);
837 882
838 close (sigpipe [0]); sigpipe [0] = 0; 883 close (sigpipe [0]); sigpipe [0] = 0;
… …
846{ 891{
847#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
848 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
849#endif 894#endif
850 895
851 loop_fork (EV_A); 896 if (method)
852 897 postfork = 1;
853 ev_io_stop (EV_A_ &sigev);
854 close (sigpipe [0]);
855 close (sigpipe [1]);
856 pipe (sigpipe);
857
858 ev_ref (EV_A); /* signal watcher */
859 siginit (EV_A);
860} 898}
861 899
862/*****************************************************************************/ 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}
863 913
864static void 914static void
865call_pending (EV_P) 915call_pending (EV_P)
866{ 916{
867 int pri; 917 int pri;
… …
1042 { 1092 {
1043 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1093 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
1044 call_pending (EV_A); 1094 call_pending (EV_A);
1045 } 1095 }
1046 1096
1097 /* we might have forked, so reify kernel state if necessary */
1098 if (expect_false (postfork))
1099 loop_fork (EV_A);
1100
1047 /* update fd-related kernel structures */ 1101 /* update fd-related kernel structures */
1048 fd_reify (EV_A); 1102 fd_reify (EV_A);
1049 1103
1050 /* calculate blocking time */ 1104 /* calculate blocking time */
1051 1105
1052 /* 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
1053 always have timers, we just calculate it always */ 1107 always have timers, we just calculate it always */
1054#if EV_USE_MONOTONIC 1108#if EV_USE_MONOTONIC
1055 if (expect_true (have_monotonic)) 1109 if (expect_true (have_monotonic))
1056 time_update_monotonic (EV_A); 1110 time_update_monotonic (EV_A);
1057 else 1111 else
… …
1090 /* queue pending timers and reschedule them */ 1144 /* queue pending timers and reschedule them */
1091 timers_reify (EV_A); /* relative timers called last */ 1145 timers_reify (EV_A); /* relative timers called last */
1092 periodics_reify (EV_A); /* absolute timers called first */ 1146 periodics_reify (EV_A); /* absolute timers called first */
1093 1147
1094 /* queue idle watchers unless io or timers are pending */ 1148 /* queue idle watchers unless io or timers are pending */
1095 if (!pendingcnt) 1149 if (idlecnt && !any_pending (EV_A))
1096 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1150 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1097 1151
1098 /* queue check watchers, to be executed first */ 1152 /* queue check watchers, to be executed first */
1099 if (checkcnt) 1153 if (checkcnt)
1100 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1154 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1175 return; 1229 return;
1176 1230
1177 assert (("ev_io_start called with negative fd", fd >= 0)); 1231 assert (("ev_io_start called with negative fd", fd >= 0));
1178 1232
1179 ev_start (EV_A_ (W)w, 1); 1233 ev_start (EV_A_ (W)w, 1);
1180 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1234 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1181 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1235 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1182 1236
1183 fd_change (EV_A_ fd); 1237 fd_change (EV_A_ fd);
1184} 1238}
1185 1239
… …
1205 ((WT)w)->at += mn_now; 1259 ((WT)w)->at += mn_now;
1206 1260
1207 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.));
1208 1262
1209 ev_start (EV_A_ (W)w, ++timercnt); 1263 ev_start (EV_A_ (W)w, ++timercnt);
1210 array_needsize (timers, timermax, timercnt, ); 1264 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1211 timers [timercnt - 1] = w; 1265 timers [timercnt - 1] = w;
1212 upheap ((WT *)timers, timercnt - 1); 1266 upheap ((WT *)timers, timercnt - 1);
1213 1267
1214 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1268 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1215} 1269}
… …
1262 /* 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 */
1263 if (w->interval) 1317 if (w->interval)
1264 ((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;
1265 1319
1266 ev_start (EV_A_ (W)w, ++periodiccnt); 1320 ev_start (EV_A_ (W)w, ++periodiccnt);
1267 array_needsize (periodics, periodicmax, periodiccnt, ); 1321 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1268 periodics [periodiccnt - 1] = w; 1322 periodics [periodiccnt - 1] = w;
1269 upheap ((WT *)periodics, periodiccnt - 1); 1323 upheap ((WT *)periodics, periodiccnt - 1);
1270 1324
1271 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1325 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1272} 1326}
… …
1294{ 1348{
1295 if (ev_is_active (w)) 1349 if (ev_is_active (w))
1296 return; 1350 return;
1297 1351
1298 ev_start (EV_A_ (W)w, ++idlecnt); 1352 ev_start (EV_A_ (W)w, ++idlecnt);
1299 array_needsize (idles, idlemax, idlecnt, ); 1353 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1300 idles [idlecnt - 1] = w; 1354 idles [idlecnt - 1] = w;
1301} 1355}
1302 1356
1303void 1357void
1304ev_idle_stop (EV_P_ struct ev_idle *w) 1358ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1316{ 1370{
1317 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1318 return; 1372 return;
1319 1373
1320 ev_start (EV_A_ (W)w, ++preparecnt); 1374 ev_start (EV_A_ (W)w, ++preparecnt);
1321 array_needsize (prepares, preparemax, preparecnt, ); 1375 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1322 prepares [preparecnt - 1] = w; 1376 prepares [preparecnt - 1] = w;
1323} 1377}
1324 1378
1325void 1379void
1326ev_prepare_stop (EV_P_ struct ev_prepare *w) 1380ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1338{ 1392{
1339 if (ev_is_active (w)) 1393 if (ev_is_active (w))
1340 return; 1394 return;
1341 1395
1342 ev_start (EV_A_ (W)w, ++checkcnt); 1396 ev_start (EV_A_ (W)w, ++checkcnt);
1343 array_needsize (checks, checkmax, checkcnt, ); 1397 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1344 checks [checkcnt - 1] = w; 1398 checks [checkcnt - 1] = w;
1345} 1399}
1346 1400
1347void 1401void
1348ev_check_stop (EV_P_ struct ev_check *w) 1402ev_check_stop (EV_P_ struct ev_check *w)
… …
1369 return; 1423 return;
1370 1424
1371 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));
1372 1426
1373 ev_start (EV_A_ (W)w, 1); 1427 ev_start (EV_A_ (W)w, 1);
1374 array_needsize (signals, signalmax, w->signum, signals_init); 1428 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1375 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1429 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1376 1430
1377 if (!((WL)w)->next) 1431 if (!((WL)w)->next)
1378 { 1432 {
1379#if WIN32 1433#if WIN32
… …
1462} 1516}
1463 1517
1464void 1518void
1465ev_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)
1466{ 1520{
1467 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1521 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1468 1522
1469 if (!once) 1523 if (!once)
1470 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1524 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1471 else 1525 else
1472 { 1526 {

Diff Legend

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