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

Comparing libev/ev.c (file contents):
Revision 1.63 by root, Sun Nov 4 22:03:17 2007 UTC vs.
Revision 1.94 by root, Sun Nov 11 01:29:49 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
162#include "ev_win32.c"
163
150/*****************************************************************************/ 164/*****************************************************************************/
151 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
152typedef struct 214typedef struct
153{ 215{
154 struct ev_watcher_list *head; 216 WL head;
155 unsigned char events; 217 unsigned char events;
156 unsigned char reify; 218 unsigned char reify;
157} ANFD; 219} ANFD;
158 220
159typedef struct 221typedef struct
162 int events; 224 int events;
163} ANPENDING; 225} ANPENDING;
164 226
165#if EV_MULTIPLICITY 227#if EV_MULTIPLICITY
166 228
167struct ev_loop 229 struct ev_loop
168{ 230 {
231 ev_tstamp ev_rt_now;
169# define VAR(name,decl) decl; 232 #define VAR(name,decl) decl;
170# include "ev_vars.h" 233 #include "ev_vars.h"
171};
172# undef VAR 234 #undef VAR
235 };
173# include "ev_wrap.h" 236 #include "ev_wrap.h"
237
238 struct ev_loop default_loop_struct;
239 static struct ev_loop *default_loop;
174 240
175#else 241#else
176 242
243 ev_tstamp ev_rt_now;
177# define VAR(name,decl) static decl; 244 #define VAR(name,decl) static decl;
178# include "ev_vars.h" 245 #include "ev_vars.h"
179# undef VAR 246 #undef VAR
247
248 static int default_loop;
180 249
181#endif 250#endif
182 251
183/*****************************************************************************/ 252/*****************************************************************************/
184 253
185inline ev_tstamp 254ev_tstamp
186ev_time (void) 255ev_time (void)
187{ 256{
188#if EV_USE_REALTIME 257#if EV_USE_REALTIME
189 struct timespec ts; 258 struct timespec ts;
190 clock_gettime (CLOCK_REALTIME, &ts); 259 clock_gettime (CLOCK_REALTIME, &ts);
209#endif 278#endif
210 279
211 return ev_time (); 280 return ev_time ();
212} 281}
213 282
283#if EV_MULTIPLICITY
214ev_tstamp 284ev_tstamp
215ev_now (EV_P) 285ev_now (EV_P)
216{ 286{
217 return rt_now; 287 return ev_rt_now;
218} 288}
289#endif
219 290
220#define array_roundsize(base,n) ((n) | 4 & ~3) 291#define array_roundsize(type,n) ((n) | 4 & ~3)
221 292
222#define array_needsize(base,cur,cnt,init) \ 293#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 294 if (expect_false ((cnt) > cur)) \
224 { \ 295 { \
225 int newcnt = cur; \ 296 int newcnt = cur; \
226 do \ 297 do \
227 { \ 298 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 299 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 300 } \
230 while ((cnt) > newcnt); \ 301 while ((cnt) > newcnt); \
231 \ 302 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 303 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 304 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 305 cur = newcnt; \
235 } 306 }
307
308#define array_slim(type,stem) \
309 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
310 { \
311 stem ## max = array_roundsize (stem ## cnt >> 1); \
312 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
313 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
314 }
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
321#define array_free(stem, idx) \
322 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 323
237/*****************************************************************************/ 324/*****************************************************************************/
238 325
239static void 326static void
240anfds_init (ANFD *base, int count) 327anfds_init (ANFD *base, int count)
247 334
248 ++base; 335 ++base;
249 } 336 }
250} 337}
251 338
252static void 339void
253event (EV_P_ W w, int events) 340ev_feed_event (EV_P_ void *w, int revents)
254{ 341{
342 W w_ = (W)w;
343
255 if (w->pending) 344 if (w_->pending)
256 { 345 {
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 346 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
258 return; 347 return;
259 } 348 }
260 349
261 w->pending = ++pendingcnt [ABSPRI (w)]; 350 w_->pending = ++pendingcnt [ABSPRI (w_)];
262 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));
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 352 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 353 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
265} 354}
266 355
267static void 356static void
268queue_events (EV_P_ W *events, int eventcnt, int type) 357queue_events (EV_P_ W *events, int eventcnt, int type)
269{ 358{
270 int i; 359 int i;
271 360
272 for (i = 0; i < eventcnt; ++i) 361 for (i = 0; i < eventcnt; ++i)
273 event (EV_A_ events [i], type); 362 ev_feed_event (EV_A_ events [i], type);
274} 363}
275 364
276static void 365inline void
277fd_event (EV_P_ int fd, int events) 366fd_event (EV_P_ int fd, int revents)
278{ 367{
279 ANFD *anfd = anfds + fd; 368 ANFD *anfd = anfds + fd;
280 struct ev_io *w; 369 struct ev_io *w;
281 370
282 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)
283 { 372 {
284 int ev = w->events & events; 373 int ev = w->events & revents;
285 374
286 if (ev) 375 if (ev)
287 event (EV_A_ (W)w, ev); 376 ev_feed_event (EV_A_ (W)w, ev);
288 } 377 }
378}
379
380void
381ev_feed_fd_event (EV_P_ int fd, int revents)
382{
383 fd_event (EV_A_ fd, revents);
289} 384}
290 385
291/*****************************************************************************/ 386/*****************************************************************************/
292 387
293static void 388static void
306 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 401 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
307 events |= w->events; 402 events |= w->events;
308 403
309 anfd->reify = 0; 404 anfd->reify = 0;
310 405
311 if (anfd->events != events)
312 {
313 method_modify (EV_A_ fd, anfd->events, events); 406 method_modify (EV_A_ fd, anfd->events, events);
314 anfd->events = events; 407 anfd->events = events;
315 }
316 } 408 }
317 409
318 fdchangecnt = 0; 410 fdchangecnt = 0;
319} 411}
320 412
321static void 413static void
322fd_change (EV_P_ int fd) 414fd_change (EV_P_ int fd)
323{ 415{
324 if (anfds [fd].reify || fdchangecnt < 0) 416 if (anfds [fd].reify)
325 return; 417 return;
326 418
327 anfds [fd].reify = 1; 419 anfds [fd].reify = 1;
328 420
329 ++fdchangecnt; 421 ++fdchangecnt;
330 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 422 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
331 fdchanges [fdchangecnt - 1] = fd; 423 fdchanges [fdchangecnt - 1] = fd;
332} 424}
333 425
334static void 426static void
335fd_kill (EV_P_ int fd) 427fd_kill (EV_P_ int fd)
337 struct ev_io *w; 429 struct ev_io *w;
338 430
339 while ((w = (struct ev_io *)anfds [fd].head)) 431 while ((w = (struct ev_io *)anfds [fd].head))
340 { 432 {
341 ev_io_stop (EV_A_ w); 433 ev_io_stop (EV_A_ w);
342 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);
343 } 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
344} 446}
345 447
346/* called on EBADF to verify fds */ 448/* called on EBADF to verify fds */
347static void 449static void
348fd_ebadf (EV_P) 450fd_ebadf (EV_P)
349{ 451{
350 int fd; 452 int fd;
351 453
352 for (fd = 0; fd < anfdmax; ++fd) 454 for (fd = 0; fd < anfdmax; ++fd)
353 if (anfds [fd].events) 455 if (anfds [fd].events)
354 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 456 if (!fd_valid (fd) == -1 && errno == EBADF)
355 fd_kill (EV_A_ fd); 457 fd_kill (EV_A_ fd);
356} 458}
357 459
358/* 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 */
359static void 461static void
362 int fd; 464 int fd;
363 465
364 for (fd = anfdmax; fd--; ) 466 for (fd = anfdmax; fd--; )
365 if (anfds [fd].events) 467 if (anfds [fd].events)
366 { 468 {
367 close (fd);
368 fd_kill (EV_A_ fd); 469 fd_kill (EV_A_ fd);
369 return; 470 return;
370 } 471 }
371} 472}
372 473
373/* 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 */
374static void 475static void
375fd_rearm_all (EV_P) 476fd_rearm_all (EV_P)
376{ 477{
377 int fd; 478 int fd;
378 479
426 527
427 heap [k] = w; 528 heap [k] = w;
428 ((W)heap [k])->active = k + 1; 529 ((W)heap [k])->active = k + 1;
429} 530}
430 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
431/*****************************************************************************/ 544/*****************************************************************************/
432 545
433typedef struct 546typedef struct
434{ 547{
435 struct ev_watcher_list *head; 548 WL head;
436 sig_atomic_t volatile gotsig; 549 sig_atomic_t volatile gotsig;
437} ANSIG; 550} ANSIG;
438 551
439static ANSIG *signals; 552static ANSIG *signals;
440static int signalmax; 553static int signalmax;
456} 569}
457 570
458static void 571static void
459sighandler (int signum) 572sighandler (int signum)
460{ 573{
574#if WIN32
575 signal (signum, sighandler);
576#endif
577
461 signals [signum - 1].gotsig = 1; 578 signals [signum - 1].gotsig = 1;
462 579
463 if (!gotsig) 580 if (!gotsig)
464 { 581 {
465 int old_errno = errno; 582 int old_errno = errno;
466 gotsig = 1; 583 gotsig = 1;
584#ifdef WIN32
585 send (sigpipe [1], &signum, 1, MSG_DONTWAIT);
586#else
467 write (sigpipe [1], &signum, 1); 587 write (sigpipe [1], &signum, 1);
588#endif
468 errno = old_errno; 589 errno = old_errno;
469 } 590 }
470} 591}
471 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
472static void 613static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 614sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 615{
475 struct ev_watcher_list *w;
476 int signum; 616 int signum;
477 617
618#ifdef WIN32
619 recv (sigpipe [0], &revents, 1, MSG_DONTWAIT);
620#else
478 read (sigpipe [0], &revents, 1); 621 read (sigpipe [0], &revents, 1);
622#endif
479 gotsig = 0; 623 gotsig = 0;
480 624
481 for (signum = signalmax; signum--; ) 625 for (signum = signalmax; signum--; )
482 if (signals [signum].gotsig) 626 if (signals [signum].gotsig)
483 { 627 ev_feed_signal_event (EV_A_ signum + 1);
484 signals [signum].gotsig = 0;
485
486 for (w = signals [signum].head; w; w = w->next)
487 event (EV_A_ (W)w, EV_SIGNAL);
488 }
489} 628}
490 629
491static void 630static void
492siginit (EV_P) 631siginit (EV_P)
493{ 632{
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 644 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 645}
507 646
508/*****************************************************************************/ 647/*****************************************************************************/
509 648
649static struct ev_child *childs [PID_HASHSIZE];
650
510#ifndef WIN32 651#ifndef WIN32
511 652
512static struct ev_child *childs [PID_HASHSIZE];
513static struct ev_signal childev; 653static struct ev_signal childev;
514 654
515#ifndef WCONTINUED 655#ifndef WCONTINUED
516# define WCONTINUED 0 656# define WCONTINUED 0
517#endif 657#endif
525 if (w->pid == pid || !w->pid) 665 if (w->pid == pid || !w->pid)
526 { 666 {
527 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 667 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
528 w->rpid = pid; 668 w->rpid = pid;
529 w->rstatus = status; 669 w->rstatus = status;
530 event (EV_A_ (W)w, EV_CHILD); 670 ev_feed_event (EV_A_ (W)w, EV_CHILD);
531 } 671 }
532} 672}
533 673
534static void 674static void
535childcb (EV_P_ struct ev_signal *sw, int revents) 675childcb (EV_P_ struct ev_signal *sw, int revents)
537 int pid, status; 677 int pid, status;
538 678
539 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 679 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
540 { 680 {
541 /* 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 */
542 event (EV_A_ (W)sw, EV_SIGNAL); 682 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
543 683
544 child_reap (EV_A_ sw, pid, pid, status); 684 child_reap (EV_A_ sw, pid, pid, status);
545 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 */
546 } 686 }
547} 687}
604 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 744 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
605 have_monotonic = 1; 745 have_monotonic = 1;
606 } 746 }
607#endif 747#endif
608 748
609 rt_now = ev_time (); 749 ev_rt_now = ev_time ();
610 mn_now = get_clock (); 750 mn_now = get_clock ();
611 now_floor = mn_now; 751 now_floor = mn_now;
612 rtmn_diff = rt_now - mn_now; 752 rtmn_diff = ev_rt_now - mn_now;
613 753
614 if (methods == EVMETHOD_AUTO) 754 if (methods == EVMETHOD_AUTO)
615 if (!enable_secure () && getenv ("LIBEV_METHODS")) 755 if (!enable_secure () && getenv ("LIBEV_METHODS"))
616 methods = atoi (getenv ("LIBEV_METHODS")); 756 methods = atoi (getenv ("LIBEV_METHODS"));
617 else 757 else
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 771 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
632#endif 772#endif
633#if EV_USE_SELECT 773#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 774 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
635#endif 775#endif
776
777 ev_init (&sigev, sigcb);
778 ev_set_priority (&sigev, EV_MAXPRI);
636 } 779 }
637} 780}
638 781
639void 782void
640loop_destroy (EV_P) 783loop_destroy (EV_P)
641{ 784{
785 int i;
786
642#if EV_USE_WIN32 787#if EV_USE_WIN32
643 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 788 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
644#endif 789#endif
645#if EV_USE_KQUEUE 790#if EV_USE_KQUEUE
646 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 791 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
653#endif 798#endif
654#if EV_USE_SELECT 799#if EV_USE_SELECT
655 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 800 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
656#endif 801#endif
657 802
803 for (i = NUMPRI; i--; )
804 array_free (pending, [i]);
805
806 /* have to use the microsoft-never-gets-it-right macro */
807 array_free_microshit (fdchange);
808 array_free_microshit (timer);
809#if EV_PERIODICS
810 array_free_microshit (periodic);
811#endif
812 array_free_microshit (idle);
813 array_free_microshit (prepare);
814 array_free_microshit (check);
815
658 method = 0; 816 method = 0;
659 /*TODO*/
660} 817}
661 818
662void 819static void
663loop_fork (EV_P) 820loop_fork (EV_P)
664{ 821{
665 /*TODO*/
666#if EV_USE_EPOLL 822#if EV_USE_EPOLL
667 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 823 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
668#endif 824#endif
669#if EV_USE_KQUEUE 825#if EV_USE_KQUEUE
670 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 826 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
671#endif 827#endif
828
829 if (ev_is_active (&sigev))
830 {
831 /* default loop */
832
833 ev_ref (EV_A);
834 ev_io_stop (EV_A_ &sigev);
835 close (sigpipe [0]);
836 close (sigpipe [1]);
837
838 while (pipe (sigpipe))
839 syserr ("(libev) error creating pipe");
840
841 siginit (EV_A);
842 }
843
844 postfork = 0;
672} 845}
673 846
674#if EV_MULTIPLICITY 847#if EV_MULTIPLICITY
675struct ev_loop * 848struct ev_loop *
676ev_loop_new (int methods) 849ev_loop_new (int methods)
677{ 850{
678 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 851 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
852
853 memset (loop, 0, sizeof (struct ev_loop));
679 854
680 loop_init (EV_A_ methods); 855 loop_init (EV_A_ methods);
681 856
682 if (ev_method (EV_A)) 857 if (ev_method (EV_A))
683 return loop; 858 return loop;
687 862
688void 863void
689ev_loop_destroy (EV_P) 864ev_loop_destroy (EV_P)
690{ 865{
691 loop_destroy (EV_A); 866 loop_destroy (EV_A);
692 free (loop); 867 ev_free (loop);
693} 868}
694 869
695void 870void
696ev_loop_fork (EV_P) 871ev_loop_fork (EV_P)
697{ 872{
698 loop_fork (EV_A); 873 postfork = 1;
699} 874}
700 875
701#endif 876#endif
702 877
703#if EV_MULTIPLICITY 878#if EV_MULTIPLICITY
704struct ev_loop default_loop_struct;
705static struct ev_loop *default_loop;
706
707struct ev_loop * 879struct ev_loop *
708#else 880#else
709static int default_loop;
710
711int 881int
712#endif 882#endif
713ev_default_loop (int methods) 883ev_default_loop (int methods)
714{ 884{
715 if (sigpipe [0] == sigpipe [1]) 885 if (sigpipe [0] == sigpipe [1])
726 896
727 loop_init (EV_A_ methods); 897 loop_init (EV_A_ methods);
728 898
729 if (ev_method (EV_A)) 899 if (ev_method (EV_A))
730 { 900 {
731 ev_watcher_init (&sigev, sigcb);
732 ev_set_priority (&sigev, EV_MAXPRI);
733 siginit (EV_A); 901 siginit (EV_A);
734 902
735#ifndef WIN32 903#ifndef WIN32
736 ev_signal_init (&childev, childcb, SIGCHLD); 904 ev_signal_init (&childev, childcb, SIGCHLD);
737 ev_set_priority (&childev, EV_MAXPRI); 905 ev_set_priority (&childev, EV_MAXPRI);
751{ 919{
752#if EV_MULTIPLICITY 920#if EV_MULTIPLICITY
753 struct ev_loop *loop = default_loop; 921 struct ev_loop *loop = default_loop;
754#endif 922#endif
755 923
924#ifndef WIN32
756 ev_ref (EV_A); /* child watcher */ 925 ev_ref (EV_A); /* child watcher */
757 ev_signal_stop (EV_A_ &childev); 926 ev_signal_stop (EV_A_ &childev);
927#endif
758 928
759 ev_ref (EV_A); /* signal watcher */ 929 ev_ref (EV_A); /* signal watcher */
760 ev_io_stop (EV_A_ &sigev); 930 ev_io_stop (EV_A_ &sigev);
761 931
762 close (sigpipe [0]); sigpipe [0] = 0; 932 close (sigpipe [0]); sigpipe [0] = 0;
770{ 940{
771#if EV_MULTIPLICITY 941#if EV_MULTIPLICITY
772 struct ev_loop *loop = default_loop; 942 struct ev_loop *loop = default_loop;
773#endif 943#endif
774 944
775 loop_fork (EV_A); 945 if (method)
776 946 postfork = 1;
777 ev_io_stop (EV_A_ &sigev);
778 close (sigpipe [0]);
779 close (sigpipe [1]);
780 pipe (sigpipe);
781
782 ev_ref (EV_A); /* signal watcher */
783 siginit (EV_A);
784} 947}
785 948
786/*****************************************************************************/ 949/*****************************************************************************/
950
951static int
952any_pending (EV_P)
953{
954 int pri;
955
956 for (pri = NUMPRI; pri--; )
957 if (pendingcnt [pri])
958 return 1;
959
960 return 0;
961}
787 962
788static void 963static void
789call_pending (EV_P) 964call_pending (EV_P)
790{ 965{
791 int pri; 966 int pri;
796 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 971 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
797 972
798 if (p->w) 973 if (p->w)
799 { 974 {
800 p->w->pending = 0; 975 p->w->pending = 0;
801 976 EV_CB_INVOKE (p->w, p->events);
802 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events);
803 } 977 }
804 } 978 }
805} 979}
806 980
807static void 981static void
815 989
816 /* first reschedule or stop timer */ 990 /* first reschedule or stop timer */
817 if (w->repeat) 991 if (w->repeat)
818 { 992 {
819 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 993 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
994
820 ((WT)w)->at = mn_now + w->repeat; 995 ((WT)w)->at += w->repeat;
996 if (((WT)w)->at < mn_now)
997 ((WT)w)->at = mn_now;
998
821 downheap ((WT *)timers, timercnt, 0); 999 downheap ((WT *)timers, timercnt, 0);
822 } 1000 }
823 else 1001 else
824 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1002 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
825 1003
826 event (EV_A_ (W)w, EV_TIMEOUT); 1004 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
827 } 1005 }
828} 1006}
829 1007
1008#if EV_PERIODICS
830static void 1009static void
831periodics_reify (EV_P) 1010periodics_reify (EV_P)
832{ 1011{
833 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1012 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
834 { 1013 {
835 struct ev_periodic *w = periodics [0]; 1014 struct ev_periodic *w = periodics [0];
836 1015
837 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1016 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
838 1017
839 /* first reschedule or stop timer */ 1018 /* first reschedule or stop timer */
840 if (w->interval) 1019 if (w->reschedule_cb)
841 { 1020 {
1021 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1022
1023 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1024 downheap ((WT *)periodics, periodiccnt, 0);
1025 }
1026 else if (w->interval)
1027 {
842 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1028 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
843 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1029 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
844 downheap ((WT *)periodics, periodiccnt, 0); 1030 downheap ((WT *)periodics, periodiccnt, 0);
845 } 1031 }
846 else 1032 else
847 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1033 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
848 1034
849 event (EV_A_ (W)w, EV_PERIODIC); 1035 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
850 } 1036 }
851} 1037}
852 1038
853static void 1039static void
854periodics_reschedule (EV_P) 1040periodics_reschedule (EV_P)
858 /* adjust periodics after time jump */ 1044 /* adjust periodics after time jump */
859 for (i = 0; i < periodiccnt; ++i) 1045 for (i = 0; i < periodiccnt; ++i)
860 { 1046 {
861 struct ev_periodic *w = periodics [i]; 1047 struct ev_periodic *w = periodics [i];
862 1048
1049 if (w->reschedule_cb)
1050 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
863 if (w->interval) 1051 else if (w->interval)
864 {
865 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1052 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
866
867 if (fabs (diff) >= 1e-4)
868 {
869 ev_periodic_stop (EV_A_ w);
870 ev_periodic_start (EV_A_ w);
871
872 i = 0; /* restart loop, inefficient, but time jumps should be rare */
873 }
874 }
875 } 1053 }
1054
1055 /* now rebuild the heap */
1056 for (i = periodiccnt >> 1; i--; )
1057 downheap ((WT *)periodics, periodiccnt, i);
876} 1058}
1059#endif
877 1060
878inline int 1061inline int
879time_update_monotonic (EV_P) 1062time_update_monotonic (EV_P)
880{ 1063{
881 mn_now = get_clock (); 1064 mn_now = get_clock ();
882 1065
883 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1066 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
884 { 1067 {
885 rt_now = rtmn_diff + mn_now; 1068 ev_rt_now = rtmn_diff + mn_now;
886 return 0; 1069 return 0;
887 } 1070 }
888 else 1071 else
889 { 1072 {
890 now_floor = mn_now; 1073 now_floor = mn_now;
891 rt_now = ev_time (); 1074 ev_rt_now = ev_time ();
892 return 1; 1075 return 1;
893 } 1076 }
894} 1077}
895 1078
896static void 1079static void
905 { 1088 {
906 ev_tstamp odiff = rtmn_diff; 1089 ev_tstamp odiff = rtmn_diff;
907 1090
908 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1091 for (i = 4; --i; ) /* loop a few times, before making important decisions */
909 { 1092 {
910 rtmn_diff = rt_now - mn_now; 1093 rtmn_diff = ev_rt_now - mn_now;
911 1094
912 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1095 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
913 return; /* all is well */ 1096 return; /* all is well */
914 1097
915 rt_now = ev_time (); 1098 ev_rt_now = ev_time ();
916 mn_now = get_clock (); 1099 mn_now = get_clock ();
917 now_floor = mn_now; 1100 now_floor = mn_now;
918 } 1101 }
919 1102
1103# if EV_PERIODICS
920 periodics_reschedule (EV_A); 1104 periodics_reschedule (EV_A);
1105# endif
921 /* no timer adjustment, as the monotonic clock doesn't jump */ 1106 /* no timer adjustment, as the monotonic clock doesn't jump */
922 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1107 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
923 } 1108 }
924 } 1109 }
925 else 1110 else
926#endif 1111#endif
927 { 1112 {
928 rt_now = ev_time (); 1113 ev_rt_now = ev_time ();
929 1114
930 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1115 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
931 { 1116 {
1117#if EV_PERIODICS
932 periodics_reschedule (EV_A); 1118 periodics_reschedule (EV_A);
1119#endif
933 1120
934 /* adjust timers. this is easy, as the offset is the same for all */ 1121 /* adjust timers. this is easy, as the offset is the same for all */
935 for (i = 0; i < timercnt; ++i) 1122 for (i = 0; i < timercnt; ++i)
936 ((WT)timers [i])->at += rt_now - mn_now; 1123 ((WT)timers [i])->at += ev_rt_now - mn_now;
937 } 1124 }
938 1125
939 mn_now = rt_now; 1126 mn_now = ev_rt_now;
940 } 1127 }
941} 1128}
942 1129
943void 1130void
944ev_ref (EV_P) 1131ev_ref (EV_P)
967 { 1154 {
968 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1155 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
969 call_pending (EV_A); 1156 call_pending (EV_A);
970 } 1157 }
971 1158
1159 /* we might have forked, so reify kernel state if necessary */
1160 if (expect_false (postfork))
1161 loop_fork (EV_A);
1162
972 /* update fd-related kernel structures */ 1163 /* update fd-related kernel structures */
973 fd_reify (EV_A); 1164 fd_reify (EV_A);
974 1165
975 /* calculate blocking time */ 1166 /* calculate blocking time */
976 1167
977 /* we only need this for !monotonic clockor timers, but as we basically 1168 /* we only need this for !monotonic clock or timers, but as we basically
978 always have timers, we just calculate it always */ 1169 always have timers, we just calculate it always */
979#if EV_USE_MONOTONIC 1170#if EV_USE_MONOTONIC
980 if (expect_true (have_monotonic)) 1171 if (expect_true (have_monotonic))
981 time_update_monotonic (EV_A); 1172 time_update_monotonic (EV_A);
982 else 1173 else
983#endif 1174#endif
984 { 1175 {
985 rt_now = ev_time (); 1176 ev_rt_now = ev_time ();
986 mn_now = rt_now; 1177 mn_now = ev_rt_now;
987 } 1178 }
988 1179
989 if (flags & EVLOOP_NONBLOCK || idlecnt) 1180 if (flags & EVLOOP_NONBLOCK || idlecnt)
990 block = 0.; 1181 block = 0.;
991 else 1182 else
996 { 1187 {
997 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1188 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
998 if (block > to) block = to; 1189 if (block > to) block = to;
999 } 1190 }
1000 1191
1192#if EV_PERIODICS
1001 if (periodiccnt) 1193 if (periodiccnt)
1002 { 1194 {
1003 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1195 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1004 if (block > to) block = to; 1196 if (block > to) block = to;
1005 } 1197 }
1198#endif
1006 1199
1007 if (block < 0.) block = 0.; 1200 if (block < 0.) block = 0.;
1008 } 1201 }
1009 1202
1010 method_poll (EV_A_ block); 1203 method_poll (EV_A_ block);
1011 1204
1012 /* update rt_now, do magic */ 1205 /* update ev_rt_now, do magic */
1013 time_update (EV_A); 1206 time_update (EV_A);
1014 1207
1015 /* queue pending timers and reschedule them */ 1208 /* queue pending timers and reschedule them */
1016 timers_reify (EV_A); /* relative timers called last */ 1209 timers_reify (EV_A); /* relative timers called last */
1210#if EV_PERIODICS
1017 periodics_reify (EV_A); /* absolute timers called first */ 1211 periodics_reify (EV_A); /* absolute timers called first */
1212#endif
1018 1213
1019 /* queue idle watchers unless io or timers are pending */ 1214 /* queue idle watchers unless io or timers are pending */
1020 if (!pendingcnt) 1215 if (idlecnt && !any_pending (EV_A))
1021 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1216 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1022 1217
1023 /* queue check watchers, to be executed first */ 1218 /* queue check watchers, to be executed first */
1024 if (checkcnt) 1219 if (checkcnt)
1025 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1220 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1100 return; 1295 return;
1101 1296
1102 assert (("ev_io_start called with negative fd", fd >= 0)); 1297 assert (("ev_io_start called with negative fd", fd >= 0));
1103 1298
1104 ev_start (EV_A_ (W)w, 1); 1299 ev_start (EV_A_ (W)w, 1);
1105 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1300 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1106 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1301 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1107 1302
1108 fd_change (EV_A_ fd); 1303 fd_change (EV_A_ fd);
1109} 1304}
1110 1305
1113{ 1308{
1114 ev_clear_pending (EV_A_ (W)w); 1309 ev_clear_pending (EV_A_ (W)w);
1115 if (!ev_is_active (w)) 1310 if (!ev_is_active (w))
1116 return; 1311 return;
1117 1312
1313 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1314
1118 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1315 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1119 ev_stop (EV_A_ (W)w); 1316 ev_stop (EV_A_ (W)w);
1120 1317
1121 fd_change (EV_A_ w->fd); 1318 fd_change (EV_A_ w->fd);
1122} 1319}
1130 ((WT)w)->at += mn_now; 1327 ((WT)w)->at += mn_now;
1131 1328
1132 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1329 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1133 1330
1134 ev_start (EV_A_ (W)w, ++timercnt); 1331 ev_start (EV_A_ (W)w, ++timercnt);
1135 array_needsize (timers, timermax, timercnt, ); 1332 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1136 timers [timercnt - 1] = w; 1333 timers [timercnt - 1] = w;
1137 upheap ((WT *)timers, timercnt - 1); 1334 upheap ((WT *)timers, timercnt - 1);
1138 1335
1139 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1336 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1140} 1337}
1152 { 1349 {
1153 timers [((W)w)->active - 1] = timers [timercnt]; 1350 timers [((W)w)->active - 1] = timers [timercnt];
1154 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1351 downheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1155 } 1352 }
1156 1353
1157 ((WT)w)->at = w->repeat; 1354 ((WT)w)->at -= mn_now;
1158 1355
1159 ev_stop (EV_A_ (W)w); 1356 ev_stop (EV_A_ (W)w);
1160} 1357}
1161 1358
1162void 1359void
1163ev_timer_again (EV_P_ struct ev_timer *w) 1360ev_timer_again (EV_P_ struct ev_timer *w)
1164{ 1361{
1165 if (ev_is_active (w)) 1362 if (ev_is_active (w))
1166 { 1363 {
1167 if (w->repeat) 1364 if (w->repeat)
1168 {
1169 ((WT)w)->at = mn_now + w->repeat;
1170 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1365 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1, mn_now + w->repeat);
1171 }
1172 else 1366 else
1173 ev_timer_stop (EV_A_ w); 1367 ev_timer_stop (EV_A_ w);
1174 } 1368 }
1175 else if (w->repeat) 1369 else if (w->repeat)
1176 ev_timer_start (EV_A_ w); 1370 ev_timer_start (EV_A_ w);
1177} 1371}
1178 1372
1373#if EV_PERIODICS
1179void 1374void
1180ev_periodic_start (EV_P_ struct ev_periodic *w) 1375ev_periodic_start (EV_P_ struct ev_periodic *w)
1181{ 1376{
1182 if (ev_is_active (w)) 1377 if (ev_is_active (w))
1183 return; 1378 return;
1184 1379
1380 if (w->reschedule_cb)
1381 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1382 else if (w->interval)
1383 {
1185 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1384 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1186
1187 /* this formula differs from the one in periodic_reify because we do not always round up */ 1385 /* this formula differs from the one in periodic_reify because we do not always round up */
1188 if (w->interval)
1189 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1386 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1387 }
1190 1388
1191 ev_start (EV_A_ (W)w, ++periodiccnt); 1389 ev_start (EV_A_ (W)w, ++periodiccnt);
1192 array_needsize (periodics, periodicmax, periodiccnt, ); 1390 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1193 periodics [periodiccnt - 1] = w; 1391 periodics [periodiccnt - 1] = w;
1194 upheap ((WT *)periodics, periodiccnt - 1); 1392 upheap ((WT *)periodics, periodiccnt - 1);
1195 1393
1196 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1394 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1197} 1395}
1213 1411
1214 ev_stop (EV_A_ (W)w); 1412 ev_stop (EV_A_ (W)w);
1215} 1413}
1216 1414
1217void 1415void
1416ev_periodic_again (EV_P_ struct ev_periodic *w)
1417{
1418 /* TODO: use adjustheap and recalculation */
1419 ev_periodic_stop (EV_A_ w);
1420 ev_periodic_start (EV_A_ w);
1421}
1422#endif
1423
1424void
1218ev_idle_start (EV_P_ struct ev_idle *w) 1425ev_idle_start (EV_P_ struct ev_idle *w)
1219{ 1426{
1220 if (ev_is_active (w)) 1427 if (ev_is_active (w))
1221 return; 1428 return;
1222 1429
1223 ev_start (EV_A_ (W)w, ++idlecnt); 1430 ev_start (EV_A_ (W)w, ++idlecnt);
1224 array_needsize (idles, idlemax, idlecnt, ); 1431 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1225 idles [idlecnt - 1] = w; 1432 idles [idlecnt - 1] = w;
1226} 1433}
1227 1434
1228void 1435void
1229ev_idle_stop (EV_P_ struct ev_idle *w) 1436ev_idle_stop (EV_P_ struct ev_idle *w)
1230{ 1437{
1231 ev_clear_pending (EV_A_ (W)w); 1438 ev_clear_pending (EV_A_ (W)w);
1232 if (ev_is_active (w)) 1439 if (!ev_is_active (w))
1233 return; 1440 return;
1234 1441
1235 idles [((W)w)->active - 1] = idles [--idlecnt]; 1442 idles [((W)w)->active - 1] = idles [--idlecnt];
1236 ev_stop (EV_A_ (W)w); 1443 ev_stop (EV_A_ (W)w);
1237} 1444}
1241{ 1448{
1242 if (ev_is_active (w)) 1449 if (ev_is_active (w))
1243 return; 1450 return;
1244 1451
1245 ev_start (EV_A_ (W)w, ++preparecnt); 1452 ev_start (EV_A_ (W)w, ++preparecnt);
1246 array_needsize (prepares, preparemax, preparecnt, ); 1453 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1247 prepares [preparecnt - 1] = w; 1454 prepares [preparecnt - 1] = w;
1248} 1455}
1249 1456
1250void 1457void
1251ev_prepare_stop (EV_P_ struct ev_prepare *w) 1458ev_prepare_stop (EV_P_ struct ev_prepare *w)
1252{ 1459{
1253 ev_clear_pending (EV_A_ (W)w); 1460 ev_clear_pending (EV_A_ (W)w);
1254 if (ev_is_active (w)) 1461 if (!ev_is_active (w))
1255 return; 1462 return;
1256 1463
1257 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1464 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1258 ev_stop (EV_A_ (W)w); 1465 ev_stop (EV_A_ (W)w);
1259} 1466}
1263{ 1470{
1264 if (ev_is_active (w)) 1471 if (ev_is_active (w))
1265 return; 1472 return;
1266 1473
1267 ev_start (EV_A_ (W)w, ++checkcnt); 1474 ev_start (EV_A_ (W)w, ++checkcnt);
1268 array_needsize (checks, checkmax, checkcnt, ); 1475 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1269 checks [checkcnt - 1] = w; 1476 checks [checkcnt - 1] = w;
1270} 1477}
1271 1478
1272void 1479void
1273ev_check_stop (EV_P_ struct ev_check *w) 1480ev_check_stop (EV_P_ struct ev_check *w)
1274{ 1481{
1275 ev_clear_pending (EV_A_ (W)w); 1482 ev_clear_pending (EV_A_ (W)w);
1276 if (ev_is_active (w)) 1483 if (!ev_is_active (w))
1277 return; 1484 return;
1278 1485
1279 checks [((W)w)->active - 1] = checks [--checkcnt]; 1486 checks [((W)w)->active - 1] = checks [--checkcnt];
1280 ev_stop (EV_A_ (W)w); 1487 ev_stop (EV_A_ (W)w);
1281} 1488}
1294 return; 1501 return;
1295 1502
1296 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1503 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1297 1504
1298 ev_start (EV_A_ (W)w, 1); 1505 ev_start (EV_A_ (W)w, 1);
1299 array_needsize (signals, signalmax, w->signum, signals_init); 1506 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1300 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1507 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1301 1508
1302 if (!((WL)w)->next) 1509 if (!((WL)w)->next)
1303 { 1510 {
1511#if WIN32
1512 signal (w->signum, sighandler);
1513#else
1304 struct sigaction sa; 1514 struct sigaction sa;
1305 sa.sa_handler = sighandler; 1515 sa.sa_handler = sighandler;
1306 sigfillset (&sa.sa_mask); 1516 sigfillset (&sa.sa_mask);
1307 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1517 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1308 sigaction (w->signum, &sa, 0); 1518 sigaction (w->signum, &sa, 0);
1519#endif
1309 } 1520 }
1310} 1521}
1311 1522
1312void 1523void
1313ev_signal_stop (EV_P_ struct ev_signal *w) 1524ev_signal_stop (EV_P_ struct ev_signal *w)
1363 void (*cb)(int revents, void *arg) = once->cb; 1574 void (*cb)(int revents, void *arg) = once->cb;
1364 void *arg = once->arg; 1575 void *arg = once->arg;
1365 1576
1366 ev_io_stop (EV_A_ &once->io); 1577 ev_io_stop (EV_A_ &once->io);
1367 ev_timer_stop (EV_A_ &once->to); 1578 ev_timer_stop (EV_A_ &once->to);
1368 free (once); 1579 ev_free (once);
1369 1580
1370 cb (revents, arg); 1581 cb (revents, arg);
1371} 1582}
1372 1583
1373static void 1584static void
1383} 1594}
1384 1595
1385void 1596void
1386ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1597ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1387{ 1598{
1388 struct ev_once *once = malloc (sizeof (struct ev_once)); 1599 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1389 1600
1390 if (!once) 1601 if (!once)
1391 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1602 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1392 else 1603 else
1393 { 1604 {
1394 once->cb = cb; 1605 once->cb = cb;
1395 once->arg = arg; 1606 once->arg = arg;
1396 1607
1397 ev_watcher_init (&once->io, once_cb_io); 1608 ev_init (&once->io, once_cb_io);
1398 if (fd >= 0) 1609 if (fd >= 0)
1399 { 1610 {
1400 ev_io_set (&once->io, fd, events); 1611 ev_io_set (&once->io, fd, events);
1401 ev_io_start (EV_A_ &once->io); 1612 ev_io_start (EV_A_ &once->io);
1402 } 1613 }
1403 1614
1404 ev_watcher_init (&once->to, once_cb_to); 1615 ev_init (&once->to, once_cb_to);
1405 if (timeout >= 0.) 1616 if (timeout >= 0.)
1406 { 1617 {
1407 ev_timer_set (&once->to, timeout, 0.); 1618 ev_timer_set (&once->to, timeout, 0.);
1408 ev_timer_start (EV_A_ &once->to); 1619 ev_timer_start (EV_A_ &once->to);
1409 } 1620 }
1410 } 1621 }
1411} 1622}
1412 1623
1624#ifdef __cplusplus
1625}
1626#endif
1627

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines