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

Comparing libev/ev.c (file contents):
Revision 1.63 by root, Sun Nov 4 22:03:17 2007 UTC vs.
Revision 1.73 by root, Tue Nov 6 16:27:10 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
… …
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(base,n) ((n) | 4 & ~3)
221 274
222#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(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 (base, newcnt << 1); \
229 } \ 282 } \
230 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
231 \ 284 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = ev_realloc (base, sizeof (*base) * (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(stem) \
291 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
292 { \
293 stem ## max = array_roundsize (stem ## cnt >> 1); \
294 base = ev_realloc (base, sizeof (*base) * (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;
302
303#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 305
237/*****************************************************************************/ 306/*****************************************************************************/
238 307
239static void 308static void
240anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 326 pendings [ABSPRI (w)][w->pending - 1].events |= events;
258 return; 327 return;
259 } 328 }
260 329
261 w->pending = ++pendingcnt [ABSPRI (w)]; 330 w->pending = ++pendingcnt [ABSPRI (w)];
262 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 331 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void));
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 332 pendings [ABSPRI (w)][w->pending - 1].w = w;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 333 pendings [ABSPRI (w)][w->pending - 1].events = events;
265} 334}
266 335
267static void 336static void
… …
306 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 375 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
307 events |= w->events; 376 events |= w->events;
308 377
309 anfd->reify = 0; 378 anfd->reify = 0;
310 379
311 if (anfd->events != events)
312 {
313 method_modify (EV_A_ fd, anfd->events, events); 380 method_modify (EV_A_ fd, anfd->events, events);
314 anfd->events = events; 381 anfd->events = events;
315 }
316 } 382 }
317 383
318 fdchangecnt = 0; 384 fdchangecnt = 0;
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 (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;
… …
470} 549}
471 550
472static void 551static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 552sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 553{
475 struct ev_watcher_list *w; 554 WL w;
476 int signum; 555 int signum;
477 556
478 read (sigpipe [0], &revents, 1); 557 read (sigpipe [0], &revents, 1);
479 gotsig = 0; 558 gotsig = 0;
480 559
… …
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 584 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 585}
507 586
508/*****************************************************************************/ 587/*****************************************************************************/
509 588
589static struct ev_child *childs [PID_HASHSIZE];
590
510#ifndef WIN32 591#ifndef WIN32
511 592
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev; 593static struct ev_signal childev;
514 594
515#ifndef WCONTINUED 595#ifndef WCONTINUED
516# define WCONTINUED 0 596# define WCONTINUED 0
517#endif 597#endif
… …
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 711 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
632#endif 712#endif
633#if EV_USE_SELECT 713#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 714 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
635#endif 715#endif
716
717 ev_watcher_init (&sigev, sigcb);
718 ev_set_priority (&sigev, EV_MAXPRI);
636 } 719 }
637} 720}
638 721
639void 722void
640loop_destroy (EV_P) 723loop_destroy (EV_P)
641{ 724{
725 int i;
726
642#if EV_USE_WIN32 727#if EV_USE_WIN32
643 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 728 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
644#endif 729#endif
645#if EV_USE_KQUEUE 730#if EV_USE_KQUEUE
646 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 731 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
… …
653#endif 738#endif
654#if EV_USE_SELECT 739#if EV_USE_SELECT
655 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 740 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
656#endif 741#endif
657 742
743 for (i = NUMPRI; i--; )
744 array_free (pending, [i]);
745
746 /* have to use the microsoft-never-gets-it-right macro */
747 array_free_microshit (fdchange);
748 array_free_microshit (timer);
749 array_free_microshit (periodic);
750 array_free_microshit (idle);
751 array_free_microshit (prepare);
752 array_free_microshit (check);
753
658 method = 0; 754 method = 0;
659 /*TODO*/
660} 755}
661 756
662void 757static void
663loop_fork (EV_P) 758loop_fork (EV_P)
664{ 759{
665 /*TODO*/
666#if EV_USE_EPOLL 760#if EV_USE_EPOLL
667 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 761 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
668#endif 762#endif
669#if EV_USE_KQUEUE 763#if EV_USE_KQUEUE
670 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 764 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
671#endif 765#endif
766
767 if (ev_is_active (&sigev))
768 {
769 /* default loop */
770
771 ev_ref (EV_A);
772 ev_io_stop (EV_A_ &sigev);
773 close (sigpipe [0]);
774 close (sigpipe [1]);
775
776 while (pipe (sigpipe))
777 syserr ("(libev) error creating pipe");
778
779 siginit (EV_A);
780 }
781
782 postfork = 0;
672} 783}
673 784
674#if EV_MULTIPLICITY 785#if EV_MULTIPLICITY
675struct ev_loop * 786struct ev_loop *
676ev_loop_new (int methods) 787ev_loop_new (int methods)
677{ 788{
678 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 789 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
790
791 memset (loop, 0, sizeof (struct ev_loop));
679 792
680 loop_init (EV_A_ methods); 793 loop_init (EV_A_ methods);
681 794
682 if (ev_method (EV_A)) 795 if (ev_method (EV_A))
683 return loop; 796 return loop;
… …
687 800
688void 801void
689ev_loop_destroy (EV_P) 802ev_loop_destroy (EV_P)
690{ 803{
691 loop_destroy (EV_A); 804 loop_destroy (EV_A);
692 free (loop); 805 ev_free (loop);
693} 806}
694 807
695void 808void
696ev_loop_fork (EV_P) 809ev_loop_fork (EV_P)
697{ 810{
698 loop_fork (EV_A); 811 postfork = 1;
699} 812}
700 813
701#endif 814#endif
702 815
703#if EV_MULTIPLICITY 816#if EV_MULTIPLICITY
… …
726 839
727 loop_init (EV_A_ methods); 840 loop_init (EV_A_ methods);
728 841
729 if (ev_method (EV_A)) 842 if (ev_method (EV_A))
730 { 843 {
731 ev_watcher_init (&sigev, sigcb);
732 ev_set_priority (&sigev, EV_MAXPRI);
733 siginit (EV_A); 844 siginit (EV_A);
734 845
735#ifndef WIN32 846#ifndef WIN32
736 ev_signal_init (&childev, childcb, SIGCHLD); 847 ev_signal_init (&childev, childcb, SIGCHLD);
737 ev_set_priority (&childev, EV_MAXPRI); 848 ev_set_priority (&childev, EV_MAXPRI);
… …
751{ 862{
752#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
753 struct ev_loop *loop = default_loop; 864 struct ev_loop *loop = default_loop;
754#endif 865#endif
755 866
867#ifndef WIN32
756 ev_ref (EV_A); /* child watcher */ 868 ev_ref (EV_A); /* child watcher */
757 ev_signal_stop (EV_A_ &childev); 869 ev_signal_stop (EV_A_ &childev);
870#endif
758 871
759 ev_ref (EV_A); /* signal watcher */ 872 ev_ref (EV_A); /* signal watcher */
760 ev_io_stop (EV_A_ &sigev); 873 ev_io_stop (EV_A_ &sigev);
761 874
762 close (sigpipe [0]); sigpipe [0] = 0; 875 close (sigpipe [0]); sigpipe [0] = 0;
… …
770{ 883{
771#if EV_MULTIPLICITY 884#if EV_MULTIPLICITY
772 struct ev_loop *loop = default_loop; 885 struct ev_loop *loop = default_loop;
773#endif 886#endif
774 887
775 loop_fork (EV_A); 888 if (method)
776 889 postfork = 1;
777 ev_io_stop (EV_A_ &sigev);
778 close (sigpipe [0]);
779 close (sigpipe [1]);
780 pipe (sigpipe);
781
782 ev_ref (EV_A); /* signal watcher */
783 siginit (EV_A);
784} 890}
785 891
786/*****************************************************************************/ 892/*****************************************************************************/
787 893
788static void 894static void
… …
796 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 902 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
797 903
798 if (p->w) 904 if (p->w)
799 { 905 {
800 p->w->pending = 0; 906 p->w->pending = 0;
801
802 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events); 907 p->w->cb (EV_A_ p->w, p->events);
803 } 908 }
804 } 909 }
805} 910}
806 911
807static void 912static void
… …
967 { 1072 {
968 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
969 call_pending (EV_A); 1074 call_pending (EV_A);
970 } 1075 }
971 1076
1077 /* we might have forked, so reify kernel state if necessary */
1078 if (expect_false (postfork))
1079 loop_fork (EV_A);
1080
972 /* update fd-related kernel structures */ 1081 /* update fd-related kernel structures */
973 fd_reify (EV_A); 1082 fd_reify (EV_A);
974 1083
975 /* calculate blocking time */ 1084 /* calculate blocking time */
976 1085
… …
1130 ((WT)w)->at += mn_now; 1239 ((WT)w)->at += mn_now;
1131 1240
1132 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1241 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1133 1242
1134 ev_start (EV_A_ (W)w, ++timercnt); 1243 ev_start (EV_A_ (W)w, ++timercnt);
1135 array_needsize (timers, timermax, timercnt, ); 1244 array_needsize (timers, timermax, timercnt, (void));
1136 timers [timercnt - 1] = w; 1245 timers [timercnt - 1] = w;
1137 upheap ((WT *)timers, timercnt - 1); 1246 upheap ((WT *)timers, timercnt - 1);
1138 1247
1139 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1248 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1140} 1249}
… …
1187 /* this formula differs from the one in periodic_reify because we do not always round up */ 1296 /* this formula differs from the one in periodic_reify because we do not always round up */
1188 if (w->interval) 1297 if (w->interval)
1189 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1298 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1190 1299
1191 ev_start (EV_A_ (W)w, ++periodiccnt); 1300 ev_start (EV_A_ (W)w, ++periodiccnt);
1192 array_needsize (periodics, periodicmax, periodiccnt, ); 1301 array_needsize (periodics, periodicmax, periodiccnt, (void));
1193 periodics [periodiccnt - 1] = w; 1302 periodics [periodiccnt - 1] = w;
1194 upheap ((WT *)periodics, periodiccnt - 1); 1303 upheap ((WT *)periodics, periodiccnt - 1);
1195 1304
1196 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1305 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1197} 1306}
… …
1219{ 1328{
1220 if (ev_is_active (w)) 1329 if (ev_is_active (w))
1221 return; 1330 return;
1222 1331
1223 ev_start (EV_A_ (W)w, ++idlecnt); 1332 ev_start (EV_A_ (W)w, ++idlecnt);
1224 array_needsize (idles, idlemax, idlecnt, ); 1333 array_needsize (idles, idlemax, idlecnt, (void));
1225 idles [idlecnt - 1] = w; 1334 idles [idlecnt - 1] = w;
1226} 1335}
1227 1336
1228void 1337void
1229ev_idle_stop (EV_P_ struct ev_idle *w) 1338ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1241{ 1350{
1242 if (ev_is_active (w)) 1351 if (ev_is_active (w))
1243 return; 1352 return;
1244 1353
1245 ev_start (EV_A_ (W)w, ++preparecnt); 1354 ev_start (EV_A_ (W)w, ++preparecnt);
1246 array_needsize (prepares, preparemax, preparecnt, ); 1355 array_needsize (prepares, preparemax, preparecnt, (void));
1247 prepares [preparecnt - 1] = w; 1356 prepares [preparecnt - 1] = w;
1248} 1357}
1249 1358
1250void 1359void
1251ev_prepare_stop (EV_P_ struct ev_prepare *w) 1360ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1263{ 1372{
1264 if (ev_is_active (w)) 1373 if (ev_is_active (w))
1265 return; 1374 return;
1266 1375
1267 ev_start (EV_A_ (W)w, ++checkcnt); 1376 ev_start (EV_A_ (W)w, ++checkcnt);
1268 array_needsize (checks, checkmax, checkcnt, ); 1377 array_needsize (checks, checkmax, checkcnt, (void));
1269 checks [checkcnt - 1] = w; 1378 checks [checkcnt - 1] = w;
1270} 1379}
1271 1380
1272void 1381void
1273ev_check_stop (EV_P_ struct ev_check *w) 1382ev_check_stop (EV_P_ struct ev_check *w)
… …
1299 array_needsize (signals, signalmax, w->signum, signals_init); 1408 array_needsize (signals, signalmax, w->signum, signals_init);
1300 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1301 1410
1302 if (!((WL)w)->next) 1411 if (!((WL)w)->next)
1303 { 1412 {
1413#if WIN32
1414 signal (w->signum, sighandler);
1415#else
1304 struct sigaction sa; 1416 struct sigaction sa;
1305 sa.sa_handler = sighandler; 1417 sa.sa_handler = sighandler;
1306 sigfillset (&sa.sa_mask); 1418 sigfillset (&sa.sa_mask);
1307 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1419 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1308 sigaction (w->signum, &sa, 0); 1420 sigaction (w->signum, &sa, 0);
1421#endif
1309 } 1422 }
1310} 1423}
1311 1424
1312void 1425void
1313ev_signal_stop (EV_P_ struct ev_signal *w) 1426ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1363 void (*cb)(int revents, void *arg) = once->cb; 1476 void (*cb)(int revents, void *arg) = once->cb;
1364 void *arg = once->arg; 1477 void *arg = once->arg;
1365 1478
1366 ev_io_stop (EV_A_ &once->io); 1479 ev_io_stop (EV_A_ &once->io);
1367 ev_timer_stop (EV_A_ &once->to); 1480 ev_timer_stop (EV_A_ &once->to);
1368 free (once); 1481 ev_free (once);
1369 1482
1370 cb (revents, arg); 1483 cb (revents, arg);
1371} 1484}
1372 1485
1373static void 1486static void
… …
1383} 1496}
1384 1497
1385void 1498void
1386ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1499ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1387{ 1500{
1388 struct ev_once *once = malloc (sizeof (struct ev_once)); 1501 struct ev_once *once = ev_malloc (sizeof (struct ev_once));
1389 1502
1390 if (!once) 1503 if (!once)
1391 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1504 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1392 else 1505 else
1393 { 1506 {

Diff Legend

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