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

Comparing libev/ev.c (file contents):
Revision 1.56 by root, Sun Nov 4 15:58:49 2007 UTC vs.
Revision 1.79 by root, Fri Nov 9 15:15:20 2007 UTC

… …
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31#ifndef EV_STANDALONE 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33
34# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1
36# define EV_USE_REALTIME 1
37# endif
38
39# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1
41# endif
42
43# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1
45# endif
46
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1
49# endif
50
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1
53# endif
54
33#endif 55#endif
34 56
35#include <math.h> 57#include <math.h>
36#include <stdlib.h> 58#include <stdlib.h>
37#include <unistd.h>
38#include <fcntl.h> 59#include <fcntl.h>
39#include <signal.h>
40#include <stddef.h> 60#include <stddef.h>
41 61
42#include <stdio.h> 62#include <stdio.h>
43 63
44#include <assert.h> 64#include <assert.h>
45#include <errno.h> 65#include <errno.h>
46#include <sys/types.h> 66#include <sys/types.h>
67#include <time.h>
68
69#include <signal.h>
70
47#ifndef WIN32 71#ifndef WIN32
72# include <unistd.h>
73# include <sys/time.h>
48# include <sys/wait.h> 74# include <sys/wait.h>
49#endif 75#endif
50#include <sys/time.h>
51#include <time.h>
52
53/**/ 76/**/
54 77
55#ifndef EV_USE_MONOTONIC 78#ifndef EV_USE_MONOTONIC
56# define EV_USE_MONOTONIC 1 79# define EV_USE_MONOTONIC 1
57#endif 80#endif
58 81
59#ifndef EV_USE_SELECT 82#ifndef EV_USE_SELECT
60# define EV_USE_SELECT 1 83# define EV_USE_SELECT 1
61#endif 84#endif
62 85
63#ifndef EV_USEV_POLL 86#ifndef EV_USE_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */ 87# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif 88#endif
66 89
67#ifndef EV_USE_EPOLL 90#ifndef EV_USE_EPOLL
68# define EV_USE_EPOLL 0 91# define EV_USE_EPOLL 0
69#endif 92#endif
70 93
71#ifndef EV_USE_KQUEUE 94#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0 95# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
73#endif 106#endif
74 107
75#ifndef EV_USE_REALTIME 108#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1 109# define EV_USE_REALTIME 1
77#endif 110#endif
… …
115typedef struct ev_watcher_list *WL; 148typedef struct ev_watcher_list *WL;
116typedef struct ev_watcher_time *WT; 149typedef struct ev_watcher_time *WT;
117 150
118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
119 152
153#include "ev_win32.c"
154
120/*****************************************************************************/ 155/*****************************************************************************/
121 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
122typedef struct 205typedef struct
123{ 206{
124 struct ev_watcher_list *head; 207 WL head;
125 unsigned char events; 208 unsigned char events;
126 unsigned char reify; 209 unsigned char reify;
127} ANFD; 210} ANFD;
128 211
129typedef struct 212typedef struct
… …
185ev_now (EV_P) 268ev_now (EV_P)
186{ 269{
187 return rt_now; 270 return rt_now;
188} 271}
189 272
190#define array_roundsize(base,n) ((n) | 4 & ~3) 273#define array_roundsize(type,n) ((n) | 4 & ~3)
191 274
192#define array_needsize(base,cur,cnt,init) \ 275#define array_needsize(type,base,cur,cnt,init) \
193 if (expect_false ((cnt) > cur)) \ 276 if (expect_false ((cnt) > cur)) \
194 { \ 277 { \
195 int newcnt = cur; \ 278 int newcnt = cur; \
196 do \ 279 do \
197 { \ 280 { \
198 newcnt = array_roundsize (base, newcnt << 1); \ 281 newcnt = array_roundsize (type, newcnt << 1); \
199 } \ 282 } \
200 while ((cnt) > newcnt); \ 283 while ((cnt) > newcnt); \
201 \ 284 \
202 base = realloc (base, sizeof (*base) * (newcnt)); \ 285 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
203 init (base + cur, newcnt - cur); \ 286 init (base + cur, newcnt - cur); \
204 cur = newcnt; \ 287 cur = newcnt; \
205 } 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;
302
303#define array_free(stem, idx) \
304 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
206 305
207/*****************************************************************************/ 306/*****************************************************************************/
208 307
209static void 308static void
210anfds_init (ANFD *base, int count) 309anfds_init (ANFD *base, int count)
… …
217 316
218 ++base; 317 ++base;
219 } 318 }
220} 319}
221 320
222static void 321void
223event (EV_P_ W w, int events) 322ev_feed_event (EV_P_ void *w, int revents)
224{ 323{
324 W w_ = (W)w;
325
225 if (w->pending) 326 if (w_->pending)
226 { 327 {
227 pendings [ABSPRI (w)][w->pending - 1].events |= events; 328 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
228 return; 329 return;
229 } 330 }
230 331
231 w->pending = ++pendingcnt [ABSPRI (w)]; 332 w_->pending = ++pendingcnt [ABSPRI (w_)];
232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 333 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
233 pendings [ABSPRI (w)][w->pending - 1].w = w; 334 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
234 pendings [ABSPRI (w)][w->pending - 1].events = events; 335 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
235} 336}
236 337
237static void 338static void
238queue_events (EV_P_ W *events, int eventcnt, int type) 339queue_events (EV_P_ W *events, int eventcnt, int type)
239{ 340{
240 int i; 341 int i;
241 342
242 for (i = 0; i < eventcnt; ++i) 343 for (i = 0; i < eventcnt; ++i)
243 event (EV_A_ events [i], type); 344 ev_feed_event (EV_A_ events [i], type);
244} 345}
245 346
246static void 347inline void
247fd_event (EV_P_ int fd, int events) 348fd_event (EV_P_ int fd, int revents)
248{ 349{
249 ANFD *anfd = anfds + fd; 350 ANFD *anfd = anfds + fd;
250 struct ev_io *w; 351 struct ev_io *w;
251 352
252 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 353 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
253 { 354 {
254 int ev = w->events & events; 355 int ev = w->events & revents;
255 356
256 if (ev) 357 if (ev)
257 event (EV_A_ (W)w, ev); 358 ev_feed_event (EV_A_ (W)w, ev);
258 } 359 }
360}
361
362void
363ev_feed_fd_event (EV_P_ int fd, int revents)
364{
365 fd_event (EV_A_ fd, revents);
259} 366}
260 367
261/*****************************************************************************/ 368/*****************************************************************************/
262 369
263static void 370static void
… …
276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 383 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
277 events |= w->events; 384 events |= w->events;
278 385
279 anfd->reify = 0; 386 anfd->reify = 0;
280 387
281 if (anfd->events != events)
282 {
283 method_modify (EV_A_ fd, anfd->events, events); 388 method_modify (EV_A_ fd, anfd->events, events);
284 anfd->events = events; 389 anfd->events = events;
285 }
286 } 390 }
287 391
288 fdchangecnt = 0; 392 fdchangecnt = 0;
289} 393}
290 394
291static void 395static void
292fd_change (EV_P_ int fd) 396fd_change (EV_P_ int fd)
293{ 397{
294 if (anfds [fd].reify || fdchangecnt < 0) 398 if (anfds [fd].reify)
295 return; 399 return;
296 400
297 anfds [fd].reify = 1; 401 anfds [fd].reify = 1;
298 402
299 ++fdchangecnt; 403 ++fdchangecnt;
300 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 404 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
301 fdchanges [fdchangecnt - 1] = fd; 405 fdchanges [fdchangecnt - 1] = fd;
302} 406}
303 407
304static void 408static void
305fd_kill (EV_P_ int fd) 409fd_kill (EV_P_ int fd)
… …
307 struct ev_io *w; 411 struct ev_io *w;
308 412
309 while ((w = (struct ev_io *)anfds [fd].head)) 413 while ((w = (struct ev_io *)anfds [fd].head))
310 { 414 {
311 ev_io_stop (EV_A_ w); 415 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 416 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 } 417 }
418}
419
420static int
421fd_valid (int fd)
422{
423#ifdef WIN32
424 return !!win32_get_osfhandle (fd);
425#else
426 return fcntl (fd, F_GETFD) != -1;
427#endif
314} 428}
315 429
316/* called on EBADF to verify fds */ 430/* called on EBADF to verify fds */
317static void 431static void
318fd_ebadf (EV_P) 432fd_ebadf (EV_P)
319{ 433{
320 int fd; 434 int fd;
321 435
322 for (fd = 0; fd < anfdmax; ++fd) 436 for (fd = 0; fd < anfdmax; ++fd)
323 if (anfds [fd].events) 437 if (anfds [fd].events)
324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 438 if (!fd_valid (fd) == -1 && errno == EBADF)
325 fd_kill (EV_A_ fd); 439 fd_kill (EV_A_ fd);
326} 440}
327 441
328/* called on ENOMEM in select/poll to kill some fds and retry */ 442/* called on ENOMEM in select/poll to kill some fds and retry */
329static void 443static void
330fd_enomem (EV_P) 444fd_enomem (EV_P)
331{ 445{
332 int fd = anfdmax; 446 int fd;
333 447
334 while (fd--) 448 for (fd = anfdmax; fd--; )
335 if (anfds [fd].events) 449 if (anfds [fd].events)
336 { 450 {
337 close (fd);
338 fd_kill (EV_A_ fd); 451 fd_kill (EV_A_ fd);
339 return; 452 return;
340 } 453 }
341} 454}
342 455
343/* susually called after fork if method needs to re-arm all fds from scratch */ 456/* usually called after fork if method needs to re-arm all fds from scratch */
344static void 457static void
345fd_rearm_all (EV_P) 458fd_rearm_all (EV_P)
346{ 459{
347 int fd; 460 int fd;
348 461
349 /* this should be highly optimised to not do anything but set a flag */ 462 /* this should be highly optimised to not do anything but set a flag */
350 for (fd = 0; fd < anfdmax; ++fd) 463 for (fd = 0; fd < anfdmax; ++fd)
351 if (anfds [fd].events) 464 if (anfds [fd].events)
352 { 465 {
353 anfds [fd].events = 0; 466 anfds [fd].events = 0;
354 fd_change (fd); 467 fd_change (EV_A_ fd);
355 } 468 }
356} 469}
357 470
358/*****************************************************************************/ 471/*****************************************************************************/
359 472
… …
363 WT w = heap [k]; 476 WT w = heap [k];
364 477
365 while (k && heap [k >> 1]->at > w->at) 478 while (k && heap [k >> 1]->at > w->at)
366 { 479 {
367 heap [k] = heap [k >> 1]; 480 heap [k] = heap [k >> 1];
368 heap [k]->active = k + 1; 481 ((W)heap [k])->active = k + 1;
369 k >>= 1; 482 k >>= 1;
370 } 483 }
371 484
372 heap [k] = w; 485 heap [k] = w;
373 heap [k]->active = k + 1; 486 ((W)heap [k])->active = k + 1;
374 487
375} 488}
376 489
377static void 490static void
378downheap (WT *heap, int N, int k) 491downheap (WT *heap, int N, int k)
… …
388 501
389 if (w->at <= heap [j]->at) 502 if (w->at <= heap [j]->at)
390 break; 503 break;
391 504
392 heap [k] = heap [j]; 505 heap [k] = heap [j];
393 heap [k]->active = k + 1; 506 ((W)heap [k])->active = k + 1;
394 k = j; 507 k = j;
395 } 508 }
396 509
397 heap [k] = w; 510 heap [k] = w;
398 heap [k]->active = k + 1; 511 ((W)heap [k])->active = k + 1;
399} 512}
400 513
401/*****************************************************************************/ 514/*****************************************************************************/
402 515
403typedef struct 516typedef struct
404{ 517{
405 struct ev_watcher_list *head; 518 WL head;
406 sig_atomic_t volatile gotsig; 519 sig_atomic_t volatile gotsig;
407} ANSIG; 520} ANSIG;
408 521
409static ANSIG *signals; 522static ANSIG *signals;
410static int signalmax; 523static int signalmax;
411 524
412static int sigpipe [2]; 525static int sigpipe [2];
413static sig_atomic_t volatile gotsig; 526static sig_atomic_t volatile gotsig;
527static struct ev_io sigev;
414 528
415static void 529static void
416signals_init (ANSIG *base, int count) 530signals_init (ANSIG *base, int count)
417{ 531{
418 while (count--) 532 while (count--)
… …
425} 539}
426 540
427static void 541static void
428sighandler (int signum) 542sighandler (int signum)
429{ 543{
544#if WIN32
545 signal (signum, sighandler);
546#endif
547
430 signals [signum - 1].gotsig = 1; 548 signals [signum - 1].gotsig = 1;
431 549
432 if (!gotsig) 550 if (!gotsig)
433 { 551 {
434 int old_errno = errno; 552 int old_errno = errno;
435 gotsig = 1; 553 gotsig = 1;
554#ifdef WIN32
555 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
556#else
436 write (sigpipe [1], &signum, 1); 557 write (sigpipe [1], &signum, 1);
558#endif
437 errno = old_errno; 559 errno = old_errno;
438 } 560 }
439} 561}
440 562
563void
564ev_feed_signal_event (EV_P_ int signum)
565{
566#if EV_MULTIPLICITY
567 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
568#endif
569
570 --signum;
571
572 if (signum < 0 || signum >= signalmax)
573 return;
574
575 signals [signum].gotsig = 0;
576
577 for (w = signals [signum].head; w; w = w->next)
578 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
579}
580
441static void 581static void
442sigcb (EV_P_ struct ev_io *iow, int revents) 582sigcb (EV_P_ struct ev_io *iow, int revents)
443{ 583{
444 struct ev_watcher_list *w; 584 WL w;
445 int signum; 585 int signum;
446 586
587#ifdef WIN32
588 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
589#else
447 read (sigpipe [0], &revents, 1); 590 read (sigpipe [0], &revents, 1);
591#endif
448 gotsig = 0; 592 gotsig = 0;
449 593
450 for (signum = signalmax; signum--; ) 594 for (signum = signalmax; signum--; )
451 if (signals [signum].gotsig) 595 if (signals [signum].gotsig)
452 { 596 sigevent (EV_A_ signum + 1);
453 signals [signum].gotsig = 0;
454
455 for (w = signals [signum].head; w; w = w->next)
456 event (EV_A_ (W)w, EV_SIGNAL);
457 }
458} 597}
459 598
460static void 599static void
461siginit (EV_P) 600siginit (EV_P)
462{ 601{
… …
474 ev_unref (EV_A); /* child watcher should not keep loop alive */ 613 ev_unref (EV_A); /* child watcher should not keep loop alive */
475} 614}
476 615
477/*****************************************************************************/ 616/*****************************************************************************/
478 617
618static struct ev_child *childs [PID_HASHSIZE];
619
479#ifndef WIN32 620#ifndef WIN32
621
622static struct ev_signal childev;
480 623
481#ifndef WCONTINUED 624#ifndef WCONTINUED
482# define WCONTINUED 0 625# define WCONTINUED 0
483#endif 626#endif
484 627
… …
488 struct ev_child *w; 631 struct ev_child *w;
489 632
490 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 633 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
491 if (w->pid == pid || !w->pid) 634 if (w->pid == pid || !w->pid)
492 { 635 {
493 w->priority = sw->priority; /* need to do it *now* */ 636 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
494 w->rpid = pid; 637 w->rpid = pid;
495 w->rstatus = status; 638 w->rstatus = status;
496 event (EV_A_ (W)w, EV_CHILD); 639 ev_feed_event (EV_A_ (W)w, EV_CHILD);
497 } 640 }
498} 641}
499 642
500static void 643static void
501childcb (EV_P_ struct ev_signal *sw, int revents) 644childcb (EV_P_ struct ev_signal *sw, int revents)
… …
503 int pid, status; 646 int pid, status;
504 647
505 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 648 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
506 { 649 {
507 /* make sure we are called again until all childs have been reaped */ 650 /* make sure we are called again until all childs have been reaped */
508 event (EV_A_ (W)sw, EV_SIGNAL); 651 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
509 652
510 child_reap (EV_A_ sw, pid, pid, status); 653 child_reap (EV_A_ sw, pid, pid, status);
511 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 654 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
512 } 655 }
513} 656}
… …
520# include "ev_kqueue.c" 663# include "ev_kqueue.c"
521#endif 664#endif
522#if EV_USE_EPOLL 665#if EV_USE_EPOLL
523# include "ev_epoll.c" 666# include "ev_epoll.c"
524#endif 667#endif
525#if EV_USEV_POLL 668#if EV_USE_POLL
526# include "ev_poll.c" 669# include "ev_poll.c"
527#endif 670#endif
528#if EV_USE_SELECT 671#if EV_USE_SELECT
529# include "ev_select.c" 672# include "ev_select.c"
530#endif 673#endif
… …
582 methods = atoi (getenv ("LIBEV_METHODS")); 725 methods = atoi (getenv ("LIBEV_METHODS"));
583 else 726 else
584 methods = EVMETHOD_ANY; 727 methods = EVMETHOD_ANY;
585 728
586 method = 0; 729 method = 0;
730#if EV_USE_WIN32
731 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
732#endif
587#if EV_USE_KQUEUE 733#if EV_USE_KQUEUE
588 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 734 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
589#endif 735#endif
590#if EV_USE_EPOLL 736#if EV_USE_EPOLL
591 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 737 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
592#endif 738#endif
593#if EV_USEV_POLL 739#if EV_USE_POLL
594 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 740 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
595#endif 741#endif
596#if EV_USE_SELECT 742#if EV_USE_SELECT
597 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 743 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
598#endif 744#endif
745
746 ev_watcher_init (&sigev, sigcb);
747 ev_set_priority (&sigev, EV_MAXPRI);
599 } 748 }
600} 749}
601 750
602void 751void
603loop_destroy (EV_P) 752loop_destroy (EV_P)
604{ 753{
754 int i;
755
756#if EV_USE_WIN32
757 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
758#endif
605#if EV_USE_KQUEUE 759#if EV_USE_KQUEUE
606 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 760 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
607#endif 761#endif
608#if EV_USE_EPOLL 762#if EV_USE_EPOLL
609 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 763 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
610#endif 764#endif
611#if EV_USEV_POLL 765#if EV_USE_POLL
612 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 766 if (method == EVMETHOD_POLL ) poll_destroy (EV_A);
613#endif 767#endif
614#if EV_USE_SELECT 768#if EV_USE_SELECT
615 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 769 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
616#endif 770#endif
617 771
772 for (i = NUMPRI; i--; )
773 array_free (pending, [i]);
774
775 /* have to use the microsoft-never-gets-it-right macro */
776 array_free_microshit (fdchange);
777 array_free_microshit (timer);
778 array_free_microshit (periodic);
779 array_free_microshit (idle);
780 array_free_microshit (prepare);
781 array_free_microshit (check);
782
618 method = 0; 783 method = 0;
619 /*TODO*/
620} 784}
621 785
622void 786static void
623loop_fork (EV_P) 787loop_fork (EV_P)
624{ 788{
625 /*TODO*/
626#if EV_USE_EPOLL 789#if EV_USE_EPOLL
627 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 790 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
628#endif 791#endif
629#if EV_USE_KQUEUE 792#if EV_USE_KQUEUE
630 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 793 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
631#endif 794#endif
795
796 if (ev_is_active (&sigev))
797 {
798 /* default loop */
799
800 ev_ref (EV_A);
801 ev_io_stop (EV_A_ &sigev);
802 close (sigpipe [0]);
803 close (sigpipe [1]);
804
805 while (pipe (sigpipe))
806 syserr ("(libev) error creating pipe");
807
808 siginit (EV_A);
809 }
810
811 postfork = 0;
632} 812}
633 813
634#if EV_MULTIPLICITY 814#if EV_MULTIPLICITY
635struct ev_loop * 815struct ev_loop *
636ev_loop_new (int methods) 816ev_loop_new (int methods)
637{ 817{
638 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 818 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
819
820 memset (loop, 0, sizeof (struct ev_loop));
639 821
640 loop_init (EV_A_ methods); 822 loop_init (EV_A_ methods);
641 823
642 if (ev_methods (EV_A)) 824 if (ev_method (EV_A))
643 return loop; 825 return loop;
644 826
645 return 0; 827 return 0;
646} 828}
647 829
648void 830void
649ev_loop_destroy (EV_P) 831ev_loop_destroy (EV_P)
650{ 832{
651 loop_destroy (EV_A); 833 loop_destroy (EV_A);
652 free (loop); 834 ev_free (loop);
653} 835}
654 836
655void 837void
656ev_loop_fork (EV_P) 838ev_loop_fork (EV_P)
657{ 839{
658 loop_fork (EV_A); 840 postfork = 1;
659} 841}
660 842
661#endif 843#endif
662 844
663#if EV_MULTIPLICITY 845#if EV_MULTIPLICITY
… …
686 868
687 loop_init (EV_A_ methods); 869 loop_init (EV_A_ methods);
688 870
689 if (ev_method (EV_A)) 871 if (ev_method (EV_A))
690 { 872 {
691 ev_watcher_init (&sigev, sigcb);
692 ev_set_priority (&sigev, EV_MAXPRI);
693 siginit (EV_A); 873 siginit (EV_A);
694 874
695#ifndef WIN32 875#ifndef WIN32
696 ev_signal_init (&childev, childcb, SIGCHLD); 876 ev_signal_init (&childev, childcb, SIGCHLD);
697 ev_set_priority (&childev, EV_MAXPRI); 877 ev_set_priority (&childev, EV_MAXPRI);
… …
707} 887}
708 888
709void 889void
710ev_default_destroy (void) 890ev_default_destroy (void)
711{ 891{
892#if EV_MULTIPLICITY
712 struct ev_loop *loop = default_loop; 893 struct ev_loop *loop = default_loop;
894#endif
713 895
896#ifndef WIN32
714 ev_ref (EV_A); /* child watcher */ 897 ev_ref (EV_A); /* child watcher */
715 ev_signal_stop (EV_A_ &childev); 898 ev_signal_stop (EV_A_ &childev);
899#endif
716 900
717 ev_ref (EV_A); /* signal watcher */ 901 ev_ref (EV_A); /* signal watcher */
718 ev_io_stop (EV_A_ &sigev); 902 ev_io_stop (EV_A_ &sigev);
719 903
720 close (sigpipe [0]); sigpipe [0] = 0; 904 close (sigpipe [0]); sigpipe [0] = 0;
… …
722 906
723 loop_destroy (EV_A); 907 loop_destroy (EV_A);
724} 908}
725 909
726void 910void
727ev_default_fork (EV_P) 911ev_default_fork (void)
728{ 912{
729 loop_fork (EV_A); 913#if EV_MULTIPLICITY
914 struct ev_loop *loop = default_loop;
915#endif
730 916
731 ev_io_stop (EV_A_ &sigev); 917 if (method)
732 close (sigpipe [0]); 918 postfork = 1;
733 close (sigpipe [1]);
734 pipe (sigpipe);
735
736 ev_ref (EV_A); /* signal watcher */
737 siginit (EV_A);
738} 919}
739 920
740/*****************************************************************************/ 921/*****************************************************************************/
922
923static int
924any_pending (EV_P)
925{
926 int pri;
927
928 for (pri = NUMPRI; pri--; )
929 if (pendingcnt [pri])
930 return 1;
931
932 return 0;
933}
741 934
742static void 935static void
743call_pending (EV_P) 936call_pending (EV_P)
744{ 937{
745 int pri; 938 int pri;
… …
758} 951}
759 952
760static void 953static void
761timers_reify (EV_P) 954timers_reify (EV_P)
762{ 955{
763 while (timercnt && timers [0]->at <= mn_now) 956 while (timercnt && ((WT)timers [0])->at <= mn_now)
764 { 957 {
765 struct ev_timer *w = timers [0]; 958 struct ev_timer *w = timers [0];
959
960 assert (("inactive timer on timer heap detected", ev_is_active (w)));
766 961
767 /* first reschedule or stop timer */ 962 /* first reschedule or stop timer */
768 if (w->repeat) 963 if (w->repeat)
769 { 964 {
770 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 965 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
771 w->at = mn_now + w->repeat; 966 ((WT)w)->at = mn_now + w->repeat;
772 downheap ((WT *)timers, timercnt, 0); 967 downheap ((WT *)timers, timercnt, 0);
773 } 968 }
774 else 969 else
775 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 970 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
776 971
777 event (EV_A_ (W)w, EV_TIMEOUT); 972 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
778 } 973 }
779} 974}
780 975
781static void 976static void
782periodics_reify (EV_P) 977periodics_reify (EV_P)
783{ 978{
784 while (periodiccnt && periodics [0]->at <= rt_now) 979 while (periodiccnt && ((WT)periodics [0])->at <= rt_now)
785 { 980 {
786 struct ev_periodic *w = periodics [0]; 981 struct ev_periodic *w = periodics [0];
787 982
983 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
984
788 /* first reschedule or stop timer */ 985 /* first reschedule or stop timer */
789 if (w->interval) 986 if (w->reschedule_cb)
790 { 987 {
988 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, rt_now + 0.0001);
989
990 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > rt_now));
991 downheap ((WT *)periodics, periodiccnt, 0);
992 }
993 else if (w->interval)
994 {
791 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 995 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
792 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 996 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now));
793 downheap ((WT *)periodics, periodiccnt, 0); 997 downheap ((WT *)periodics, periodiccnt, 0);
794 } 998 }
795 else 999 else
796 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1000 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
797 1001
798 event (EV_A_ (W)w, EV_PERIODIC); 1002 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
799 } 1003 }
800} 1004}
801 1005
802static void 1006static void
803periodics_reschedule (EV_P) 1007periodics_reschedule (EV_P)
… …
807 /* adjust periodics after time jump */ 1011 /* adjust periodics after time jump */
808 for (i = 0; i < periodiccnt; ++i) 1012 for (i = 0; i < periodiccnt; ++i)
809 { 1013 {
810 struct ev_periodic *w = periodics [i]; 1014 struct ev_periodic *w = periodics [i];
811 1015
1016 if (w->reschedule_cb)
1017 ((WT)w)->at = w->reschedule_cb (w, rt_now);
812 if (w->interval) 1018 else if (w->interval)
813 {
814 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1019 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
815
816 if (fabs (diff) >= 1e-4)
817 {
818 ev_periodic_stop (EV_A_ w);
819 ev_periodic_start (EV_A_ w);
820
821 i = 0; /* restart loop, inefficient, but time jumps should be rare */
822 }
823 }
824 } 1020 }
1021
1022 /* now rebuild the heap */
1023 for (i = periodiccnt >> 1; i--; )
1024 downheap ((WT *)periodics, periodiccnt, i);
825} 1025}
826 1026
827inline int 1027inline int
828time_update_monotonic (EV_P) 1028time_update_monotonic (EV_P)
829{ 1029{
… …
880 { 1080 {
881 periodics_reschedule (EV_A); 1081 periodics_reschedule (EV_A);
882 1082
883 /* adjust timers. this is easy, as the offset is the same for all */ 1083 /* adjust timers. this is easy, as the offset is the same for all */
884 for (i = 0; i < timercnt; ++i) 1084 for (i = 0; i < timercnt; ++i)
885 timers [i]->at += rt_now - mn_now; 1085 ((WT)timers [i])->at += rt_now - mn_now;
886 } 1086 }
887 1087
888 mn_now = rt_now; 1088 mn_now = rt_now;
889 } 1089 }
890} 1090}
… …
916 { 1116 {
917 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1117 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
918 call_pending (EV_A); 1118 call_pending (EV_A);
919 } 1119 }
920 1120
1121 /* we might have forked, so reify kernel state if necessary */
1122 if (expect_false (postfork))
1123 loop_fork (EV_A);
1124
921 /* update fd-related kernel structures */ 1125 /* update fd-related kernel structures */
922 fd_reify (EV_A); 1126 fd_reify (EV_A);
923 1127
924 /* calculate blocking time */ 1128 /* calculate blocking time */
925 1129
926 /* we only need this for !monotonic clockor timers, but as we basically 1130 /* we only need this for !monotonic clock or timers, but as we basically
927 always have timers, we just calculate it always */ 1131 always have timers, we just calculate it always */
928#if EV_USE_MONOTONIC 1132#if EV_USE_MONOTONIC
929 if (expect_true (have_monotonic)) 1133 if (expect_true (have_monotonic))
930 time_update_monotonic (EV_A); 1134 time_update_monotonic (EV_A);
931 else 1135 else
… …
941 { 1145 {
942 block = MAX_BLOCKTIME; 1146 block = MAX_BLOCKTIME;
943 1147
944 if (timercnt) 1148 if (timercnt)
945 { 1149 {
946 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1150 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
947 if (block > to) block = to; 1151 if (block > to) block = to;
948 } 1152 }
949 1153
950 if (periodiccnt) 1154 if (periodiccnt)
951 { 1155 {
952 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1156 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge;
953 if (block > to) block = to; 1157 if (block > to) block = to;
954 } 1158 }
955 1159
956 if (block < 0.) block = 0.; 1160 if (block < 0.) block = 0.;
957 } 1161 }
… …
964 /* queue pending timers and reschedule them */ 1168 /* queue pending timers and reschedule them */
965 timers_reify (EV_A); /* relative timers called last */ 1169 timers_reify (EV_A); /* relative timers called last */
966 periodics_reify (EV_A); /* absolute timers called first */ 1170 periodics_reify (EV_A); /* absolute timers called first */
967 1171
968 /* queue idle watchers unless io or timers are pending */ 1172 /* queue idle watchers unless io or timers are pending */
969 if (!pendingcnt) 1173 if (idlecnt && !any_pending (EV_A))
970 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1174 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
971 1175
972 /* queue check watchers, to be executed first */ 1176 /* queue check watchers, to be executed first */
973 if (checkcnt) 1177 if (checkcnt)
974 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1178 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1049 return; 1253 return;
1050 1254
1051 assert (("ev_io_start called with negative fd", fd >= 0)); 1255 assert (("ev_io_start called with negative fd", fd >= 0));
1052 1256
1053 ev_start (EV_A_ (W)w, 1); 1257 ev_start (EV_A_ (W)w, 1);
1054 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1258 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1055 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1259 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1056 1260
1057 fd_change (EV_A_ fd); 1261 fd_change (EV_A_ fd);
1058} 1262}
1059 1263
… …
1074ev_timer_start (EV_P_ struct ev_timer *w) 1278ev_timer_start (EV_P_ struct ev_timer *w)
1075{ 1279{
1076 if (ev_is_active (w)) 1280 if (ev_is_active (w))
1077 return; 1281 return;
1078 1282
1079 w->at += mn_now; 1283 ((WT)w)->at += mn_now;
1080 1284
1081 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1285 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1082 1286
1083 ev_start (EV_A_ (W)w, ++timercnt); 1287 ev_start (EV_A_ (W)w, ++timercnt);
1084 array_needsize (timers, timermax, timercnt, ); 1288 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1085 timers [timercnt - 1] = w; 1289 timers [timercnt - 1] = w;
1086 upheap ((WT *)timers, timercnt - 1); 1290 upheap ((WT *)timers, timercnt - 1);
1291
1292 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1087} 1293}
1088 1294
1089void 1295void
1090ev_timer_stop (EV_P_ struct ev_timer *w) 1296ev_timer_stop (EV_P_ struct ev_timer *w)
1091{ 1297{
1092 ev_clear_pending (EV_A_ (W)w); 1298 ev_clear_pending (EV_A_ (W)w);
1093 if (!ev_is_active (w)) 1299 if (!ev_is_active (w))
1094 return; 1300 return;
1095 1301
1302 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1303
1096 if (w->active < timercnt--) 1304 if (((W)w)->active < timercnt--)
1097 { 1305 {
1098 timers [w->active - 1] = timers [timercnt]; 1306 timers [((W)w)->active - 1] = timers [timercnt];
1099 downheap ((WT *)timers, timercnt, w->active - 1); 1307 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1100 } 1308 }
1101 1309
1102 w->at = w->repeat; 1310 ((WT)w)->at = w->repeat;
1103 1311
1104 ev_stop (EV_A_ (W)w); 1312 ev_stop (EV_A_ (W)w);
1105} 1313}
1106 1314
1107void 1315void
… …
1109{ 1317{
1110 if (ev_is_active (w)) 1318 if (ev_is_active (w))
1111 { 1319 {
1112 if (w->repeat) 1320 if (w->repeat)
1113 { 1321 {
1114 w->at = mn_now + w->repeat; 1322 ((WT)w)->at = mn_now + w->repeat;
1115 downheap ((WT *)timers, timercnt, w->active - 1); 1323 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1116 } 1324 }
1117 else 1325 else
1118 ev_timer_stop (EV_A_ w); 1326 ev_timer_stop (EV_A_ w);
1119 } 1327 }
1120 else if (w->repeat) 1328 else if (w->repeat)
… …
1125ev_periodic_start (EV_P_ struct ev_periodic *w) 1333ev_periodic_start (EV_P_ struct ev_periodic *w)
1126{ 1334{
1127 if (ev_is_active (w)) 1335 if (ev_is_active (w))
1128 return; 1336 return;
1129 1337
1338 if (w->reschedule_cb)
1339 ((WT)w)->at = w->reschedule_cb (w, rt_now);
1340 else if (w->interval)
1341 {
1130 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1342 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1131
1132 /* this formula differs from the one in periodic_reify because we do not always round up */ 1343 /* this formula differs from the one in periodic_reify because we do not always round up */
1133 if (w->interval)
1134 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1344 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval;
1345 }
1135 1346
1136 ev_start (EV_A_ (W)w, ++periodiccnt); 1347 ev_start (EV_A_ (W)w, ++periodiccnt);
1137 array_needsize (periodics, periodicmax, periodiccnt, ); 1348 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1138 periodics [periodiccnt - 1] = w; 1349 periodics [periodiccnt - 1] = w;
1139 upheap ((WT *)periodics, periodiccnt - 1); 1350 upheap ((WT *)periodics, periodiccnt - 1);
1351
1352 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1140} 1353}
1141 1354
1142void 1355void
1143ev_periodic_stop (EV_P_ struct ev_periodic *w) 1356ev_periodic_stop (EV_P_ struct ev_periodic *w)
1144{ 1357{
1145 ev_clear_pending (EV_A_ (W)w); 1358 ev_clear_pending (EV_A_ (W)w);
1146 if (!ev_is_active (w)) 1359 if (!ev_is_active (w))
1147 return; 1360 return;
1148 1361
1362 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1363
1149 if (w->active < periodiccnt--) 1364 if (((W)w)->active < periodiccnt--)
1150 { 1365 {
1151 periodics [w->active - 1] = periodics [periodiccnt]; 1366 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1152 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1367 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1153 } 1368 }
1154 1369
1155 ev_stop (EV_A_ (W)w); 1370 ev_stop (EV_A_ (W)w);
1156} 1371}
1157 1372
1158void 1373void
1374ev_periodic_again (EV_P_ struct ev_periodic *w)
1375{
1376 ev_periodic_stop (EV_A_ w);
1377 ev_periodic_start (EV_A_ w);
1378}
1379
1380void
1159ev_idle_start (EV_P_ struct ev_idle *w) 1381ev_idle_start (EV_P_ struct ev_idle *w)
1160{ 1382{
1161 if (ev_is_active (w)) 1383 if (ev_is_active (w))
1162 return; 1384 return;
1163 1385
1164 ev_start (EV_A_ (W)w, ++idlecnt); 1386 ev_start (EV_A_ (W)w, ++idlecnt);
1165 array_needsize (idles, idlemax, idlecnt, ); 1387 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1166 idles [idlecnt - 1] = w; 1388 idles [idlecnt - 1] = w;
1167} 1389}
1168 1390
1169void 1391void
1170ev_idle_stop (EV_P_ struct ev_idle *w) 1392ev_idle_stop (EV_P_ struct ev_idle *w)
1171{ 1393{
1172 ev_clear_pending (EV_A_ (W)w); 1394 ev_clear_pending (EV_A_ (W)w);
1173 if (ev_is_active (w)) 1395 if (ev_is_active (w))
1174 return; 1396 return;
1175 1397
1176 idles [w->active - 1] = idles [--idlecnt]; 1398 idles [((W)w)->active - 1] = idles [--idlecnt];
1177 ev_stop (EV_A_ (W)w); 1399 ev_stop (EV_A_ (W)w);
1178} 1400}
1179 1401
1180void 1402void
1181ev_prepare_start (EV_P_ struct ev_prepare *w) 1403ev_prepare_start (EV_P_ struct ev_prepare *w)
1182{ 1404{
1183 if (ev_is_active (w)) 1405 if (ev_is_active (w))
1184 return; 1406 return;
1185 1407
1186 ev_start (EV_A_ (W)w, ++preparecnt); 1408 ev_start (EV_A_ (W)w, ++preparecnt);
1187 array_needsize (prepares, preparemax, preparecnt, ); 1409 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1188 prepares [preparecnt - 1] = w; 1410 prepares [preparecnt - 1] = w;
1189} 1411}
1190 1412
1191void 1413void
1192ev_prepare_stop (EV_P_ struct ev_prepare *w) 1414ev_prepare_stop (EV_P_ struct ev_prepare *w)
1193{ 1415{
1194 ev_clear_pending (EV_A_ (W)w); 1416 ev_clear_pending (EV_A_ (W)w);
1195 if (ev_is_active (w)) 1417 if (ev_is_active (w))
1196 return; 1418 return;
1197 1419
1198 prepares [w->active - 1] = prepares [--preparecnt]; 1420 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1199 ev_stop (EV_A_ (W)w); 1421 ev_stop (EV_A_ (W)w);
1200} 1422}
1201 1423
1202void 1424void
1203ev_check_start (EV_P_ struct ev_check *w) 1425ev_check_start (EV_P_ struct ev_check *w)
1204{ 1426{
1205 if (ev_is_active (w)) 1427 if (ev_is_active (w))
1206 return; 1428 return;
1207 1429
1208 ev_start (EV_A_ (W)w, ++checkcnt); 1430 ev_start (EV_A_ (W)w, ++checkcnt);
1209 array_needsize (checks, checkmax, checkcnt, ); 1431 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1210 checks [checkcnt - 1] = w; 1432 checks [checkcnt - 1] = w;
1211} 1433}
1212 1434
1213void 1435void
1214ev_check_stop (EV_P_ struct ev_check *w) 1436ev_check_stop (EV_P_ struct ev_check *w)
1215{ 1437{
1216 ev_clear_pending (EV_A_ (W)w); 1438 ev_clear_pending (EV_A_ (W)w);
1217 if (ev_is_active (w)) 1439 if (ev_is_active (w))
1218 return; 1440 return;
1219 1441
1220 checks [w->active - 1] = checks [--checkcnt]; 1442 checks [((W)w)->active - 1] = checks [--checkcnt];
1221 ev_stop (EV_A_ (W)w); 1443 ev_stop (EV_A_ (W)w);
1222} 1444}
1223 1445
1224#ifndef SA_RESTART 1446#ifndef SA_RESTART
1225# define SA_RESTART 0 1447# define SA_RESTART 0
… …
1235 return; 1457 return;
1236 1458
1237 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1459 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1238 1460
1239 ev_start (EV_A_ (W)w, 1); 1461 ev_start (EV_A_ (W)w, 1);
1240 array_needsize (signals, signalmax, w->signum, signals_init); 1462 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1241 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1463 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1242 1464
1243 if (!w->next) 1465 if (!((WL)w)->next)
1244 { 1466 {
1467#if WIN32
1468 signal (w->signum, sighandler);
1469#else
1245 struct sigaction sa; 1470 struct sigaction sa;
1246 sa.sa_handler = sighandler; 1471 sa.sa_handler = sighandler;
1247 sigfillset (&sa.sa_mask); 1472 sigfillset (&sa.sa_mask);
1248 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1473 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1249 sigaction (w->signum, &sa, 0); 1474 sigaction (w->signum, &sa, 0);
1475#endif
1250 } 1476 }
1251} 1477}
1252 1478
1253void 1479void
1254ev_signal_stop (EV_P_ struct ev_signal *w) 1480ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1304 void (*cb)(int revents, void *arg) = once->cb; 1530 void (*cb)(int revents, void *arg) = once->cb;
1305 void *arg = once->arg; 1531 void *arg = once->arg;
1306 1532
1307 ev_io_stop (EV_A_ &once->io); 1533 ev_io_stop (EV_A_ &once->io);
1308 ev_timer_stop (EV_A_ &once->to); 1534 ev_timer_stop (EV_A_ &once->to);
1309 free (once); 1535 ev_free (once);
1310 1536
1311 cb (revents, arg); 1537 cb (revents, arg);
1312} 1538}
1313 1539
1314static void 1540static void
… …
1324} 1550}
1325 1551
1326void 1552void
1327ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1553ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1328{ 1554{
1329 struct ev_once *once = malloc (sizeof (struct ev_once)); 1555 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1330 1556
1331 if (!once) 1557 if (!once)
1332 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1558 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1333 else 1559 else
1334 { 1560 {

Diff Legend

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