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

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

Diff Legend

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