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

Comparing libev/ev.c (file contents):
Revision 1.65 by root, Sun Nov 4 23:29:48 2007 UTC vs.
Revision 1.74 by root, Tue Nov 6 16:51: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
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;
… …
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)
… …
658#endif 741#endif
659 742
660 for (i = NUMPRI; i--; ) 743 for (i = NUMPRI; i--; )
661 array_free (pending, [i]); 744 array_free (pending, [i]);
662 745
746 /* have to use the microsoft-never-gets-it-right macro */
663 array_free (fdchange, ); 747 array_free_microshit (fdchange);
664 array_free (timer, ); 748 array_free_microshit (timer);
665 array_free (periodic, ); 749 array_free_microshit (periodic);
666 array_free (idle, ); 750 array_free_microshit (idle);
667 array_free (prepare, ); 751 array_free_microshit (prepare);
668 array_free (check, ); 752 array_free_microshit (check);
669 753
670 method = 0; 754 method = 0;
671 /*TODO*/
672} 755}
673 756
674void 757static void
675loop_fork (EV_P) 758loop_fork (EV_P)
676{ 759{
677 /*TODO*/
678#if EV_USE_EPOLL 760#if EV_USE_EPOLL
679 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 761 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
680#endif 762#endif
681#if EV_USE_KQUEUE 763#if EV_USE_KQUEUE
682 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 764 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
683#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;
684} 783}
685 784
686#if EV_MULTIPLICITY 785#if EV_MULTIPLICITY
687struct ev_loop * 786struct ev_loop *
688ev_loop_new (int methods) 787ev_loop_new (int methods)
689{ 788{
690 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));
691 792
692 loop_init (EV_A_ methods); 793 loop_init (EV_A_ methods);
693 794
694 if (ev_method (EV_A)) 795 if (ev_method (EV_A))
695 return loop; 796 return loop;
… …
699 800
700void 801void
701ev_loop_destroy (EV_P) 802ev_loop_destroy (EV_P)
702{ 803{
703 loop_destroy (EV_A); 804 loop_destroy (EV_A);
704 free (loop); 805 ev_free (loop);
705} 806}
706 807
707void 808void
708ev_loop_fork (EV_P) 809ev_loop_fork (EV_P)
709{ 810{
710 loop_fork (EV_A); 811 postfork = 1;
711} 812}
712 813
713#endif 814#endif
714 815
715#if EV_MULTIPLICITY 816#if EV_MULTIPLICITY
… …
738 839
739 loop_init (EV_A_ methods); 840 loop_init (EV_A_ methods);
740 841
741 if (ev_method (EV_A)) 842 if (ev_method (EV_A))
742 { 843 {
743 ev_watcher_init (&sigev, sigcb);
744 ev_set_priority (&sigev, EV_MAXPRI);
745 siginit (EV_A); 844 siginit (EV_A);
746 845
747#ifndef WIN32 846#ifndef WIN32
748 ev_signal_init (&childev, childcb, SIGCHLD); 847 ev_signal_init (&childev, childcb, SIGCHLD);
749 ev_set_priority (&childev, EV_MAXPRI); 848 ev_set_priority (&childev, EV_MAXPRI);
… …
763{ 862{
764#if EV_MULTIPLICITY 863#if EV_MULTIPLICITY
765 struct ev_loop *loop = default_loop; 864 struct ev_loop *loop = default_loop;
766#endif 865#endif
767 866
867#ifndef WIN32
768 ev_ref (EV_A); /* child watcher */ 868 ev_ref (EV_A); /* child watcher */
769 ev_signal_stop (EV_A_ &childev); 869 ev_signal_stop (EV_A_ &childev);
870#endif
770 871
771 ev_ref (EV_A); /* signal watcher */ 872 ev_ref (EV_A); /* signal watcher */
772 ev_io_stop (EV_A_ &sigev); 873 ev_io_stop (EV_A_ &sigev);
773 874
774 close (sigpipe [0]); sigpipe [0] = 0; 875 close (sigpipe [0]); sigpipe [0] = 0;
… …
782{ 883{
783#if EV_MULTIPLICITY 884#if EV_MULTIPLICITY
784 struct ev_loop *loop = default_loop; 885 struct ev_loop *loop = default_loop;
785#endif 886#endif
786 887
787 loop_fork (EV_A); 888 if (method)
788 889 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} 890}
797 891
798/*****************************************************************************/ 892/*****************************************************************************/
799 893
800static void 894static void
… …
808 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 902 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
809 903
810 if (p->w) 904 if (p->w)
811 { 905 {
812 p->w->pending = 0; 906 p->w->pending = 0;
813
814 ((void (*)(EV_P_ W, int))p->w->cb) (EV_A_ p->w, p->events); 907 p->w->cb (EV_A_ p->w, p->events);
815 } 908 }
816 } 909 }
817} 910}
818 911
819static void 912static void
… …
979 { 1072 {
980 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1073 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
981 call_pending (EV_A); 1074 call_pending (EV_A);
982 } 1075 }
983 1076
1077 /* we might have forked, so reify kernel state if necessary */
1078 if (expect_false (postfork))
1079 loop_fork (EV_A);
1080
984 /* update fd-related kernel structures */ 1081 /* update fd-related kernel structures */
985 fd_reify (EV_A); 1082 fd_reify (EV_A);
986 1083
987 /* calculate blocking time */ 1084 /* calculate blocking time */
988 1085
… …
1112 return; 1209 return;
1113 1210
1114 assert (("ev_io_start called with negative fd", fd >= 0)); 1211 assert (("ev_io_start called with negative fd", fd >= 0));
1115 1212
1116 ev_start (EV_A_ (W)w, 1); 1213 ev_start (EV_A_ (W)w, 1);
1117 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1214 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1118 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1215 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1119 1216
1120 fd_change (EV_A_ fd); 1217 fd_change (EV_A_ fd);
1121} 1218}
1122 1219
… …
1142 ((WT)w)->at += mn_now; 1239 ((WT)w)->at += mn_now;
1143 1240
1144 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.));
1145 1242
1146 ev_start (EV_A_ (W)w, ++timercnt); 1243 ev_start (EV_A_ (W)w, ++timercnt);
1147 array_needsize (timers, timermax, timercnt, ); 1244 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1148 timers [timercnt - 1] = w; 1245 timers [timercnt - 1] = w;
1149 upheap ((WT *)timers, timercnt - 1); 1246 upheap ((WT *)timers, timercnt - 1);
1150 1247
1151 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1248 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1152} 1249}
… …
1199 /* 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 */
1200 if (w->interval) 1297 if (w->interval)
1201 ((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;
1202 1299
1203 ev_start (EV_A_ (W)w, ++periodiccnt); 1300 ev_start (EV_A_ (W)w, ++periodiccnt);
1204 array_needsize (periodics, periodicmax, periodiccnt, ); 1301 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1205 periodics [periodiccnt - 1] = w; 1302 periodics [periodiccnt - 1] = w;
1206 upheap ((WT *)periodics, periodiccnt - 1); 1303 upheap ((WT *)periodics, periodiccnt - 1);
1207 1304
1208 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1305 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1209} 1306}
… …
1231{ 1328{
1232 if (ev_is_active (w)) 1329 if (ev_is_active (w))
1233 return; 1330 return;
1234 1331
1235 ev_start (EV_A_ (W)w, ++idlecnt); 1332 ev_start (EV_A_ (W)w, ++idlecnt);
1236 array_needsize (idles, idlemax, idlecnt, ); 1333 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1237 idles [idlecnt - 1] = w; 1334 idles [idlecnt - 1] = w;
1238} 1335}
1239 1336
1240void 1337void
1241ev_idle_stop (EV_P_ struct ev_idle *w) 1338ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1253{ 1350{
1254 if (ev_is_active (w)) 1351 if (ev_is_active (w))
1255 return; 1352 return;
1256 1353
1257 ev_start (EV_A_ (W)w, ++preparecnt); 1354 ev_start (EV_A_ (W)w, ++preparecnt);
1258 array_needsize (prepares, preparemax, preparecnt, ); 1355 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1259 prepares [preparecnt - 1] = w; 1356 prepares [preparecnt - 1] = w;
1260} 1357}
1261 1358
1262void 1359void
1263ev_prepare_stop (EV_P_ struct ev_prepare *w) 1360ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1275{ 1372{
1276 if (ev_is_active (w)) 1373 if (ev_is_active (w))
1277 return; 1374 return;
1278 1375
1279 ev_start (EV_A_ (W)w, ++checkcnt); 1376 ev_start (EV_A_ (W)w, ++checkcnt);
1280 array_needsize (checks, checkmax, checkcnt, ); 1377 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1281 checks [checkcnt - 1] = w; 1378 checks [checkcnt - 1] = w;
1282} 1379}
1283 1380
1284void 1381void
1285ev_check_stop (EV_P_ struct ev_check *w) 1382ev_check_stop (EV_P_ struct ev_check *w)
… …
1306 return; 1403 return;
1307 1404
1308 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1405 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1309 1406
1310 ev_start (EV_A_ (W)w, 1); 1407 ev_start (EV_A_ (W)w, 1);
1311 array_needsize (signals, signalmax, w->signum, signals_init); 1408 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1312 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1409 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1313 1410
1314 if (!((WL)w)->next) 1411 if (!((WL)w)->next)
1315 { 1412 {
1413#if WIN32
1414 signal (w->signum, sighandler);
1415#else
1316 struct sigaction sa; 1416 struct sigaction sa;
1317 sa.sa_handler = sighandler; 1417 sa.sa_handler = sighandler;
1318 sigfillset (&sa.sa_mask); 1418 sigfillset (&sa.sa_mask);
1319 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 */
1320 sigaction (w->signum, &sa, 0); 1420 sigaction (w->signum, &sa, 0);
1421#endif
1321 } 1422 }
1322} 1423}
1323 1424
1324void 1425void
1325ev_signal_stop (EV_P_ struct ev_signal *w) 1426ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1375 void (*cb)(int revents, void *arg) = once->cb; 1476 void (*cb)(int revents, void *arg) = once->cb;
1376 void *arg = once->arg; 1477 void *arg = once->arg;
1377 1478
1378 ev_io_stop (EV_A_ &once->io); 1479 ev_io_stop (EV_A_ &once->io);
1379 ev_timer_stop (EV_A_ &once->to); 1480 ev_timer_stop (EV_A_ &once->to);
1380 free (once); 1481 ev_free (once);
1381 1482
1382 cb (revents, arg); 1483 cb (revents, arg);
1383} 1484}
1384 1485
1385static void 1486static void
… …
1395} 1496}
1396 1497
1397void 1498void
1398ev_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)
1399{ 1500{
1400 struct ev_once *once = malloc (sizeof (struct ev_once)); 1501 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1401 1502
1402 if (!once) 1503 if (!once)
1403 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1504 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1404 else 1505 else
1405 { 1506 {

Diff Legend

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