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

Comparing libev/ev.c (file contents):
Revision 1.58 by root, Sun Nov 4 16:52:52 2007 UTC vs.
Revision 1.78 by root, Thu Nov 8 21:08:56 2007 UTC

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

Diff Legend

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