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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 2007 UTC vs.
Revision 1.75 by root, Tue Nov 6 19:29:20 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
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
158typedef struct 205typedef struct
159{ 206{
160 struct ev_watcher_list *head; 207 WL head;
161 unsigned char events; 208 unsigned char events;
162 unsigned char reify; 209 unsigned char reify;
163} ANFD; 210} ANFD;
164 211
165typedef struct 212typedef struct
… …
221ev_now (EV_P) 268ev_now (EV_P)
222{ 269{
223 return rt_now; 270 return rt_now;
224} 271}
225 272
226#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
227 274
228#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
230 { \ 277 { \
231 int newcnt = cur; \ 278 int newcnt = cur; \
232 do \ 279 do \
233 { \ 280 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 282 } \
236 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
237 \ 284 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 287 cur = newcnt; \
241 } 288 }
242 289
243#define array_slim(stem) \ 290#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 292 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 293 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 294 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 295 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 296 }
250 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;
302
251#define array_free(stem, idx) \ 303#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 305
254/*****************************************************************************/ 306/*****************************************************************************/
255 307
256static void 308static void
257anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
274 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
275 return; 327 return;
276 } 328 }
277 329
278 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
279 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));
280 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
281 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
282} 334}
283 335
284static void 336static void
… …
333} 385}
334 386
335static void 387static void
336fd_change (EV_P_ int fd) 388fd_change (EV_P_ int fd)
337{ 389{
338 if (anfds [fd].reify || fdchangecnt < 0) 390 if (anfds [fd].reify)
339 return; 391 return;
340 392
341 anfds [fd].reify = 1; 393 anfds [fd].reify = 1;
342 394
343 ++fdchangecnt; 395 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 396 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
345 fdchanges [fdchangecnt - 1] = fd; 397 fdchanges [fdchangecnt - 1] = fd;
346} 398}
347 399
348static void 400static void
349fd_kill (EV_P_ int fd) 401fd_kill (EV_P_ int fd)
… …
355 ev_io_stop (EV_A_ w); 407 ev_io_stop (EV_A_ w);
356 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 408 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
357 } 409 }
358} 410}
359 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
360/* called on EBADF to verify fds */ 422/* called on EBADF to verify fds */
361static void 423static void
362fd_ebadf (EV_P) 424fd_ebadf (EV_P)
363{ 425{
364 int fd; 426 int fd;
365 427
366 for (fd = 0; fd < anfdmax; ++fd) 428 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 429 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 430 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 431 fd_kill (EV_A_ fd);
370} 432}
371 433
372/* 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 */
373static void 435static void
… …
376 int fd; 438 int fd;
377 439
378 for (fd = anfdmax; fd--; ) 440 for (fd = anfdmax; fd--; )
379 if (anfds [fd].events) 441 if (anfds [fd].events)
380 { 442 {
381 close (fd);
382 fd_kill (EV_A_ fd); 443 fd_kill (EV_A_ fd);
383 return; 444 return;
384 } 445 }
385} 446}
386 447
387/* 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 */
388static void 449static void
389fd_rearm_all (EV_P) 450fd_rearm_all (EV_P)
390{ 451{
391 int fd; 452 int fd;
392 453
… …
444 505
445/*****************************************************************************/ 506/*****************************************************************************/
446 507
447typedef struct 508typedef struct
448{ 509{
449 struct ev_watcher_list *head; 510 WL head;
450 sig_atomic_t volatile gotsig; 511 sig_atomic_t volatile gotsig;
451} ANSIG; 512} ANSIG;
452 513
453static ANSIG *signals; 514static ANSIG *signals;
454static int signalmax; 515static int signalmax;
… …
480 541
481 if (!gotsig) 542 if (!gotsig)
482 { 543 {
483 int old_errno = errno; 544 int old_errno = errno;
484 gotsig = 1; 545 gotsig = 1;
546#ifdef WIN32
547 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
548#else
485 write (sigpipe [1], &signum, 1); 549 write (sigpipe [1], &signum, 1);
550#endif
486 errno = old_errno; 551 errno = old_errno;
487 } 552 }
488} 553}
489 554
490static void 555static void
491sigcb (EV_P_ struct ev_io *iow, int revents) 556sigcb (EV_P_ struct ev_io *iow, int revents)
492{ 557{
493 struct ev_watcher_list *w; 558 WL w;
494 int signum; 559 int signum;
495 560
561#ifdef WIN32
562 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
563#else
496 read (sigpipe [0], &revents, 1); 564 read (sigpipe [0], &revents, 1);
565#endif
497 gotsig = 0; 566 gotsig = 0;
498 567
499 for (signum = signalmax; signum--; ) 568 for (signum = signalmax; signum--; )
500 if (signals [signum].gotsig) 569 if (signals [signum].gotsig)
501 { 570 {
… …
523 ev_unref (EV_A); /* child watcher should not keep loop alive */ 592 ev_unref (EV_A); /* child watcher should not keep loop alive */
524} 593}
525 594
526/*****************************************************************************/ 595/*****************************************************************************/
527 596
597static struct ev_child *childs [PID_HASHSIZE];
598
528#ifndef WIN32 599#ifndef WIN32
529 600
530static struct ev_child *childs [PID_HASHSIZE];
531static struct ev_signal childev; 601static struct ev_signal childev;
532 602
533#ifndef WCONTINUED 603#ifndef WCONTINUED
534# define WCONTINUED 0 604# define WCONTINUED 0
535#endif 605#endif
… …
649 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 719 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
650#endif 720#endif
651#if EV_USE_SELECT 721#if EV_USE_SELECT
652 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 722 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
653#endif 723#endif
724
725 ev_watcher_init (&sigev, sigcb);
726 ev_set_priority (&sigev, EV_MAXPRI);
654 } 727 }
655} 728}
656 729
657void 730void
658loop_destroy (EV_P) 731loop_destroy (EV_P)
… …
676#endif 749#endif
677 750
678 for (i = NUMPRI; i--; ) 751 for (i = NUMPRI; i--; )
679 array_free (pending, [i]); 752 array_free (pending, [i]);
680 753
754 /* have to use the microsoft-never-gets-it-right macro */
681 array_free (fdchange, ); 755 array_free_microshit (fdchange);
682 array_free (timer, ); 756 array_free_microshit (timer);
683 array_free (periodic, ); 757 array_free_microshit (periodic);
684 array_free (idle, ); 758 array_free_microshit (idle);
685 array_free (prepare, ); 759 array_free_microshit (prepare);
686 array_free (check, ); 760 array_free_microshit (check);
687 761
688 method = 0; 762 method = 0;
689 /*TODO*/
690} 763}
691 764
692void 765static void
693loop_fork (EV_P) 766loop_fork (EV_P)
694{ 767{
695 /*TODO*/
696#if EV_USE_EPOLL 768#if EV_USE_EPOLL
697 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 769 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
698#endif 770#endif
699#if EV_USE_KQUEUE 771#if EV_USE_KQUEUE
700 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 772 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
701#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;
702} 791}
703 792
704#if EV_MULTIPLICITY 793#if EV_MULTIPLICITY
705struct ev_loop * 794struct ev_loop *
706ev_loop_new (int methods) 795ev_loop_new (int methods)
707{ 796{
708 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));
709 800
710 loop_init (EV_A_ methods); 801 loop_init (EV_A_ methods);
711 802
712 if (ev_method (EV_A)) 803 if (ev_method (EV_A))
713 return loop; 804 return loop;
… …
717 808
718void 809void
719ev_loop_destroy (EV_P) 810ev_loop_destroy (EV_P)
720{ 811{
721 loop_destroy (EV_A); 812 loop_destroy (EV_A);
722 free (loop); 813 ev_free (loop);
723} 814}
724 815
725void 816void
726ev_loop_fork (EV_P) 817ev_loop_fork (EV_P)
727{ 818{
728 loop_fork (EV_A); 819 postfork = 1;
729} 820}
730 821
731#endif 822#endif
732 823
733#if EV_MULTIPLICITY 824#if EV_MULTIPLICITY
… …
756 847
757 loop_init (EV_A_ methods); 848 loop_init (EV_A_ methods);
758 849
759 if (ev_method (EV_A)) 850 if (ev_method (EV_A))
760 { 851 {
761 ev_watcher_init (&sigev, sigcb);
762 ev_set_priority (&sigev, EV_MAXPRI);
763 siginit (EV_A); 852 siginit (EV_A);
764 853
765#ifndef WIN32 854#ifndef WIN32
766 ev_signal_init (&childev, childcb, SIGCHLD); 855 ev_signal_init (&childev, childcb, SIGCHLD);
767 ev_set_priority (&childev, EV_MAXPRI); 856 ev_set_priority (&childev, EV_MAXPRI);
… …
781{ 870{
782#if EV_MULTIPLICITY 871#if EV_MULTIPLICITY
783 struct ev_loop *loop = default_loop; 872 struct ev_loop *loop = default_loop;
784#endif 873#endif
785 874
875#ifndef WIN32
786 ev_ref (EV_A); /* child watcher */ 876 ev_ref (EV_A); /* child watcher */
787 ev_signal_stop (EV_A_ &childev); 877 ev_signal_stop (EV_A_ &childev);
878#endif
788 879
789 ev_ref (EV_A); /* signal watcher */ 880 ev_ref (EV_A); /* signal watcher */
790 ev_io_stop (EV_A_ &sigev); 881 ev_io_stop (EV_A_ &sigev);
791 882
792 close (sigpipe [0]); sigpipe [0] = 0; 883 close (sigpipe [0]); sigpipe [0] = 0;
… …
800{ 891{
801#if EV_MULTIPLICITY 892#if EV_MULTIPLICITY
802 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
803#endif 894#endif
804 895
805 loop_fork (EV_A); 896 if (method)
806 897 postfork = 1;
807 ev_io_stop (EV_A_ &sigev);
808 close (sigpipe [0]);
809 close (sigpipe [1]);
810 pipe (sigpipe);
811
812 ev_ref (EV_A); /* signal watcher */
813 siginit (EV_A);
814} 898}
815 899
816/*****************************************************************************/ 900/*****************************************************************************/
817 901
818static void 902static void
… …
996 { 1080 {
997 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1081 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
998 call_pending (EV_A); 1082 call_pending (EV_A);
999 } 1083 }
1000 1084
1085 /* we might have forked, so reify kernel state if necessary */
1086 if (expect_false (postfork))
1087 loop_fork (EV_A);
1088
1001 /* update fd-related kernel structures */ 1089 /* update fd-related kernel structures */
1002 fd_reify (EV_A); 1090 fd_reify (EV_A);
1003 1091
1004 /* calculate blocking time */ 1092 /* calculate blocking time */
1005 1093
… …
1129 return; 1217 return;
1130 1218
1131 assert (("ev_io_start called with negative fd", fd >= 0)); 1219 assert (("ev_io_start called with negative fd", fd >= 0));
1132 1220
1133 ev_start (EV_A_ (W)w, 1); 1221 ev_start (EV_A_ (W)w, 1);
1134 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1222 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1135 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1223 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1136 1224
1137 fd_change (EV_A_ fd); 1225 fd_change (EV_A_ fd);
1138} 1226}
1139 1227
… …
1159 ((WT)w)->at += mn_now; 1247 ((WT)w)->at += mn_now;
1160 1248
1161 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1249 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1162 1250
1163 ev_start (EV_A_ (W)w, ++timercnt); 1251 ev_start (EV_A_ (W)w, ++timercnt);
1164 array_needsize (timers, timermax, timercnt, ); 1252 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1165 timers [timercnt - 1] = w; 1253 timers [timercnt - 1] = w;
1166 upheap ((WT *)timers, timercnt - 1); 1254 upheap ((WT *)timers, timercnt - 1);
1167 1255
1168 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1256 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1169} 1257}
… …
1216 /* this formula differs from the one in periodic_reify because we do not always round up */ 1304 /* this formula differs from the one in periodic_reify because we do not always round up */
1217 if (w->interval) 1305 if (w->interval)
1218 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1306 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1219 1307
1220 ev_start (EV_A_ (W)w, ++periodiccnt); 1308 ev_start (EV_A_ (W)w, ++periodiccnt);
1221 array_needsize (periodics, periodicmax, periodiccnt, ); 1309 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1222 periodics [periodiccnt - 1] = w; 1310 periodics [periodiccnt - 1] = w;
1223 upheap ((WT *)periodics, periodiccnt - 1); 1311 upheap ((WT *)periodics, periodiccnt - 1);
1224 1312
1225 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1313 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1226} 1314}
… …
1248{ 1336{
1249 if (ev_is_active (w)) 1337 if (ev_is_active (w))
1250 return; 1338 return;
1251 1339
1252 ev_start (EV_A_ (W)w, ++idlecnt); 1340 ev_start (EV_A_ (W)w, ++idlecnt);
1253 array_needsize (idles, idlemax, idlecnt, ); 1341 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1254 idles [idlecnt - 1] = w; 1342 idles [idlecnt - 1] = w;
1255} 1343}
1256 1344
1257void 1345void
1258ev_idle_stop (EV_P_ struct ev_idle *w) 1346ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1270{ 1358{
1271 if (ev_is_active (w)) 1359 if (ev_is_active (w))
1272 return; 1360 return;
1273 1361
1274 ev_start (EV_A_ (W)w, ++preparecnt); 1362 ev_start (EV_A_ (W)w, ++preparecnt);
1275 array_needsize (prepares, preparemax, preparecnt, ); 1363 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1276 prepares [preparecnt - 1] = w; 1364 prepares [preparecnt - 1] = w;
1277} 1365}
1278 1366
1279void 1367void
1280ev_prepare_stop (EV_P_ struct ev_prepare *w) 1368ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1292{ 1380{
1293 if (ev_is_active (w)) 1381 if (ev_is_active (w))
1294 return; 1382 return;
1295 1383
1296 ev_start (EV_A_ (W)w, ++checkcnt); 1384 ev_start (EV_A_ (W)w, ++checkcnt);
1297 array_needsize (checks, checkmax, checkcnt, ); 1385 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1298 checks [checkcnt - 1] = w; 1386 checks [checkcnt - 1] = w;
1299} 1387}
1300 1388
1301void 1389void
1302ev_check_stop (EV_P_ struct ev_check *w) 1390ev_check_stop (EV_P_ struct ev_check *w)
… …
1323 return; 1411 return;
1324 1412
1325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1413 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1326 1414
1327 ev_start (EV_A_ (W)w, 1); 1415 ev_start (EV_A_ (W)w, 1);
1328 array_needsize (signals, signalmax, w->signum, signals_init); 1416 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1329 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1417 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1330 1418
1331 if (!((WL)w)->next) 1419 if (!((WL)w)->next)
1332 { 1420 {
1333#if WIN32 1421#if WIN32
… …
1396 void (*cb)(int revents, void *arg) = once->cb; 1484 void (*cb)(int revents, void *arg) = once->cb;
1397 void *arg = once->arg; 1485 void *arg = once->arg;
1398 1486
1399 ev_io_stop (EV_A_ &once->io); 1487 ev_io_stop (EV_A_ &once->io);
1400 ev_timer_stop (EV_A_ &once->to); 1488 ev_timer_stop (EV_A_ &once->to);
1401 free (once); 1489 ev_free (once);
1402 1490
1403 cb (revents, arg); 1491 cb (revents, arg);
1404} 1492}
1405 1493
1406static void 1494static void
… …
1416} 1504}
1417 1505
1418void 1506void
1419ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1507ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1420{ 1508{
1421 struct ev_once *once = malloc (sizeof (struct ev_once)); 1509 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1422 1510
1423 if (!once) 1511 if (!once)
1424 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1512 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1425 else 1513 else
1426 { 1514 {

Diff Legend

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