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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 2007 UTC vs.
Revision 1.91 by root, Sun Nov 11 00:06:48 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
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
35# define EV_USE_MONOTONIC 1 40# define EV_USE_MONOTONIC 1
… …
46 51
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 52# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 53# define EV_USE_EPOLL 1
49# endif 54# endif
50 55
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 56# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 57# define EV_USE_KQUEUE 1
53# endif 58# endif
54 59
55#endif 60#endif
56 61
57#include <math.h> 62#include <math.h>
58#include <stdlib.h> 63#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 64#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 65#include <stddef.h>
63 66
64#include <stdio.h> 67#include <stdio.h>
65 68
66#include <assert.h> 69#include <assert.h>
67#include <errno.h> 70#include <errno.h>
68#include <sys/types.h> 71#include <sys/types.h>
72#include <time.h>
73
74#include <signal.h>
75
69#ifndef WIN32 76#ifndef WIN32
77# include <unistd.h>
78# include <sys/time.h>
70# include <sys/wait.h> 79# include <sys/wait.h>
71#endif 80#endif
72#include <sys/time.h>
73#include <time.h>
74
75/**/ 81/**/
76 82
77#ifndef EV_USE_MONOTONIC 83#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 84# define EV_USE_MONOTONIC 1
79#endif 85#endif
… …
94# define EV_USE_KQUEUE 0 100# define EV_USE_KQUEUE 0
95#endif 101#endif
96 102
97#ifndef EV_USE_WIN32 103#ifndef EV_USE_WIN32
98# ifdef WIN32 104# ifdef WIN32
105# define EV_USE_WIN32 0 /* it does not exist, use select */
106# undef EV_USE_SELECT
99# define EV_USE_WIN32 1 107# define EV_USE_SELECT 1
100# else 108# else
101# define EV_USE_WIN32 0 109# define EV_USE_WIN32 0
102# endif 110# endif
103#endif 111#endif
104 112
… …
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 131#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 132#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 133#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 134/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
127 135
136#ifdef EV_H
137# include EV_H
138#else
128#include "ev.h" 139# include "ev.h"
140#endif
129 141
130#if __GNUC__ >= 3 142#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 143# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 144# define inline inline
133#else 145#else
… …
145typedef struct ev_watcher_list *WL; 157typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 158typedef struct ev_watcher_time *WT;
147 159
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 160static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 161
150#if WIN32 162#include "ev_win32.c"
151/* note: the comment below could not be substantiated, but what would I care */
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif
155 163
156/*****************************************************************************/ 164/*****************************************************************************/
157 165
166static void (*syserr_cb)(const char *msg);
167
168void ev_set_syserr_cb (void (*cb)(const char *msg))
169{
170 syserr_cb = cb;
171}
172
173static void
174syserr (const char *msg)
175{
176 if (!msg)
177 msg = "(libev) system error";
178
179 if (syserr_cb)
180 syserr_cb (msg);
181 else
182 {
183 perror (msg);
184 abort ();
185 }
186}
187
188static void *(*alloc)(void *ptr, long size);
189
190void ev_set_allocator (void *(*cb)(void *ptr, long size))
191{
192 alloc = cb;
193}
194
195static void *
196ev_realloc (void *ptr, long size)
197{
198 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
199
200 if (!ptr && size)
201 {
202 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
203 abort ();
204 }
205
206 return ptr;
207}
208
209#define ev_malloc(size) ev_realloc (0, (size))
210#define ev_free(ptr) ev_realloc ((ptr), 0)
211
212/*****************************************************************************/
213
158typedef struct 214typedef struct
159{ 215{
160 struct ev_watcher_list *head; 216 WL head;
161 unsigned char events; 217 unsigned char events;
162 unsigned char reify; 218 unsigned char reify;
163} ANFD; 219} ANFD;
164 220
165typedef struct 221typedef struct
… …
168 int events; 224 int events;
169} ANPENDING; 225} ANPENDING;
170 226
171#if EV_MULTIPLICITY 227#if EV_MULTIPLICITY
172 228
173struct ev_loop 229 struct ev_loop
174{ 230 {
231 ev_tstamp ev_rt_now;
175# define VAR(name,decl) decl; 232 #define VAR(name,decl) decl;
176# include "ev_vars.h" 233 #include "ev_vars.h"
177};
178# undef VAR 234 #undef VAR
235 };
179# include "ev_wrap.h" 236 #include "ev_wrap.h"
237
238 struct ev_loop default_loop_struct;
239 static struct ev_loop *default_loop;
180 240
181#else 241#else
182 242
243 ev_tstamp ev_rt_now;
183# define VAR(name,decl) static decl; 244 #define VAR(name,decl) static decl;
184# include "ev_vars.h" 245 #include "ev_vars.h"
185# undef VAR 246 #undef VAR
247
248 static int default_loop;
186 249
187#endif 250#endif
188 251
189/*****************************************************************************/ 252/*****************************************************************************/
190 253
… …
215#endif 278#endif
216 279
217 return ev_time (); 280 return ev_time ();
218} 281}
219 282
283#if EV_MULTIPLICITY
220ev_tstamp 284ev_tstamp
221ev_now (EV_P) 285ev_now (EV_P)
222{ 286{
223 return rt_now; 287 return ev_rt_now;
224} 288}
289#endif
225 290
226#define array_roundsize(base,n) ((n) | 4 & ~3) 291#define array_roundsize(type,n) ((n) | 4 & ~3)
227 292
228#define array_needsize(base,cur,cnt,init) \ 293#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 294 if (expect_false ((cnt) > cur)) \
230 { \ 295 { \
231 int newcnt = cur; \ 296 int newcnt = cur; \
232 do \ 297 do \
233 { \ 298 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 299 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 300 } \
236 while ((cnt) > newcnt); \ 301 while ((cnt) > newcnt); \
237 \ 302 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 303 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 304 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 305 cur = newcnt; \
241 } 306 }
242 307
243#define array_slim(stem) \ 308#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 309 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 310 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 311 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 312 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 313 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 314 }
250 315
316/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
317/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
318#define array_free_microshit(stem) \
319 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
320
251#define array_free(stem, idx) \ 321#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 322 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 323
254/*****************************************************************************/ 324/*****************************************************************************/
255 325
256static void 326static void
257anfds_init (ANFD *base, int count) 327anfds_init (ANFD *base, int count)
… …
264 334
265 ++base; 335 ++base;
266 } 336 }
267} 337}
268 338
269static void 339void
270event (EV_P_ W w, int events) 340ev_feed_event (EV_P_ void *w, int revents)
271{ 341{
342 W w_ = (W)w;
343
272 if (w->pending) 344 if (w_->pending)
273 { 345 {
274 pendings [ABSPRI (w)][w->pending - 1].events |= events; 346 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
275 return; 347 return;
276 } 348 }
277 349
278 w->pending = ++pendingcnt [ABSPRI (w)]; 350 w_->pending = ++pendingcnt [ABSPRI (w_)];
279 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 351 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
280 pendings [ABSPRI (w)][w->pending - 1].w = w; 352 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
281 pendings [ABSPRI (w)][w->pending - 1].events = events; 353 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
282} 354}
283 355
284static void 356static void
285queue_events (EV_P_ W *events, int eventcnt, int type) 357queue_events (EV_P_ W *events, int eventcnt, int type)
286{ 358{
287 int i; 359 int i;
288 360
289 for (i = 0; i < eventcnt; ++i) 361 for (i = 0; i < eventcnt; ++i)
290 event (EV_A_ events [i], type); 362 ev_feed_event (EV_A_ events [i], type);
291} 363}
292 364
293static void 365inline void
294fd_event (EV_P_ int fd, int events) 366fd_event (EV_P_ int fd, int revents)
295{ 367{
296 ANFD *anfd = anfds + fd; 368 ANFD *anfd = anfds + fd;
297 struct ev_io *w; 369 struct ev_io *w;
298 370
299 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 371 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
300 { 372 {
301 int ev = w->events & events; 373 int ev = w->events & revents;
302 374
303 if (ev) 375 if (ev)
304 event (EV_A_ (W)w, ev); 376 ev_feed_event (EV_A_ (W)w, ev);
305 } 377 }
378}
379
380void
381ev_feed_fd_event (EV_P_ int fd, int revents)
382{
383 fd_event (EV_A_ fd, revents);
306} 384}
307 385
308/*****************************************************************************/ 386/*****************************************************************************/
309 387
310static void 388static void
… …
333} 411}
334 412
335static void 413static void
336fd_change (EV_P_ int fd) 414fd_change (EV_P_ int fd)
337{ 415{
338 if (anfds [fd].reify || fdchangecnt < 0) 416 if (anfds [fd].reify)
339 return; 417 return;
340 418
341 anfds [fd].reify = 1; 419 anfds [fd].reify = 1;
342 420
343 ++fdchangecnt; 421 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 422 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
345 fdchanges [fdchangecnt - 1] = fd; 423 fdchanges [fdchangecnt - 1] = fd;
346} 424}
347 425
348static void 426static void
349fd_kill (EV_P_ int fd) 427fd_kill (EV_P_ int fd)
… …
351 struct ev_io *w; 429 struct ev_io *w;
352 430
353 while ((w = (struct ev_io *)anfds [fd].head)) 431 while ((w = (struct ev_io *)anfds [fd].head))
354 { 432 {
355 ev_io_stop (EV_A_ w); 433 ev_io_stop (EV_A_ w);
356 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 434 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
357 } 435 }
436}
437
438static int
439fd_valid (int fd)
440{
441#ifdef WIN32
442 return !!win32_get_osfhandle (fd);
443#else
444 return fcntl (fd, F_GETFD) != -1;
445#endif
358} 446}
359 447
360/* called on EBADF to verify fds */ 448/* called on EBADF to verify fds */
361static void 449static void
362fd_ebadf (EV_P) 450fd_ebadf (EV_P)
363{ 451{
364 int fd; 452 int fd;
365 453
366 for (fd = 0; fd < anfdmax; ++fd) 454 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 455 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 456 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 457 fd_kill (EV_A_ fd);
370} 458}
371 459
372/* called on ENOMEM in select/poll to kill some fds and retry */ 460/* called on ENOMEM in select/poll to kill some fds and retry */
373static void 461static void
… …
376 int fd; 464 int fd;
377 465
378 for (fd = anfdmax; fd--; ) 466 for (fd = anfdmax; fd--; )
379 if (anfds [fd].events) 467 if (anfds [fd].events)
380 { 468 {
381 close (fd);
382 fd_kill (EV_A_ fd); 469 fd_kill (EV_A_ fd);
383 return; 470 return;
384 } 471 }
385} 472}
386 473
387/* susually called after fork if method needs to re-arm all fds from scratch */ 474/* usually called after fork if method needs to re-arm all fds from scratch */
388static void 475static void
389fd_rearm_all (EV_P) 476fd_rearm_all (EV_P)
390{ 477{
391 int fd; 478 int fd;
392 479
… …
440 527
441 heap [k] = w; 528 heap [k] = w;
442 ((W)heap [k])->active = k + 1; 529 ((W)heap [k])->active = k + 1;
443} 530}
444 531
532inline void
533adjustheap (WT *heap, int N, int k, ev_tstamp at)
534{
535 ev_tstamp old_at = heap [k]->at;
536 heap [k]->at = at;
537
538 if (old_at < at)
539 downheap (heap, N, k);
540 else
541 upheap (heap, k);
542}
543
445/*****************************************************************************/ 544/*****************************************************************************/
446 545
447typedef struct 546typedef struct
448{ 547{
449 struct ev_watcher_list *head; 548 WL head;
450 sig_atomic_t volatile gotsig; 549 sig_atomic_t volatile gotsig;
451} ANSIG; 550} ANSIG;
452 551
453static ANSIG *signals; 552static ANSIG *signals;
454static int signalmax; 553static int signalmax;
… …
480 579
481 if (!gotsig) 580 if (!gotsig)
482 { 581 {
483 int old_errno = errno; 582 int old_errno = errno;
484 gotsig = 1; 583 gotsig = 1;
584#ifdef WIN32
585 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
586#else
485 write (sigpipe [1], &signum, 1); 587 write (sigpipe [1], &signum, 1);
588#endif
486 errno = old_errno; 589 errno = old_errno;
487 } 590 }
488} 591}
489 592
593void
594ev_feed_signal_event (EV_P_ int signum)
595{
596 WL w;
597
598#if EV_MULTIPLICITY
599 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
600#endif
601
602 --signum;
603
604 if (signum < 0 || signum >= signalmax)
605 return;
606
607 signals [signum].gotsig = 0;
608
609 for (w = signals [signum].head; w; w = w->next)
610 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
611}
612
490static void 613static void
491sigcb (EV_P_ struct ev_io *iow, int revents) 614sigcb (EV_P_ struct ev_io *iow, int revents)
492{ 615{
493 struct ev_watcher_list *w;
494 int signum; 616 int signum;
495 617
618#ifdef WIN32
619 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
620#else
496 read (sigpipe [0], &revents, 1); 621 read (sigpipe [0], &revents, 1);
622#endif
497 gotsig = 0; 623 gotsig = 0;
498 624
499 for (signum = signalmax; signum--; ) 625 for (signum = signalmax; signum--; )
500 if (signals [signum].gotsig) 626 if (signals [signum].gotsig)
501 { 627 ev_feed_signal_event (EV_A_ signum + 1);
502 signals [signum].gotsig = 0;
503
504 for (w = signals [signum].head; w; w = w->next)
505 event (EV_A_ (W)w, EV_SIGNAL);
506 }
507} 628}
508 629
509static void 630static void
510siginit (EV_P) 631siginit (EV_P)
511{ 632{
… …
523 ev_unref (EV_A); /* child watcher should not keep loop alive */ 644 ev_unref (EV_A); /* child watcher should not keep loop alive */
524} 645}
525 646
526/*****************************************************************************/ 647/*****************************************************************************/
527 648
649static struct ev_child *childs [PID_HASHSIZE];
650
528#ifndef WIN32 651#ifndef WIN32
529 652
530static struct ev_child *childs [PID_HASHSIZE];
531static struct ev_signal childev; 653static struct ev_signal childev;
532 654
533#ifndef WCONTINUED 655#ifndef WCONTINUED
534# define WCONTINUED 0 656# define WCONTINUED 0
535#endif 657#endif
… …
543 if (w->pid == pid || !w->pid) 665 if (w->pid == pid || !w->pid)
544 { 666 {
545 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 667 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
546 w->rpid = pid; 668 w->rpid = pid;
547 w->rstatus = status; 669 w->rstatus = status;
548 event (EV_A_ (W)w, EV_CHILD); 670 ev_feed_event (EV_A_ (W)w, EV_CHILD);
549 } 671 }
550} 672}
551 673
552static void 674static void
553childcb (EV_P_ struct ev_signal *sw, int revents) 675childcb (EV_P_ struct ev_signal *sw, int revents)
… …
555 int pid, status; 677 int pid, status;
556 678
557 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 679 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
558 { 680 {
559 /* make sure we are called again until all childs have been reaped */ 681 /* make sure we are called again until all childs have been reaped */
560 event (EV_A_ (W)sw, EV_SIGNAL); 682 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
561 683
562 child_reap (EV_A_ sw, pid, pid, status); 684 child_reap (EV_A_ sw, pid, pid, status);
563 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 685 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
564 } 686 }
565} 687}
… …
622 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 744 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
623 have_monotonic = 1; 745 have_monotonic = 1;
624 } 746 }
625#endif 747#endif
626 748
627 rt_now = ev_time (); 749 ev_rt_now = ev_time ();
628 mn_now = get_clock (); 750 mn_now = get_clock ();
629 now_floor = mn_now; 751 now_floor = mn_now;
630 rtmn_diff = rt_now - mn_now; 752 rtmn_diff = ev_rt_now - mn_now;
631 753
632 if (methods == EVMETHOD_AUTO) 754 if (methods == EVMETHOD_AUTO)
633 if (!enable_secure () && getenv ("LIBEV_METHODS")) 755 if (!enable_secure () && getenv ("LIBEV_METHODS"))
634 methods = atoi (getenv ("LIBEV_METHODS")); 756 methods = atoi (getenv ("LIBEV_METHODS"));
635 else 757 else
… …
649 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 771 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
650#endif 772#endif
651#if EV_USE_SELECT 773#if EV_USE_SELECT
652 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 774 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
653#endif 775#endif
776
777 ev_init (&sigev, sigcb);
778 ev_set_priority (&sigev, EV_MAXPRI);
654 } 779 }
655} 780}
656 781
657void 782void
658loop_destroy (EV_P) 783loop_destroy (EV_P)
… …
676#endif 801#endif
677 802
678 for (i = NUMPRI; i--; ) 803 for (i = NUMPRI; i--; )
679 array_free (pending, [i]); 804 array_free (pending, [i]);
680 805
806 /* have to use the microsoft-never-gets-it-right macro */
681 array_free (fdchange, ); 807 array_free_microshit (fdchange);
682 array_free (timer, ); 808 array_free_microshit (timer);
683 array_free (periodic, ); 809 array_free_microshit (periodic);
684 array_free (idle, ); 810 array_free_microshit (idle);
685 array_free (prepare, ); 811 array_free_microshit (prepare);
686 array_free (check, ); 812 array_free_microshit (check);
687 813
688 method = 0; 814 method = 0;
689 /*TODO*/
690} 815}
691 816
692void 817static void
693loop_fork (EV_P) 818loop_fork (EV_P)
694{ 819{
695 /*TODO*/
696#if EV_USE_EPOLL 820#if EV_USE_EPOLL
697 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 821 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
698#endif 822#endif
699#if EV_USE_KQUEUE 823#if EV_USE_KQUEUE
700 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 824 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
701#endif 825#endif
826
827 if (ev_is_active (&sigev))
828 {
829 /* default loop */
830
831 ev_ref (EV_A);
832 ev_io_stop (EV_A_ &sigev);
833 close (sigpipe [0]);
834 close (sigpipe [1]);
835
836 while (pipe (sigpipe))
837 syserr ("(libev) error creating pipe");
838
839 siginit (EV_A);
840 }
841
842 postfork = 0;
702} 843}
703 844
704#if EV_MULTIPLICITY 845#if EV_MULTIPLICITY
705struct ev_loop * 846struct ev_loop *
706ev_loop_new (int methods) 847ev_loop_new (int methods)
707{ 848{
708 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 849 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
850
851 memset (loop, 0, sizeof (struct ev_loop));
709 852
710 loop_init (EV_A_ methods); 853 loop_init (EV_A_ methods);
711 854
712 if (ev_method (EV_A)) 855 if (ev_method (EV_A))
713 return loop; 856 return loop;
… …
717 860
718void 861void
719ev_loop_destroy (EV_P) 862ev_loop_destroy (EV_P)
720{ 863{
721 loop_destroy (EV_A); 864 loop_destroy (EV_A);
722 free (loop); 865 ev_free (loop);
723} 866}
724 867
725void 868void
726ev_loop_fork (EV_P) 869ev_loop_fork (EV_P)
727{ 870{
728 loop_fork (EV_A); 871 postfork = 1;
729} 872}
730 873
731#endif 874#endif
732 875
733#if EV_MULTIPLICITY 876#if EV_MULTIPLICITY
734struct ev_loop default_loop_struct;
735static struct ev_loop *default_loop;
736
737struct ev_loop * 877struct ev_loop *
738#else 878#else
739static int default_loop;
740
741int 879int
742#endif 880#endif
743ev_default_loop (int methods) 881ev_default_loop (int methods)
744{ 882{
745 if (sigpipe [0] == sigpipe [1]) 883 if (sigpipe [0] == sigpipe [1])
… …
756 894
757 loop_init (EV_A_ methods); 895 loop_init (EV_A_ methods);
758 896
759 if (ev_method (EV_A)) 897 if (ev_method (EV_A))
760 { 898 {
761 ev_watcher_init (&sigev, sigcb);
762 ev_set_priority (&sigev, EV_MAXPRI);
763 siginit (EV_A); 899 siginit (EV_A);
764 900
765#ifndef WIN32 901#ifndef WIN32
766 ev_signal_init (&childev, childcb, SIGCHLD); 902 ev_signal_init (&childev, childcb, SIGCHLD);
767 ev_set_priority (&childev, EV_MAXPRI); 903 ev_set_priority (&childev, EV_MAXPRI);
… …
781{ 917{
782#if EV_MULTIPLICITY 918#if EV_MULTIPLICITY
783 struct ev_loop *loop = default_loop; 919 struct ev_loop *loop = default_loop;
784#endif 920#endif
785 921
922#ifndef WIN32
786 ev_ref (EV_A); /* child watcher */ 923 ev_ref (EV_A); /* child watcher */
787 ev_signal_stop (EV_A_ &childev); 924 ev_signal_stop (EV_A_ &childev);
925#endif
788 926
789 ev_ref (EV_A); /* signal watcher */ 927 ev_ref (EV_A); /* signal watcher */
790 ev_io_stop (EV_A_ &sigev); 928 ev_io_stop (EV_A_ &sigev);
791 929
792 close (sigpipe [0]); sigpipe [0] = 0; 930 close (sigpipe [0]); sigpipe [0] = 0;
… …
800{ 938{
801#if EV_MULTIPLICITY 939#if EV_MULTIPLICITY
802 struct ev_loop *loop = default_loop; 940 struct ev_loop *loop = default_loop;
803#endif 941#endif
804 942
805 loop_fork (EV_A); 943 if (method)
806 944 postfork = 1;
807 ev_io_stop (EV_A_ &sigev);
808 close (sigpipe [0]);
809 close (sigpipe [1]);
810 pipe (sigpipe);
811
812 ev_ref (EV_A); /* signal watcher */
813 siginit (EV_A);
814} 945}
815 946
816/*****************************************************************************/ 947/*****************************************************************************/
948
949static int
950any_pending (EV_P)
951{
952 int pri;
953
954 for (pri = NUMPRI; pri--; )
955 if (pendingcnt [pri])
956 return 1;
957
958 return 0;
959}
817 960
818static void 961static void
819call_pending (EV_P) 962call_pending (EV_P)
820{ 963{
821 int pri; 964 int pri;
… …
826 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 969 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
827 970
828 if (p->w) 971 if (p->w)
829 { 972 {
830 p->w->pending = 0; 973 p->w->pending = 0;
831 p->w->cb (EV_A_ p->w, p->events); 974 EV_CB_INVOKE (p->w, p->events);
832 } 975 }
833 } 976 }
834} 977}
835 978
836static void 979static void
… …
844 987
845 /* first reschedule or stop timer */ 988 /* first reschedule or stop timer */
846 if (w->repeat) 989 if (w->repeat)
847 { 990 {
848 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 991 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
992
849 ((WT)w)->at = mn_now + w->repeat; 993 ((WT)w)->at += w->repeat;
994 if (((WT)w)->at < mn_now)
995 ((WT)w)->at = mn_now;
996
850 downheap ((WT *)timers, timercnt, 0); 997 downheap ((WT *)timers, timercnt, 0);
851 } 998 }
852 else 999 else
853 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1000 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
854 1001
855 event (EV_A_ (W)w, EV_TIMEOUT); 1002 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
856 } 1003 }
857} 1004}
858 1005
859static void 1006static void
860periodics_reify (EV_P) 1007periodics_reify (EV_P)
861{ 1008{
862 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1009 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
863 { 1010 {
864 struct ev_periodic *w = periodics [0]; 1011 struct ev_periodic *w = periodics [0];
865 1012
866 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1013 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
867 1014
868 /* first reschedule or stop timer */ 1015 /* first reschedule or stop timer */
869 if (w->interval) 1016 if (w->reschedule_cb)
870 { 1017 {
1018 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1019
1020 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1021 downheap ((WT *)periodics, periodiccnt, 0);
1022 }
1023 else if (w->interval)
1024 {
871 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1025 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
872 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1026 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
873 downheap ((WT *)periodics, periodiccnt, 0); 1027 downheap ((WT *)periodics, periodiccnt, 0);
874 } 1028 }
875 else 1029 else
876 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1030 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
877 1031
878 event (EV_A_ (W)w, EV_PERIODIC); 1032 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
879 } 1033 }
880} 1034}
881 1035
882static void 1036static void
883periodics_reschedule (EV_P) 1037periodics_reschedule (EV_P)
… …
887 /* adjust periodics after time jump */ 1041 /* adjust periodics after time jump */
888 for (i = 0; i < periodiccnt; ++i) 1042 for (i = 0; i < periodiccnt; ++i)
889 { 1043 {
890 struct ev_periodic *w = periodics [i]; 1044 struct ev_periodic *w = periodics [i];
891 1045
1046 if (w->reschedule_cb)
1047 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
892 if (w->interval) 1048 else if (w->interval)
893 {
894 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1049 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
895
896 if (fabs (diff) >= 1e-4)
897 {
898 ev_periodic_stop (EV_A_ w);
899 ev_periodic_start (EV_A_ w);
900
901 i = 0; /* restart loop, inefficient, but time jumps should be rare */
902 }
903 }
904 } 1050 }
1051
1052 /* now rebuild the heap */
1053 for (i = periodiccnt >> 1; i--; )
1054 downheap ((WT *)periodics, periodiccnt, i);
905} 1055}
906 1056
907inline int 1057inline int
908time_update_monotonic (EV_P) 1058time_update_monotonic (EV_P)
909{ 1059{
910 mn_now = get_clock (); 1060 mn_now = get_clock ();
911 1061
912 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1062 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
913 { 1063 {
914 rt_now = rtmn_diff + mn_now; 1064 ev_rt_now = rtmn_diff + mn_now;
915 return 0; 1065 return 0;
916 } 1066 }
917 else 1067 else
918 { 1068 {
919 now_floor = mn_now; 1069 now_floor = mn_now;
920 rt_now = ev_time (); 1070 ev_rt_now = ev_time ();
921 return 1; 1071 return 1;
922 } 1072 }
923} 1073}
924 1074
925static void 1075static void
… …
934 { 1084 {
935 ev_tstamp odiff = rtmn_diff; 1085 ev_tstamp odiff = rtmn_diff;
936 1086
937 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1087 for (i = 4; --i; ) /* loop a few times, before making important decisions */
938 { 1088 {
939 rtmn_diff = rt_now - mn_now; 1089 rtmn_diff = ev_rt_now - mn_now;
940 1090
941 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1091 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
942 return; /* all is well */ 1092 return; /* all is well */
943 1093
944 rt_now = ev_time (); 1094 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1095 mn_now = get_clock ();
946 now_floor = mn_now; 1096 now_floor = mn_now;
947 } 1097 }
948 1098
949 periodics_reschedule (EV_A); 1099 periodics_reschedule (EV_A);
… …
952 } 1102 }
953 } 1103 }
954 else 1104 else
955#endif 1105#endif
956 { 1106 {
957 rt_now = ev_time (); 1107 ev_rt_now = ev_time ();
958 1108
959 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1109 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
960 { 1110 {
961 periodics_reschedule (EV_A); 1111 periodics_reschedule (EV_A);
962 1112
963 /* adjust timers. this is easy, as the offset is the same for all */ 1113 /* adjust timers. this is easy, as the offset is the same for all */
964 for (i = 0; i < timercnt; ++i) 1114 for (i = 0; i < timercnt; ++i)
965 ((WT)timers [i])->at += rt_now - mn_now; 1115 ((WT)timers [i])->at += ev_rt_now - mn_now;
966 } 1116 }
967 1117
968 mn_now = rt_now; 1118 mn_now = ev_rt_now;
969 } 1119 }
970} 1120}
971 1121
972void 1122void
973ev_ref (EV_P) 1123ev_ref (EV_P)
… …
996 { 1146 {
997 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1147 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
998 call_pending (EV_A); 1148 call_pending (EV_A);
999 } 1149 }
1000 1150
1151 /* we might have forked, so reify kernel state if necessary */
1152 if (expect_false (postfork))
1153 loop_fork (EV_A);
1154
1001 /* update fd-related kernel structures */ 1155 /* update fd-related kernel structures */
1002 fd_reify (EV_A); 1156 fd_reify (EV_A);
1003 1157
1004 /* calculate blocking time */ 1158 /* calculate blocking time */
1005 1159
1006 /* we only need this for !monotonic clockor timers, but as we basically 1160 /* we only need this for !monotonic clock or timers, but as we basically
1007 always have timers, we just calculate it always */ 1161 always have timers, we just calculate it always */
1008#if EV_USE_MONOTONIC 1162#if EV_USE_MONOTONIC
1009 if (expect_true (have_monotonic)) 1163 if (expect_true (have_monotonic))
1010 time_update_monotonic (EV_A); 1164 time_update_monotonic (EV_A);
1011 else 1165 else
1012#endif 1166#endif
1013 { 1167 {
1014 rt_now = ev_time (); 1168 ev_rt_now = ev_time ();
1015 mn_now = rt_now; 1169 mn_now = ev_rt_now;
1016 } 1170 }
1017 1171
1018 if (flags & EVLOOP_NONBLOCK || idlecnt) 1172 if (flags & EVLOOP_NONBLOCK || idlecnt)
1019 block = 0.; 1173 block = 0.;
1020 else 1174 else
… …
1027 if (block > to) block = to; 1181 if (block > to) block = to;
1028 } 1182 }
1029 1183
1030 if (periodiccnt) 1184 if (periodiccnt)
1031 { 1185 {
1032 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1186 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1033 if (block > to) block = to; 1187 if (block > to) block = to;
1034 } 1188 }
1035 1189
1036 if (block < 0.) block = 0.; 1190 if (block < 0.) block = 0.;
1037 } 1191 }
1038 1192
1039 method_poll (EV_A_ block); 1193 method_poll (EV_A_ block);
1040 1194
1041 /* update rt_now, do magic */ 1195 /* update ev_rt_now, do magic */
1042 time_update (EV_A); 1196 time_update (EV_A);
1043 1197
1044 /* queue pending timers and reschedule them */ 1198 /* queue pending timers and reschedule them */
1045 timers_reify (EV_A); /* relative timers called last */ 1199 timers_reify (EV_A); /* relative timers called last */
1046 periodics_reify (EV_A); /* absolute timers called first */ 1200 periodics_reify (EV_A); /* absolute timers called first */
1047 1201
1048 /* queue idle watchers unless io or timers are pending */ 1202 /* queue idle watchers unless io or timers are pending */
1049 if (!pendingcnt) 1203 if (idlecnt && !any_pending (EV_A))
1050 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1204 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1051 1205
1052 /* queue check watchers, to be executed first */ 1206 /* queue check watchers, to be executed first */
1053 if (checkcnt) 1207 if (checkcnt)
1054 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1208 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1129 return; 1283 return;
1130 1284
1131 assert (("ev_io_start called with negative fd", fd >= 0)); 1285 assert (("ev_io_start called with negative fd", fd >= 0));
1132 1286
1133 ev_start (EV_A_ (W)w, 1); 1287 ev_start (EV_A_ (W)w, 1);
1134 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1288 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1135 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1289 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1136 1290
1137 fd_change (EV_A_ fd); 1291 fd_change (EV_A_ fd);
1138} 1292}
1139 1293
… …
1142{ 1296{
1143 ev_clear_pending (EV_A_ (W)w); 1297 ev_clear_pending (EV_A_ (W)w);
1144 if (!ev_is_active (w)) 1298 if (!ev_is_active (w))
1145 return; 1299 return;
1146 1300
1301 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1302
1147 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1303 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1148 ev_stop (EV_A_ (W)w); 1304 ev_stop (EV_A_ (W)w);
1149 1305
1150 fd_change (EV_A_ w->fd); 1306 fd_change (EV_A_ w->fd);
1151} 1307}
… …
1159 ((WT)w)->at += mn_now; 1315 ((WT)w)->at += mn_now;
1160 1316
1161 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1317 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1162 1318
1163 ev_start (EV_A_ (W)w, ++timercnt); 1319 ev_start (EV_A_ (W)w, ++timercnt);
1164 array_needsize (timers, timermax, timercnt, ); 1320 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1165 timers [timercnt - 1] = w; 1321 timers [timercnt - 1] = w;
1166 upheap ((WT *)timers, timercnt - 1); 1322 upheap ((WT *)timers, timercnt - 1);
1167 1323
1168 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1324 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1169} 1325}
… …
1181 { 1337 {
1182 timers [((W)w)->active - 1] = timers [timercnt]; 1338 timers [((W)w)->active - 1] = timers [timercnt];
1183 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1339 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1184 } 1340 }
1185 1341
1186 ((WT)w)->at = w->repeat; 1342 ((WT)w)->at -= mn_now;
1187 1343
1188 ev_stop (EV_A_ (W)w); 1344 ev_stop (EV_A_ (W)w);
1189} 1345}
1190 1346
1191void 1347void
1192ev_timer_again (EV_P_ struct ev_timer *w) 1348ev_timer_again (EV_P_ struct ev_timer *w)
1193{ 1349{
1194 if (ev_is_active (w)) 1350 if (ev_is_active (w))
1195 { 1351 {
1196 if (w->repeat) 1352 if (w->repeat)
1197 {
1198 ((WT)w)->at = mn_now + w->repeat;
1199 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1353 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1200 }
1201 else 1354 else
1202 ev_timer_stop (EV_A_ w); 1355 ev_timer_stop (EV_A_ w);
1203 } 1356 }
1204 else if (w->repeat) 1357 else if (w->repeat)
1205 ev_timer_start (EV_A_ w); 1358 ev_timer_start (EV_A_ w);
… …
1209ev_periodic_start (EV_P_ struct ev_periodic *w) 1362ev_periodic_start (EV_P_ struct ev_periodic *w)
1210{ 1363{
1211 if (ev_is_active (w)) 1364 if (ev_is_active (w))
1212 return; 1365 return;
1213 1366
1367 if (w->reschedule_cb)
1368 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1369 else if (w->interval)
1370 {
1214 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1371 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1215
1216 /* this formula differs from the one in periodic_reify because we do not always round up */ 1372 /* this formula differs from the one in periodic_reify because we do not always round up */
1217 if (w->interval)
1218 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1373 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1374 }
1219 1375
1220 ev_start (EV_A_ (W)w, ++periodiccnt); 1376 ev_start (EV_A_ (W)w, ++periodiccnt);
1221 array_needsize (periodics, periodicmax, periodiccnt, ); 1377 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1222 periodics [periodiccnt - 1] = w; 1378 periodics [periodiccnt - 1] = w;
1223 upheap ((WT *)periodics, periodiccnt - 1); 1379 upheap ((WT *)periodics, periodiccnt - 1);
1224 1380
1225 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1381 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1226} 1382}
… …
1242 1398
1243 ev_stop (EV_A_ (W)w); 1399 ev_stop (EV_A_ (W)w);
1244} 1400}
1245 1401
1246void 1402void
1403ev_periodic_again (EV_P_ struct ev_periodic *w)
1404{
1405 /* TODO: use adjustheap and recalculation */
1406 ev_periodic_stop (EV_A_ w);
1407 ev_periodic_start (EV_A_ w);
1408}
1409
1410void
1247ev_idle_start (EV_P_ struct ev_idle *w) 1411ev_idle_start (EV_P_ struct ev_idle *w)
1248{ 1412{
1249 if (ev_is_active (w)) 1413 if (ev_is_active (w))
1250 return; 1414 return;
1251 1415
1252 ev_start (EV_A_ (W)w, ++idlecnt); 1416 ev_start (EV_A_ (W)w, ++idlecnt);
1253 array_needsize (idles, idlemax, idlecnt, ); 1417 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1254 idles [idlecnt - 1] = w; 1418 idles [idlecnt - 1] = w;
1255} 1419}
1256 1420
1257void 1421void
1258ev_idle_stop (EV_P_ struct ev_idle *w) 1422ev_idle_stop (EV_P_ struct ev_idle *w)
… …
1270{ 1434{
1271 if (ev_is_active (w)) 1435 if (ev_is_active (w))
1272 return; 1436 return;
1273 1437
1274 ev_start (EV_A_ (W)w, ++preparecnt); 1438 ev_start (EV_A_ (W)w, ++preparecnt);
1275 array_needsize (prepares, preparemax, preparecnt, ); 1439 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1276 prepares [preparecnt - 1] = w; 1440 prepares [preparecnt - 1] = w;
1277} 1441}
1278 1442
1279void 1443void
1280ev_prepare_stop (EV_P_ struct ev_prepare *w) 1444ev_prepare_stop (EV_P_ struct ev_prepare *w)
… …
1292{ 1456{
1293 if (ev_is_active (w)) 1457 if (ev_is_active (w))
1294 return; 1458 return;
1295 1459
1296 ev_start (EV_A_ (W)w, ++checkcnt); 1460 ev_start (EV_A_ (W)w, ++checkcnt);
1297 array_needsize (checks, checkmax, checkcnt, ); 1461 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1298 checks [checkcnt - 1] = w; 1462 checks [checkcnt - 1] = w;
1299} 1463}
1300 1464
1301void 1465void
1302ev_check_stop (EV_P_ struct ev_check *w) 1466ev_check_stop (EV_P_ struct ev_check *w)
… …
1323 return; 1487 return;
1324 1488
1325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1489 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1326 1490
1327 ev_start (EV_A_ (W)w, 1); 1491 ev_start (EV_A_ (W)w, 1);
1328 array_needsize (signals, signalmax, w->signum, signals_init); 1492 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1329 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1493 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1330 1494
1331 if (!((WL)w)->next) 1495 if (!((WL)w)->next)
1332 { 1496 {
1333#if WIN32 1497#if WIN32
… …
1396 void (*cb)(int revents, void *arg) = once->cb; 1560 void (*cb)(int revents, void *arg) = once->cb;
1397 void *arg = once->arg; 1561 void *arg = once->arg;
1398 1562
1399 ev_io_stop (EV_A_ &once->io); 1563 ev_io_stop (EV_A_ &once->io);
1400 ev_timer_stop (EV_A_ &once->to); 1564 ev_timer_stop (EV_A_ &once->to);
1401 free (once); 1565 ev_free (once);
1402 1566
1403 cb (revents, arg); 1567 cb (revents, arg);
1404} 1568}
1405 1569
1406static void 1570static void
… …
1416} 1580}
1417 1581
1418void 1582void
1419ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1583ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1420{ 1584{
1421 struct ev_once *once = malloc (sizeof (struct ev_once)); 1585 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1422 1586
1423 if (!once) 1587 if (!once)
1424 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1588 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1425 else 1589 else
1426 { 1590 {
1427 once->cb = cb; 1591 once->cb = cb;
1428 once->arg = arg; 1592 once->arg = arg;
1429 1593
1430 ev_watcher_init (&once->io, once_cb_io); 1594 ev_init (&once->io, once_cb_io);
1431 if (fd >= 0) 1595 if (fd >= 0)
1432 { 1596 {
1433 ev_io_set (&once->io, fd, events); 1597 ev_io_set (&once->io, fd, events);
1434 ev_io_start (EV_A_ &once->io); 1598 ev_io_start (EV_A_ &once->io);
1435 } 1599 }
1436 1600
1437 ev_watcher_init (&once->to, once_cb_to); 1601 ev_init (&once->to, once_cb_to);
1438 if (timeout >= 0.) 1602 if (timeout >= 0.)
1439 { 1603 {
1440 ev_timer_set (&once->to, timeout, 0.); 1604 ev_timer_set (&once->to, timeout, 0.);
1441 ev_timer_start (EV_A_ &once->to); 1605 ev_timer_start (EV_A_ &once->to);
1442 } 1606 }
1443 } 1607 }
1444} 1608}
1445 1609
1610#ifdef __cplusplus
1611}
1612#endif
1613

Diff Legend

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