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

Comparing libev/ev.c (file contents):
Revision 1.71 by root, Tue Nov 6 13:17:55 2007 UTC vs.
Revision 1.104 by root, Mon Nov 12 00:39:45 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_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
… …
64#include <assert.h> 73#include <assert.h>
65#include <errno.h> 74#include <errno.h>
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#ifndef PERL
70# include <signal.h> 78#include <signal.h>
71#endif
72 79
73#ifndef WIN32 80#ifndef _WIN32
74# include <unistd.h> 81# include <unistd.h>
75# include <sys/time.h> 82# include <sys/time.h>
76# include <sys/wait.h> 83# include <sys/wait.h>
84#else
85# define WIN32_LEAN_AND_MEAN
86# include <windows.h>
87# ifndef EV_SELECT_IS_WINSOCKET
88# define EV_SELECT_IS_WINSOCKET 1
77#endif 89# endif
90#endif
91
78/**/ 92/**/
79 93
80#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
81# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
82#endif 96#endif
83 97
84#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
85# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
86#endif 101#endif
87 102
88#ifndef EV_USE_POLL 103#ifndef EV_USE_POLL
89# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 104# ifdef _WIN32
105# define EV_USE_POLL 0
106# else
107# define EV_USE_POLL 1
108# endif
90#endif 109#endif
91 110
92#ifndef EV_USE_EPOLL 111#ifndef EV_USE_EPOLL
93# define EV_USE_EPOLL 0 112# define EV_USE_EPOLL 0
94#endif 113#endif
95 114
96#ifndef EV_USE_KQUEUE 115#ifndef EV_USE_KQUEUE
97# define EV_USE_KQUEUE 0 116# define EV_USE_KQUEUE 0
98#endif
99
100#ifndef EV_USE_WIN32
101# ifdef WIN32
102# define EV_USE_WIN32 0 /* it does not exist, use select */
103# undef EV_USE_SELECT
104# define EV_USE_SELECT 1
105# else
106# define EV_USE_WIN32 0
107# endif
108#endif 117#endif
109 118
110#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
111# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
112#endif 121#endif
… …
119#endif 128#endif
120 129
121#ifndef CLOCK_REALTIME 130#ifndef CLOCK_REALTIME
122# undef EV_USE_REALTIME 131# undef EV_USE_REALTIME
123# define EV_USE_REALTIME 0 132# define EV_USE_REALTIME 0
133#endif
134
135#if EV_SELECT_IS_WINSOCKET
136# include <winsock.h>
124#endif 137#endif
125 138
126/**/ 139/**/
127 140
128#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 141#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
129#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 142#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
130#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 143#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
131/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 144/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
132 145
146#ifdef EV_H
147# include EV_H
148#else
133#include "ev.h" 149# include "ev.h"
150#endif
134 151
135#if __GNUC__ >= 3 152#if __GNUC__ >= 3
136# define expect(expr,value) __builtin_expect ((expr),(value)) 153# define expect(expr,value) __builtin_expect ((expr),(value))
137# define inline inline 154# define inline inline
138#else 155#else
… …
144#define expect_true(expr) expect ((expr) != 0, 1) 161#define expect_true(expr) expect ((expr) != 0, 1)
145 162
146#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
147#define ABSPRI(w) ((w)->priority - EV_MINPRI) 164#define ABSPRI(w) ((w)->priority - EV_MINPRI)
148 165
166#define EMPTY /* required for microsofts broken pseudo-c compiler */
167
149typedef struct ev_watcher *W; 168typedef struct ev_watcher *W;
150typedef struct ev_watcher_list *WL; 169typedef struct ev_watcher_list *WL;
151typedef struct ev_watcher_time *WT; 170typedef struct ev_watcher_time *WT;
152 171
153static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 172static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
154 173
155#if WIN32 174#ifdef _WIN32
156/* note: the comment below could not be substantiated, but what would I care */ 175# include "ev_win32.c"
157/* MSDN says this is required to handle SIGFPE */
158volatile double SIGFPE_REQ = 0.0f;
159#endif 176#endif
160 177
161/*****************************************************************************/ 178/*****************************************************************************/
162 179
163static void (*syserr_cb)(const char *msg); 180static void (*syserr_cb)(const char *msg);
… …
211typedef struct 228typedef struct
212{ 229{
213 WL head; 230 WL head;
214 unsigned char events; 231 unsigned char events;
215 unsigned char reify; 232 unsigned char reify;
233#if EV_SELECT_IS_WINSOCKET
234 SOCKET handle;
235#endif
216} ANFD; 236} ANFD;
217 237
218typedef struct 238typedef struct
219{ 239{
220 W w; 240 W w;
221 int events; 241 int events;
222} ANPENDING; 242} ANPENDING;
223 243
224#if EV_MULTIPLICITY 244#if EV_MULTIPLICITY
225 245
226struct ev_loop 246 struct ev_loop
227{ 247 {
248 ev_tstamp ev_rt_now;
249 #define ev_rt_now ((loop)->ev_rt_now)
228# define VAR(name,decl) decl; 250 #define VAR(name,decl) decl;
229# include "ev_vars.h" 251 #include "ev_vars.h"
230};
231# undef VAR 252 #undef VAR
253 };
232# include "ev_wrap.h" 254 #include "ev_wrap.h"
255
256 struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop;
233 258
234#else 259#else
235 260
261 ev_tstamp ev_rt_now;
236# define VAR(name,decl) static decl; 262 #define VAR(name,decl) static decl;
237# include "ev_vars.h" 263 #include "ev_vars.h"
238# undef VAR 264 #undef VAR
265
266 static int default_loop;
239 267
240#endif 268#endif
241 269
242/*****************************************************************************/ 270/*****************************************************************************/
243 271
244inline ev_tstamp 272ev_tstamp
245ev_time (void) 273ev_time (void)
246{ 274{
247#if EV_USE_REALTIME 275#if EV_USE_REALTIME
248 struct timespec ts; 276 struct timespec ts;
249 clock_gettime (CLOCK_REALTIME, &ts); 277 clock_gettime (CLOCK_REALTIME, &ts);
… …
268#endif 296#endif
269 297
270 return ev_time (); 298 return ev_time ();
271} 299}
272 300
301#if EV_MULTIPLICITY
273ev_tstamp 302ev_tstamp
274ev_now (EV_P) 303ev_now (EV_P)
275{ 304{
276 return rt_now; 305 return ev_rt_now;
277} 306}
307#endif
278 308
279#define array_roundsize(base,n) ((n) | 4 & ~3) 309#define array_roundsize(type,n) ((n) | 4 & ~3)
280 310
281#define array_needsize(base,cur,cnt,init) \ 311#define array_needsize(type,base,cur,cnt,init) \
282 if (expect_false ((cnt) > cur)) \ 312 if (expect_false ((cnt) > cur)) \
283 { \ 313 { \
284 int newcnt = cur; \ 314 int newcnt = cur; \
285 do \ 315 do \
286 { \ 316 { \
287 newcnt = array_roundsize (base, newcnt << 1); \ 317 newcnt = array_roundsize (type, newcnt << 1); \
288 } \ 318 } \
289 while ((cnt) > newcnt); \ 319 while ((cnt) > newcnt); \
290 \ 320 \
291 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 321 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
292 init (base + cur, newcnt - cur); \ 322 init (base + cur, newcnt - cur); \
293 cur = newcnt; \ 323 cur = newcnt; \
294 } 324 }
295 325
296#define array_slim(stem) \ 326#define array_slim(type,stem) \
297 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 327 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
298 { \ 328 { \
299 stem ## max = array_roundsize (stem ## cnt >> 1); \ 329 stem ## max = array_roundsize (stem ## cnt >> 1); \
300 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 330 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
301 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 331 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
302 } 332 }
303
304/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
305/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
306#define array_free_microshit(stem) \
307 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
308 333
309#define array_free(stem, idx) \ 334#define array_free(stem, idx) \
310 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 335 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
311 336
312/*****************************************************************************/ 337/*****************************************************************************/
… …
322 347
323 ++base; 348 ++base;
324 } 349 }
325} 350}
326 351
327static void 352void
328event (EV_P_ W w, int events) 353ev_feed_event (EV_P_ void *w, int revents)
329{ 354{
355 W w_ = (W)w;
356
330 if (w->pending) 357 if (w_->pending)
331 { 358 {
332 pendings [ABSPRI (w)][w->pending - 1].events |= events; 359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
333 return; 360 return;
334 } 361 }
335 362
336 w->pending = ++pendingcnt [ABSPRI (w)]; 363 w_->pending = ++pendingcnt [ABSPRI (w_)];
337 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], (void)); 364 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], (void));
338 pendings [ABSPRI (w)][w->pending - 1].w = w; 365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
339 pendings [ABSPRI (w)][w->pending - 1].events = events; 366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
340} 367}
341 368
342static void 369static void
343queue_events (EV_P_ W *events, int eventcnt, int type) 370queue_events (EV_P_ W *events, int eventcnt, int type)
344{ 371{
345 int i; 372 int i;
346 373
347 for (i = 0; i < eventcnt; ++i) 374 for (i = 0; i < eventcnt; ++i)
348 event (EV_A_ events [i], type); 375 ev_feed_event (EV_A_ events [i], type);
349} 376}
350 377
351static void 378inline void
352fd_event (EV_P_ int fd, int events) 379fd_event (EV_P_ int fd, int revents)
353{ 380{
354 ANFD *anfd = anfds + fd; 381 ANFD *anfd = anfds + fd;
355 struct ev_io *w; 382 struct ev_io *w;
356 383
357 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 384 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
358 { 385 {
359 int ev = w->events & events; 386 int ev = w->events & revents;
360 387
361 if (ev) 388 if (ev)
362 event (EV_A_ (W)w, ev); 389 ev_feed_event (EV_A_ (W)w, ev);
363 } 390 }
391}
392
393void
394ev_feed_fd_event (EV_P_ int fd, int revents)
395{
396 fd_event (EV_A_ fd, revents);
364} 397}
365 398
366/*****************************************************************************/ 399/*****************************************************************************/
367 400
368static void 401static void
… …
379 int events = 0; 412 int events = 0;
380 413
381 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 414 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
382 events |= w->events; 415 events |= w->events;
383 416
417#if EV_SELECT_IS_WINSOCKET
418 if (events)
419 {
420 unsigned long argp;
421 anfd->handle = _get_osfhandle (fd);
422 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
423 }
424#endif
425
384 anfd->reify = 0; 426 anfd->reify = 0;
385 427
386 method_modify (EV_A_ fd, anfd->events, events); 428 method_modify (EV_A_ fd, anfd->events, events);
387 anfd->events = events; 429 anfd->events = events;
388 } 430 }
… …
397 return; 439 return;
398 440
399 anfds [fd].reify = 1; 441 anfds [fd].reify = 1;
400 442
401 ++fdchangecnt; 443 ++fdchangecnt;
402 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void)); 444 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
403 fdchanges [fdchangecnt - 1] = fd; 445 fdchanges [fdchangecnt - 1] = fd;
404} 446}
405 447
406static void 448static void
407fd_kill (EV_P_ int fd) 449fd_kill (EV_P_ int fd)
… …
409 struct ev_io *w; 451 struct ev_io *w;
410 452
411 while ((w = (struct ev_io *)anfds [fd].head)) 453 while ((w = (struct ev_io *)anfds [fd].head))
412 { 454 {
413 ev_io_stop (EV_A_ w); 455 ev_io_stop (EV_A_ w);
414 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 456 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
415 } 457 }
416} 458}
417 459
418static int 460static int
419fd_valid (int fd) 461fd_valid (int fd)
420{ 462{
421#ifdef WIN32 463#ifdef _WIN32
422 return !!win32_get_osfhandle (fd); 464 return _get_osfhandle (fd) != -1;
423#else 465#else
424 return fcntl (fd, F_GETFD) != -1; 466 return fcntl (fd, F_GETFD) != -1;
425#endif 467#endif
426} 468}
427 469
… …
507 549
508 heap [k] = w; 550 heap [k] = w;
509 ((W)heap [k])->active = k + 1; 551 ((W)heap [k])->active = k + 1;
510} 552}
511 553
554inline void
555adjustheap (WT *heap, int N, int k)
556{
557 upheap (heap, k);
558 downheap (heap, N, k);
559}
560
512/*****************************************************************************/ 561/*****************************************************************************/
513 562
514typedef struct 563typedef struct
515{ 564{
516 WL head; 565 WL head;
… …
537} 586}
538 587
539static void 588static void
540sighandler (int signum) 589sighandler (int signum)
541{ 590{
542#if WIN32 591#if _WIN32
543 signal (signum, sighandler); 592 signal (signum, sighandler);
544#endif 593#endif
545 594
546 signals [signum - 1].gotsig = 1; 595 signals [signum - 1].gotsig = 1;
547 596
… …
552 write (sigpipe [1], &signum, 1); 601 write (sigpipe [1], &signum, 1);
553 errno = old_errno; 602 errno = old_errno;
554 } 603 }
555} 604}
556 605
606void
607ev_feed_signal_event (EV_P_ int signum)
608{
609 WL w;
610
611#if EV_MULTIPLICITY
612 assert (("feeding signal events is only supported in the default loop", loop == default_loop));
613#endif
614
615 --signum;
616
617 if (signum < 0 || signum >= signalmax)
618 return;
619
620 signals [signum].gotsig = 0;
621
622 for (w = signals [signum].head; w; w = w->next)
623 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
624}
625
557static void 626static void
558sigcb (EV_P_ struct ev_io *iow, int revents) 627sigcb (EV_P_ struct ev_io *iow, int revents)
559{ 628{
560 WL w;
561 int signum; 629 int signum;
562 630
563 read (sigpipe [0], &revents, 1); 631 read (sigpipe [0], &revents, 1);
564 gotsig = 0; 632 gotsig = 0;
565 633
566 for (signum = signalmax; signum--; ) 634 for (signum = signalmax; signum--; )
567 if (signals [signum].gotsig) 635 if (signals [signum].gotsig)
568 { 636 ev_feed_signal_event (EV_A_ signum + 1);
569 signals [signum].gotsig = 0; 637}
570 638
571 for (w = signals [signum].head; w; w = w->next) 639inline void
572 event (EV_A_ (W)w, EV_SIGNAL); 640fd_intern (int fd)
573 } 641{
642#ifdef _WIN32
643 int arg = 1;
644 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
645#else
646 fcntl (fd, F_SETFD, FD_CLOEXEC);
647 fcntl (fd, F_SETFL, O_NONBLOCK);
648#endif
574} 649}
575 650
576static void 651static void
577siginit (EV_P) 652siginit (EV_P)
578{ 653{
579#ifndef WIN32 654 fd_intern (sigpipe [0]);
580 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 655 fd_intern (sigpipe [1]);
581 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
582
583 /* rather than sort out wether we really need nb, set it */
584 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
585 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
586#endif
587 656
588 ev_io_set (&sigev, sigpipe [0], EV_READ); 657 ev_io_set (&sigev, sigpipe [0], EV_READ);
589 ev_io_start (EV_A_ &sigev); 658 ev_io_start (EV_A_ &sigev);
590 ev_unref (EV_A); /* child watcher should not keep loop alive */ 659 ev_unref (EV_A); /* child watcher should not keep loop alive */
591} 660}
592 661
593/*****************************************************************************/ 662/*****************************************************************************/
594 663
595static struct ev_child *childs [PID_HASHSIZE]; 664static struct ev_child *childs [PID_HASHSIZE];
596 665
597#ifndef WIN32 666#ifndef _WIN32
598 667
599static struct ev_signal childev; 668static struct ev_signal childev;
600 669
601#ifndef WCONTINUED 670#ifndef WCONTINUED
602# define WCONTINUED 0 671# define WCONTINUED 0
… …
611 if (w->pid == pid || !w->pid) 680 if (w->pid == pid || !w->pid)
612 { 681 {
613 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 682 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
614 w->rpid = pid; 683 w->rpid = pid;
615 w->rstatus = status; 684 w->rstatus = status;
616 event (EV_A_ (W)w, EV_CHILD); 685 ev_feed_event (EV_A_ (W)w, EV_CHILD);
617 } 686 }
618} 687}
619 688
620static void 689static void
621childcb (EV_P_ struct ev_signal *sw, int revents) 690childcb (EV_P_ struct ev_signal *sw, int revents)
… …
623 int pid, status; 692 int pid, status;
624 693
625 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 694 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
626 { 695 {
627 /* make sure we are called again until all childs have been reaped */ 696 /* make sure we are called again until all childs have been reaped */
628 event (EV_A_ (W)sw, EV_SIGNAL); 697 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
629 698
630 child_reap (EV_A_ sw, pid, pid, status); 699 child_reap (EV_A_ sw, pid, pid, status);
631 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 700 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
632 } 701 }
633} 702}
… …
663 732
664/* return true if we are running with elevated privileges and should ignore env variables */ 733/* return true if we are running with elevated privileges and should ignore env variables */
665static int 734static int
666enable_secure (void) 735enable_secure (void)
667{ 736{
668#ifdef WIN32 737#ifdef _WIN32
669 return 0; 738 return 0;
670#else 739#else
671 return getuid () != geteuid () 740 return getuid () != geteuid ()
672 || getgid () != getegid (); 741 || getgid () != getegid ();
673#endif 742#endif
… …
690 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 759 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
691 have_monotonic = 1; 760 have_monotonic = 1;
692 } 761 }
693#endif 762#endif
694 763
695 rt_now = ev_time (); 764 ev_rt_now = ev_time ();
696 mn_now = get_clock (); 765 mn_now = get_clock ();
697 now_floor = mn_now; 766 now_floor = mn_now;
698 rtmn_diff = rt_now - mn_now; 767 rtmn_diff = ev_rt_now - mn_now;
699 768
700 if (methods == EVMETHOD_AUTO) 769 if (methods == EVMETHOD_AUTO)
701 if (!enable_secure () && getenv ("LIBEV_METHODS")) 770 if (!enable_secure () && getenv ("LIBEV_METHODS"))
702 methods = atoi (getenv ("LIBEV_METHODS")); 771 methods = atoi (getenv ("LIBEV_METHODS"));
703 else 772 else
704 methods = EVMETHOD_ANY; 773 methods = EVMETHOD_ANY;
705 774
706 method = 0; 775 method = 0;
707#if EV_USE_WIN32
708 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
709#endif
710#if EV_USE_KQUEUE 776#if EV_USE_KQUEUE
711 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
712#endif 778#endif
713#if EV_USE_EPOLL 779#if EV_USE_EPOLL
714 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
718#endif 784#endif
719#if EV_USE_SELECT 785#if EV_USE_SELECT
720 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
721#endif 787#endif
722 788
723 ev_watcher_init (&sigev, sigcb); 789 ev_init (&sigev, sigcb);
724 ev_set_priority (&sigev, EV_MAXPRI); 790 ev_set_priority (&sigev, EV_MAXPRI);
725 } 791 }
726} 792}
727 793
728void 794void
729loop_destroy (EV_P) 795loop_destroy (EV_P)
730{ 796{
731 int i; 797 int i;
732 798
733#if EV_USE_WIN32
734 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
735#endif
736#if EV_USE_KQUEUE 799#if EV_USE_KQUEUE
737 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
738#endif 801#endif
739#if EV_USE_EPOLL 802#if EV_USE_EPOLL
740 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
748 811
749 for (i = NUMPRI; i--; ) 812 for (i = NUMPRI; i--; )
750 array_free (pending, [i]); 813 array_free (pending, [i]);
751 814
752 /* have to use the microsoft-never-gets-it-right macro */ 815 /* have to use the microsoft-never-gets-it-right macro */
753 array_free_microshit (fdchange); 816 array_free (fdchange, EMPTY);
754 array_free_microshit (timer); 817 array_free (timer, EMPTY);
755 array_free_microshit (periodic); 818#if EV_PERIODICS
756 array_free_microshit (idle); 819 array_free (periodic, EMPTY);
757 array_free_microshit (prepare); 820#endif
758 array_free_microshit (check); 821 array_free (idle, EMPTY);
822 array_free (prepare, EMPTY);
823 array_free (check, EMPTY);
759 824
760 method = 0; 825 method = 0;
761} 826}
762 827
763static void 828static void
… …
818} 883}
819 884
820#endif 885#endif
821 886
822#if EV_MULTIPLICITY 887#if EV_MULTIPLICITY
823struct ev_loop default_loop_struct;
824static struct ev_loop *default_loop;
825
826struct ev_loop * 888struct ev_loop *
827#else 889#else
828static int default_loop;
829
830int 890int
831#endif 891#endif
832ev_default_loop (int methods) 892ev_default_loop (int methods)
833{ 893{
834 if (sigpipe [0] == sigpipe [1]) 894 if (sigpipe [0] == sigpipe [1])
… …
847 907
848 if (ev_method (EV_A)) 908 if (ev_method (EV_A))
849 { 909 {
850 siginit (EV_A); 910 siginit (EV_A);
851 911
852#ifndef WIN32 912#ifndef _WIN32
853 ev_signal_init (&childev, childcb, SIGCHLD); 913 ev_signal_init (&childev, childcb, SIGCHLD);
854 ev_set_priority (&childev, EV_MAXPRI); 914 ev_set_priority (&childev, EV_MAXPRI);
855 ev_signal_start (EV_A_ &childev); 915 ev_signal_start (EV_A_ &childev);
856 ev_unref (EV_A); /* child watcher should not keep loop alive */ 916 ev_unref (EV_A); /* child watcher should not keep loop alive */
857#endif 917#endif
… …
868{ 928{
869#if EV_MULTIPLICITY 929#if EV_MULTIPLICITY
870 struct ev_loop *loop = default_loop; 930 struct ev_loop *loop = default_loop;
871#endif 931#endif
872 932
873#ifndef WIN32 933#ifndef _WIN32
874 ev_ref (EV_A); /* child watcher */ 934 ev_ref (EV_A); /* child watcher */
875 ev_signal_stop (EV_A_ &childev); 935 ev_signal_stop (EV_A_ &childev);
876#endif 936#endif
877 937
878 ev_ref (EV_A); /* signal watcher */ 938 ev_ref (EV_A); /* signal watcher */
… …
894 if (method) 954 if (method)
895 postfork = 1; 955 postfork = 1;
896} 956}
897 957
898/*****************************************************************************/ 958/*****************************************************************************/
959
960static int
961any_pending (EV_P)
962{
963 int pri;
964
965 for (pri = NUMPRI; pri--; )
966 if (pendingcnt [pri])
967 return 1;
968
969 return 0;
970}
899 971
900static void 972static void
901call_pending (EV_P) 973call_pending (EV_P)
902{ 974{
903 int pri; 975 int pri;
… …
908 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 980 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
909 981
910 if (p->w) 982 if (p->w)
911 { 983 {
912 p->w->pending = 0; 984 p->w->pending = 0;
913 p->w->cb (EV_A_ p->w, p->events); 985 EV_CB_INVOKE (p->w, p->events);
914 } 986 }
915 } 987 }
916} 988}
917 989
918static void 990static void
… …
926 998
927 /* first reschedule or stop timer */ 999 /* first reschedule or stop timer */
928 if (w->repeat) 1000 if (w->repeat)
929 { 1001 {
930 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1002 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1003
931 ((WT)w)->at = mn_now + w->repeat; 1004 ((WT)w)->at += w->repeat;
1005 if (((WT)w)->at < mn_now)
1006 ((WT)w)->at = mn_now;
1007
932 downheap ((WT *)timers, timercnt, 0); 1008 downheap ((WT *)timers, timercnt, 0);
933 } 1009 }
934 else 1010 else
935 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1011 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
936 1012
937 event (EV_A_ (W)w, EV_TIMEOUT); 1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
938 } 1014 }
939} 1015}
940 1016
1017#if EV_PERIODICS
941static void 1018static void
942periodics_reify (EV_P) 1019periodics_reify (EV_P)
943{ 1020{
944 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
945 { 1022 {
946 struct ev_periodic *w = periodics [0]; 1023 struct ev_periodic *w = periodics [0];
947 1024
948 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1025 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
949 1026
950 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
951 if (w->interval) 1028 if (w->reschedule_cb)
952 { 1029 {
1030 ev_tstamp at = ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1031
1032 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1033 downheap ((WT *)periodics, periodiccnt, 0);
1034 }
1035 else if (w->interval)
1036 {
953 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1037 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
954 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1038 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
955 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
956 } 1040 }
957 else 1041 else
958 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1042 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
959 1043
960 event (EV_A_ (W)w, EV_PERIODIC); 1044 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
961 } 1045 }
962} 1046}
963 1047
964static void 1048static void
965periodics_reschedule (EV_P) 1049periodics_reschedule (EV_P)
… …
969 /* adjust periodics after time jump */ 1053 /* adjust periodics after time jump */
970 for (i = 0; i < periodiccnt; ++i) 1054 for (i = 0; i < periodiccnt; ++i)
971 { 1055 {
972 struct ev_periodic *w = periodics [i]; 1056 struct ev_periodic *w = periodics [i];
973 1057
1058 if (w->reschedule_cb)
1059 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
974 if (w->interval) 1060 else if (w->interval)
975 {
976 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1061 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
977
978 if (fabs (diff) >= 1e-4)
979 {
980 ev_periodic_stop (EV_A_ w);
981 ev_periodic_start (EV_A_ w);
982
983 i = 0; /* restart loop, inefficient, but time jumps should be rare */
984 }
985 }
986 } 1062 }
1063
1064 /* now rebuild the heap */
1065 for (i = periodiccnt >> 1; i--; )
1066 downheap ((WT *)periodics, periodiccnt, i);
987} 1067}
1068#endif
988 1069
989inline int 1070inline int
990time_update_monotonic (EV_P) 1071time_update_monotonic (EV_P)
991{ 1072{
992 mn_now = get_clock (); 1073 mn_now = get_clock ();
993 1074
994 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1075 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
995 { 1076 {
996 rt_now = rtmn_diff + mn_now; 1077 ev_rt_now = rtmn_diff + mn_now;
997 return 0; 1078 return 0;
998 } 1079 }
999 else 1080 else
1000 { 1081 {
1001 now_floor = mn_now; 1082 now_floor = mn_now;
1002 rt_now = ev_time (); 1083 ev_rt_now = ev_time ();
1003 return 1; 1084 return 1;
1004 } 1085 }
1005} 1086}
1006 1087
1007static void 1088static void
… …
1016 { 1097 {
1017 ev_tstamp odiff = rtmn_diff; 1098 ev_tstamp odiff = rtmn_diff;
1018 1099
1019 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1100 for (i = 4; --i; ) /* loop a few times, before making important decisions */
1020 { 1101 {
1021 rtmn_diff = rt_now - mn_now; 1102 rtmn_diff = ev_rt_now - mn_now;
1022 1103
1023 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1104 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1024 return; /* all is well */ 1105 return; /* all is well */
1025 1106
1026 rt_now = ev_time (); 1107 ev_rt_now = ev_time ();
1027 mn_now = get_clock (); 1108 mn_now = get_clock ();
1028 now_floor = mn_now; 1109 now_floor = mn_now;
1029 } 1110 }
1030 1111
1112# if EV_PERIODICS
1031 periodics_reschedule (EV_A); 1113 periodics_reschedule (EV_A);
1114# endif
1032 /* no timer adjustment, as the monotonic clock doesn't jump */ 1115 /* no timer adjustment, as the monotonic clock doesn't jump */
1033 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1116 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1034 } 1117 }
1035 } 1118 }
1036 else 1119 else
1037#endif 1120#endif
1038 { 1121 {
1039 rt_now = ev_time (); 1122 ev_rt_now = ev_time ();
1040 1123
1041 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1124 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
1042 { 1125 {
1126#if EV_PERIODICS
1043 periodics_reschedule (EV_A); 1127 periodics_reschedule (EV_A);
1128#endif
1044 1129
1045 /* adjust timers. this is easy, as the offset is the same for all */ 1130 /* adjust timers. this is easy, as the offset is the same for all */
1046 for (i = 0; i < timercnt; ++i) 1131 for (i = 0; i < timercnt; ++i)
1047 ((WT)timers [i])->at += rt_now - mn_now; 1132 ((WT)timers [i])->at += ev_rt_now - mn_now;
1048 } 1133 }
1049 1134
1050 mn_now = rt_now; 1135 mn_now = ev_rt_now;
1051 } 1136 }
1052} 1137}
1053 1138
1054void 1139void
1055ev_ref (EV_P) 1140ev_ref (EV_P)
… …
1087 /* update fd-related kernel structures */ 1172 /* update fd-related kernel structures */
1088 fd_reify (EV_A); 1173 fd_reify (EV_A);
1089 1174
1090 /* calculate blocking time */ 1175 /* calculate blocking time */
1091 1176
1092 /* we only need this for !monotonic clockor timers, but as we basically 1177 /* we only need this for !monotonic clock or timers, but as we basically
1093 always have timers, we just calculate it always */ 1178 always have timers, we just calculate it always */
1094#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
1095 if (expect_true (have_monotonic)) 1180 if (expect_true (have_monotonic))
1096 time_update_monotonic (EV_A); 1181 time_update_monotonic (EV_A);
1097 else 1182 else
1098#endif 1183#endif
1099 { 1184 {
1100 rt_now = ev_time (); 1185 ev_rt_now = ev_time ();
1101 mn_now = rt_now; 1186 mn_now = ev_rt_now;
1102 } 1187 }
1103 1188
1104 if (flags & EVLOOP_NONBLOCK || idlecnt) 1189 if (flags & EVLOOP_NONBLOCK || idlecnt)
1105 block = 0.; 1190 block = 0.;
1106 else 1191 else
… …
1111 { 1196 {
1112 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1113 if (block > to) block = to; 1198 if (block > to) block = to;
1114 } 1199 }
1115 1200
1201#if EV_PERIODICS
1116 if (periodiccnt) 1202 if (periodiccnt)
1117 { 1203 {
1118 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1119 if (block > to) block = to; 1205 if (block > to) block = to;
1120 } 1206 }
1207#endif
1121 1208
1122 if (block < 0.) block = 0.; 1209 if (block < 0.) block = 0.;
1123 } 1210 }
1124 1211
1125 method_poll (EV_A_ block); 1212 method_poll (EV_A_ block);
1126 1213
1127 /* update rt_now, do magic */ 1214 /* update ev_rt_now, do magic */
1128 time_update (EV_A); 1215 time_update (EV_A);
1129 1216
1130 /* queue pending timers and reschedule them */ 1217 /* queue pending timers and reschedule them */
1131 timers_reify (EV_A); /* relative timers called last */ 1218 timers_reify (EV_A); /* relative timers called last */
1219#if EV_PERIODICS
1132 periodics_reify (EV_A); /* absolute timers called first */ 1220 periodics_reify (EV_A); /* absolute timers called first */
1221#endif
1133 1222
1134 /* queue idle watchers unless io or timers are pending */ 1223 /* queue idle watchers unless io or timers are pending */
1135 if (!pendingcnt) 1224 if (idlecnt && !any_pending (EV_A))
1136 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1137 1226
1138 /* queue check watchers, to be executed first */ 1227 /* queue check watchers, to be executed first */
1139 if (checkcnt) 1228 if (checkcnt)
1140 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1215 return; 1304 return;
1216 1305
1217 assert (("ev_io_start called with negative fd", fd >= 0)); 1306 assert (("ev_io_start called with negative fd", fd >= 0));
1218 1307
1219 ev_start (EV_A_ (W)w, 1); 1308 ev_start (EV_A_ (W)w, 1);
1220 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1309 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1221 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1310 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1222 1311
1223 fd_change (EV_A_ fd); 1312 fd_change (EV_A_ fd);
1224} 1313}
1225 1314
… …
1228{ 1317{
1229 ev_clear_pending (EV_A_ (W)w); 1318 ev_clear_pending (EV_A_ (W)w);
1230 if (!ev_is_active (w)) 1319 if (!ev_is_active (w))
1231 return; 1320 return;
1232 1321
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323
1233 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1234 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1235 1326
1236 fd_change (EV_A_ w->fd); 1327 fd_change (EV_A_ w->fd);
1237} 1328}
… …
1245 ((WT)w)->at += mn_now; 1336 ((WT)w)->at += mn_now;
1246 1337
1247 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1338 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1248 1339
1249 ev_start (EV_A_ (W)w, ++timercnt); 1340 ev_start (EV_A_ (W)w, ++timercnt);
1250 array_needsize (timers, timermax, timercnt, (void)); 1341 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1251 timers [timercnt - 1] = w; 1342 timers [timercnt - 1] = w;
1252 upheap ((WT *)timers, timercnt - 1); 1343 upheap ((WT *)timers, timercnt - 1);
1253 1344
1254 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1345 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1255} 1346}
… …
1264 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1265 1356
1266 if (((W)w)->active < timercnt--) 1357 if (((W)w)->active < timercnt--)
1267 { 1358 {
1268 timers [((W)w)->active - 1] = timers [timercnt]; 1359 timers [((W)w)->active - 1] = timers [timercnt];
1269 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1270 } 1361 }
1271 1362
1272 ((WT)w)->at = w->repeat; 1363 ((WT)w)->at -= mn_now;
1273 1364
1274 ev_stop (EV_A_ (W)w); 1365 ev_stop (EV_A_ (W)w);
1275} 1366}
1276 1367
1277void 1368void
… …
1280 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1281 { 1372 {
1282 if (w->repeat) 1373 if (w->repeat)
1283 { 1374 {
1284 ((WT)w)->at = mn_now + w->repeat; 1375 ((WT)w)->at = mn_now + w->repeat;
1285 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1376 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1286 } 1377 }
1287 else 1378 else
1288 ev_timer_stop (EV_A_ w); 1379 ev_timer_stop (EV_A_ w);
1289 } 1380 }
1290 else if (w->repeat) 1381 else if (w->repeat)
1291 ev_timer_start (EV_A_ w); 1382 ev_timer_start (EV_A_ w);
1292} 1383}
1293 1384
1385#if EV_PERIODICS
1294void 1386void
1295ev_periodic_start (EV_P_ struct ev_periodic *w) 1387ev_periodic_start (EV_P_ struct ev_periodic *w)
1296{ 1388{
1297 if (ev_is_active (w)) 1389 if (ev_is_active (w))
1298 return; 1390 return;
1299 1391
1392 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval)
1395 {
1300 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1396 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1301
1302 /* this formula differs from the one in periodic_reify because we do not always round up */ 1397 /* this formula differs from the one in periodic_reify because we do not always round up */
1303 if (w->interval)
1304 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1398 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1399 }
1305 1400
1306 ev_start (EV_A_ (W)w, ++periodiccnt); 1401 ev_start (EV_A_ (W)w, ++periodiccnt);
1307 array_needsize (periodics, periodicmax, periodiccnt, (void)); 1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1308 periodics [periodiccnt - 1] = w; 1403 periodics [periodiccnt - 1] = w;
1309 upheap ((WT *)periodics, periodiccnt - 1); 1404 upheap ((WT *)periodics, periodiccnt - 1);
1310 1405
1311 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1406 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1312} 1407}
… …
1321 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1322 1417
1323 if (((W)w)->active < periodiccnt--) 1418 if (((W)w)->active < periodiccnt--)
1324 { 1419 {
1325 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1420 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1326 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1327 } 1422 }
1328 1423
1329 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1330} 1425}
1331 1426
1332void 1427void
1428ev_periodic_again (EV_P_ struct ev_periodic *w)
1429{
1430 /* TODO: use adjustheap and recalculation */
1431 ev_periodic_stop (EV_A_ w);
1432 ev_periodic_start (EV_A_ w);
1433}
1434#endif
1435
1436void
1333ev_idle_start (EV_P_ struct ev_idle *w) 1437ev_idle_start (EV_P_ struct ev_idle *w)
1334{ 1438{
1335 if (ev_is_active (w)) 1439 if (ev_is_active (w))
1336 return; 1440 return;
1337 1441
1338 ev_start (EV_A_ (W)w, ++idlecnt); 1442 ev_start (EV_A_ (W)w, ++idlecnt);
1339 array_needsize (idles, idlemax, idlecnt, (void)); 1443 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1340 idles [idlecnt - 1] = w; 1444 idles [idlecnt - 1] = w;
1341} 1445}
1342 1446
1343void 1447void
1344ev_idle_stop (EV_P_ struct ev_idle *w) 1448ev_idle_stop (EV_P_ struct ev_idle *w)
1345{ 1449{
1346 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1347 if (ev_is_active (w)) 1451 if (!ev_is_active (w))
1348 return; 1452 return;
1349 1453
1350 idles [((W)w)->active - 1] = idles [--idlecnt]; 1454 idles [((W)w)->active - 1] = idles [--idlecnt];
1351 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1352} 1456}
… …
1356{ 1460{
1357 if (ev_is_active (w)) 1461 if (ev_is_active (w))
1358 return; 1462 return;
1359 1463
1360 ev_start (EV_A_ (W)w, ++preparecnt); 1464 ev_start (EV_A_ (W)w, ++preparecnt);
1361 array_needsize (prepares, preparemax, preparecnt, (void)); 1465 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1362 prepares [preparecnt - 1] = w; 1466 prepares [preparecnt - 1] = w;
1363} 1467}
1364 1468
1365void 1469void
1366ev_prepare_stop (EV_P_ struct ev_prepare *w) 1470ev_prepare_stop (EV_P_ struct ev_prepare *w)
1367{ 1471{
1368 ev_clear_pending (EV_A_ (W)w); 1472 ev_clear_pending (EV_A_ (W)w);
1369 if (ev_is_active (w)) 1473 if (!ev_is_active (w))
1370 return; 1474 return;
1371 1475
1372 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1476 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1373 ev_stop (EV_A_ (W)w); 1477 ev_stop (EV_A_ (W)w);
1374} 1478}
… …
1378{ 1482{
1379 if (ev_is_active (w)) 1483 if (ev_is_active (w))
1380 return; 1484 return;
1381 1485
1382 ev_start (EV_A_ (W)w, ++checkcnt); 1486 ev_start (EV_A_ (W)w, ++checkcnt);
1383 array_needsize (checks, checkmax, checkcnt, (void)); 1487 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1384 checks [checkcnt - 1] = w; 1488 checks [checkcnt - 1] = w;
1385} 1489}
1386 1490
1387void 1491void
1388ev_check_stop (EV_P_ struct ev_check *w) 1492ev_check_stop (EV_P_ struct ev_check *w)
1389{ 1493{
1390 ev_clear_pending (EV_A_ (W)w); 1494 ev_clear_pending (EV_A_ (W)w);
1391 if (ev_is_active (w)) 1495 if (!ev_is_active (w))
1392 return; 1496 return;
1393 1497
1394 checks [((W)w)->active - 1] = checks [--checkcnt]; 1498 checks [((W)w)->active - 1] = checks [--checkcnt];
1395 ev_stop (EV_A_ (W)w); 1499 ev_stop (EV_A_ (W)w);
1396} 1500}
… …
1409 return; 1513 return;
1410 1514
1411 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1515 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1412 1516
1413 ev_start (EV_A_ (W)w, 1); 1517 ev_start (EV_A_ (W)w, 1);
1414 array_needsize (signals, signalmax, w->signum, signals_init); 1518 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1415 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1519 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1416 1520
1417 if (!((WL)w)->next) 1521 if (!((WL)w)->next)
1418 { 1522 {
1419#if WIN32 1523#if _WIN32
1420 signal (w->signum, sighandler); 1524 signal (w->signum, sighandler);
1421#else 1525#else
1422 struct sigaction sa; 1526 struct sigaction sa;
1423 sa.sa_handler = sighandler; 1527 sa.sa_handler = sighandler;
1424 sigfillset (&sa.sa_mask); 1528 sigfillset (&sa.sa_mask);
… …
1457 1561
1458void 1562void
1459ev_child_stop (EV_P_ struct ev_child *w) 1563ev_child_stop (EV_P_ struct ev_child *w)
1460{ 1564{
1461 ev_clear_pending (EV_A_ (W)w); 1565 ev_clear_pending (EV_A_ (W)w);
1462 if (ev_is_active (w)) 1566 if (!ev_is_active (w))
1463 return; 1567 return;
1464 1568
1465 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1466 ev_stop (EV_A_ (W)w); 1570 ev_stop (EV_A_ (W)w);
1467} 1571}
… …
1502} 1606}
1503 1607
1504void 1608void
1505ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1609ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1506{ 1610{
1507 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1611 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1508 1612
1509 if (!once) 1613 if (!once)
1510 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1511 else 1615 else
1512 { 1616 {
1513 once->cb = cb; 1617 once->cb = cb;
1514 once->arg = arg; 1618 once->arg = arg;
1515 1619
1516 ev_watcher_init (&once->io, once_cb_io); 1620 ev_init (&once->io, once_cb_io);
1517 if (fd >= 0) 1621 if (fd >= 0)
1518 { 1622 {
1519 ev_io_set (&once->io, fd, events); 1623 ev_io_set (&once->io, fd, events);
1520 ev_io_start (EV_A_ &once->io); 1624 ev_io_start (EV_A_ &once->io);
1521 } 1625 }
1522 1626
1523 ev_watcher_init (&once->to, once_cb_to); 1627 ev_init (&once->to, once_cb_to);
1524 if (timeout >= 0.) 1628 if (timeout >= 0.)
1525 { 1629 {
1526 ev_timer_set (&once->to, timeout, 0.); 1630 ev_timer_set (&once->to, timeout, 0.);
1527 ev_timer_start (EV_A_ &once->to); 1631 ev_timer_start (EV_A_ &once->to);
1528 } 1632 }
1529 } 1633 }
1530} 1634}
1531 1635
1636#ifdef __cplusplus
1637}
1638#endif
1639

Diff Legend

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