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

Comparing libev/ev.c (file contents):
Revision 1.72 by root, Tue Nov 6 16:09:37 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
… …
66#include <sys/types.h> 75#include <sys/types.h>
67#include <time.h> 76#include <time.h>
68 77
69#include <signal.h> 78#include <signal.h>
70 79
71#ifndef WIN32 80#ifndef _WIN32
72# include <unistd.h> 81# include <unistd.h>
73# include <sys/time.h> 82# include <sys/time.h>
74# 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
75#endif 89# endif
90#endif
91
76/**/ 92/**/
77 93
78#ifndef EV_USE_MONOTONIC 94#ifndef EV_USE_MONOTONIC
79# define EV_USE_MONOTONIC 1 95# define EV_USE_MONOTONIC 1
80#endif 96#endif
81 97
82#ifndef EV_USE_SELECT 98#ifndef EV_USE_SELECT
83# define EV_USE_SELECT 1 99# define EV_USE_SELECT 1
100# define EV_SELECT_USE_FD_SET 1
84#endif 101#endif
85 102
86#ifndef EV_USE_POLL 103#ifndef EV_USE_POLL
87# 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
88#endif 109#endif
89 110
90#ifndef EV_USE_EPOLL 111#ifndef EV_USE_EPOLL
91# define EV_USE_EPOLL 0 112# define EV_USE_EPOLL 0
92#endif 113#endif
93 114
94#ifndef EV_USE_KQUEUE 115#ifndef EV_USE_KQUEUE
95# define EV_USE_KQUEUE 0 116# define EV_USE_KQUEUE 0
96#endif
97
98#ifndef EV_USE_WIN32
99# ifdef WIN32
100# define EV_USE_WIN32 0 /* it does not exist, use select */
101# undef EV_USE_SELECT
102# define EV_USE_SELECT 1
103# else
104# define EV_USE_WIN32 0
105# endif
106#endif 117#endif
107 118
108#ifndef EV_USE_REALTIME 119#ifndef EV_USE_REALTIME
109# define EV_USE_REALTIME 1 120# define EV_USE_REALTIME 1
110#endif 121#endif
… …
117#endif 128#endif
118 129
119#ifndef CLOCK_REALTIME 130#ifndef CLOCK_REALTIME
120# undef EV_USE_REALTIME 131# undef EV_USE_REALTIME
121# define EV_USE_REALTIME 0 132# define EV_USE_REALTIME 0
133#endif
134
135#if EV_SELECT_IS_WINSOCKET
136# include <winsock.h>
122#endif 137#endif
123 138
124/**/ 139/**/
125 140
126#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) */
127#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) */
128#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 */
129/*#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 */
130 145
146#ifdef EV_H
147# include EV_H
148#else
131#include "ev.h" 149# include "ev.h"
150#endif
132 151
133#if __GNUC__ >= 3 152#if __GNUC__ >= 3
134# define expect(expr,value) __builtin_expect ((expr),(value)) 153# define expect(expr,value) __builtin_expect ((expr),(value))
135# define inline inline 154# define inline inline
136#else 155#else
… …
142#define expect_true(expr) expect ((expr) != 0, 1) 161#define expect_true(expr) expect ((expr) != 0, 1)
143 162
144#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 163#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
145#define ABSPRI(w) ((w)->priority - EV_MINPRI) 164#define ABSPRI(w) ((w)->priority - EV_MINPRI)
146 165
166#define EMPTY /* required for microsofts broken pseudo-c compiler */
167
147typedef struct ev_watcher *W; 168typedef struct ev_watcher *W;
148typedef struct ev_watcher_list *WL; 169typedef struct ev_watcher_list *WL;
149typedef struct ev_watcher_time *WT; 170typedef struct ev_watcher_time *WT;
150 171
151static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 172static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
152 173
153#if WIN32 174#ifdef _WIN32
154/* note: the comment below could not be substantiated, but what would I care */ 175# include "ev_win32.c"
155/* MSDN says this is required to handle SIGFPE */
156volatile double SIGFPE_REQ = 0.0f;
157
158static int
159ev_socketpair_tcp (int filedes [2])
160{
161 struct sockaddr_in addr = { 0 };
162 int addr_size = sizeof (addr);
163 SOCKET listener;
164 SOCKET sock [2] = { -1, -1 };
165
166 if ((listener = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
167 return -1;
168
169 addr.sin_family = AF_INET;
170 addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
171 addr.sin_port = 0;
172
173 if (bind (listener, (struct sockaddr *)&addr, addr_size))
174 goto fail;
175
176 if (getsockname(listener, (struct sockaddr *)&addr, &addr_size))
177 goto fail;
178
179 if (listen (listener, 1))
180 goto fail;
181
182 if ((sock [0] = socket (AF_INET, SOCK_STREAM, 0)) == INVALID_SOCKET)
183 goto fail;
184
185 if (connect (sock[0], (struct sockaddr *)&addr, addr_size))
186 goto fail;
187
188 if ((sock[1] = accept (listener, 0, 0)) < 0)
189 goto fail;
190
191 closesocket (listener);
192
193 filedes [0] = sock [0];
194 filedes [1] = sock [1];
195
196 return 0;
197
198fail:
199 closesocket (listener);
200
201 if (sock [0] != INVALID_SOCKET) closesocket (sock [0]);
202 if (sock [1] != INVALID_SOCKET) closesocket (sock [1]);
203
204 return -1;
205}
206
207# define ev_pipe(filedes) ev_socketpair_tcp (filedes)
208#else
209# define ev_pipe(filedes) pipe (filedes)
210#endif 176#endif
211 177
212/*****************************************************************************/ 178/*****************************************************************************/
213 179
214static void (*syserr_cb)(const char *msg); 180static void (*syserr_cb)(const char *msg);
… …
262typedef struct 228typedef struct
263{ 229{
264 WL head; 230 WL head;
265 unsigned char events; 231 unsigned char events;
266 unsigned char reify; 232 unsigned char reify;
233#if EV_SELECT_IS_WINSOCKET
234 SOCKET handle;
235#endif
267} ANFD; 236} ANFD;
268 237
269typedef struct 238typedef struct
270{ 239{
271 W w; 240 W w;
272 int events; 241 int events;
273} ANPENDING; 242} ANPENDING;
274 243
275#if EV_MULTIPLICITY 244#if EV_MULTIPLICITY
276 245
277struct ev_loop 246 struct ev_loop
278{ 247 {
248 ev_tstamp ev_rt_now;
249 #define ev_rt_now ((loop)->ev_rt_now)
279# define VAR(name,decl) decl; 250 #define VAR(name,decl) decl;
280# include "ev_vars.h" 251 #include "ev_vars.h"
281};
282# undef VAR 252 #undef VAR
253 };
283# include "ev_wrap.h" 254 #include "ev_wrap.h"
255
256 struct ev_loop default_loop_struct;
257 static struct ev_loop *default_loop;
284 258
285#else 259#else
286 260
261 ev_tstamp ev_rt_now;
287# define VAR(name,decl) static decl; 262 #define VAR(name,decl) static decl;
288# include "ev_vars.h" 263 #include "ev_vars.h"
289# undef VAR 264 #undef VAR
265
266 static int default_loop;
290 267
291#endif 268#endif
292 269
293/*****************************************************************************/ 270/*****************************************************************************/
294 271
295inline ev_tstamp 272ev_tstamp
296ev_time (void) 273ev_time (void)
297{ 274{
298#if EV_USE_REALTIME 275#if EV_USE_REALTIME
299 struct timespec ts; 276 struct timespec ts;
300 clock_gettime (CLOCK_REALTIME, &ts); 277 clock_gettime (CLOCK_REALTIME, &ts);
… …
319#endif 296#endif
320 297
321 return ev_time (); 298 return ev_time ();
322} 299}
323 300
301#if EV_MULTIPLICITY
324ev_tstamp 302ev_tstamp
325ev_now (EV_P) 303ev_now (EV_P)
326{ 304{
327 return rt_now; 305 return ev_rt_now;
328} 306}
307#endif
329 308
330#define array_roundsize(base,n) ((n) | 4 & ~3) 309#define array_roundsize(type,n) ((n) | 4 & ~3)
331 310
332#define array_needsize(base,cur,cnt,init) \ 311#define array_needsize(type,base,cur,cnt,init) \
333 if (expect_false ((cnt) > cur)) \ 312 if (expect_false ((cnt) > cur)) \
334 { \ 313 { \
335 int newcnt = cur; \ 314 int newcnt = cur; \
336 do \ 315 do \
337 { \ 316 { \
338 newcnt = array_roundsize (base, newcnt << 1); \ 317 newcnt = array_roundsize (type, newcnt << 1); \
339 } \ 318 } \
340 while ((cnt) > newcnt); \ 319 while ((cnt) > newcnt); \
341 \ 320 \
342 base = ev_realloc (base, sizeof (*base) * (newcnt)); \ 321 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
343 init (base + cur, newcnt - cur); \ 322 init (base + cur, newcnt - cur); \
344 cur = newcnt; \ 323 cur = newcnt; \
345 } 324 }
346 325
347#define array_slim(stem) \ 326#define array_slim(type,stem) \
348 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 327 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
349 { \ 328 { \
350 stem ## max = array_roundsize (stem ## cnt >> 1); \ 329 stem ## max = array_roundsize (stem ## cnt >> 1); \
351 base = ev_realloc (base, sizeof (*base) * (stem ## max)); \ 330 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
352 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 331 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
353 } 332 }
354
355/* microsoft's pseudo-c is quite far from C as the rest of the world and the standard knows it */
356/* bringing us everlasting joy in form of stupid extra macros that are not required in C */
357#define array_free_microshit(stem) \
358 ev_free (stem ## s); stem ## cnt = stem ## max = 0;
359 333
360#define array_free(stem, idx) \ 334#define array_free(stem, idx) \
361 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;
362 336
363/*****************************************************************************/ 337/*****************************************************************************/
… …
373 347
374 ++base; 348 ++base;
375 } 349 }
376} 350}
377 351
378static void 352void
379event (EV_P_ W w, int events) 353ev_feed_event (EV_P_ void *w, int revents)
380{ 354{
355 W w_ = (W)w;
356
381 if (w->pending) 357 if (w_->pending)
382 { 358 {
383 pendings [ABSPRI (w)][w->pending - 1].events |= events; 359 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
384 return; 360 return;
385 } 361 }
386 362
387 w->pending = ++pendingcnt [ABSPRI (w)]; 363 w_->pending = ++pendingcnt [ABSPRI (w_)];
388 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));
389 pendings [ABSPRI (w)][w->pending - 1].w = w; 365 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
390 pendings [ABSPRI (w)][w->pending - 1].events = events; 366 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
391} 367}
392 368
393static void 369static void
394queue_events (EV_P_ W *events, int eventcnt, int type) 370queue_events (EV_P_ W *events, int eventcnt, int type)
395{ 371{
396 int i; 372 int i;
397 373
398 for (i = 0; i < eventcnt; ++i) 374 for (i = 0; i < eventcnt; ++i)
399 event (EV_A_ events [i], type); 375 ev_feed_event (EV_A_ events [i], type);
400} 376}
401 377
402static void 378inline void
403fd_event (EV_P_ int fd, int events) 379fd_event (EV_P_ int fd, int revents)
404{ 380{
405 ANFD *anfd = anfds + fd; 381 ANFD *anfd = anfds + fd;
406 struct ev_io *w; 382 struct ev_io *w;
407 383
408 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)
409 { 385 {
410 int ev = w->events & events; 386 int ev = w->events & revents;
411 387
412 if (ev) 388 if (ev)
413 event (EV_A_ (W)w, ev); 389 ev_feed_event (EV_A_ (W)w, ev);
414 } 390 }
391}
392
393void
394ev_feed_fd_event (EV_P_ int fd, int revents)
395{
396 fd_event (EV_A_ fd, revents);
415} 397}
416 398
417/*****************************************************************************/ 399/*****************************************************************************/
418 400
419static void 401static void
… …
430 int events = 0; 412 int events = 0;
431 413
432 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)
433 events |= w->events; 415 events |= w->events;
434 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
435 anfd->reify = 0; 426 anfd->reify = 0;
436 427
437 method_modify (EV_A_ fd, anfd->events, events); 428 method_modify (EV_A_ fd, anfd->events, events);
438 anfd->events = events; 429 anfd->events = events;
439 } 430 }
… …
448 return; 439 return;
449 440
450 anfds [fd].reify = 1; 441 anfds [fd].reify = 1;
451 442
452 ++fdchangecnt; 443 ++fdchangecnt;
453 array_needsize (fdchanges, fdchangemax, fdchangecnt, (void)); 444 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, (void));
454 fdchanges [fdchangecnt - 1] = fd; 445 fdchanges [fdchangecnt - 1] = fd;
455} 446}
456 447
457static void 448static void
458fd_kill (EV_P_ int fd) 449fd_kill (EV_P_ int fd)
… …
460 struct ev_io *w; 451 struct ev_io *w;
461 452
462 while ((w = (struct ev_io *)anfds [fd].head)) 453 while ((w = (struct ev_io *)anfds [fd].head))
463 { 454 {
464 ev_io_stop (EV_A_ w); 455 ev_io_stop (EV_A_ w);
465 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);
466 } 457 }
467} 458}
468 459
469static int 460static int
470fd_valid (int fd) 461fd_valid (int fd)
471{ 462{
472#ifdef WIN32 463#ifdef _WIN32
473 return !!win32_get_osfhandle (fd); 464 return _get_osfhandle (fd) != -1;
474#else 465#else
475 return fcntl (fd, F_GETFD) != -1; 466 return fcntl (fd, F_GETFD) != -1;
476#endif 467#endif
477} 468}
478 469
… …
558 549
559 heap [k] = w; 550 heap [k] = w;
560 ((W)heap [k])->active = k + 1; 551 ((W)heap [k])->active = k + 1;
561} 552}
562 553
554inline void
555adjustheap (WT *heap, int N, int k)
556{
557 upheap (heap, k);
558 downheap (heap, N, k);
559}
560
563/*****************************************************************************/ 561/*****************************************************************************/
564 562
565typedef struct 563typedef struct
566{ 564{
567 WL head; 565 WL head;
… …
588} 586}
589 587
590static void 588static void
591sighandler (int signum) 589sighandler (int signum)
592{ 590{
593#if WIN32 591#if _WIN32
594 signal (signum, sighandler); 592 signal (signum, sighandler);
595#endif 593#endif
596 594
597 signals [signum - 1].gotsig = 1; 595 signals [signum - 1].gotsig = 1;
598 596
… …
603 write (sigpipe [1], &signum, 1); 601 write (sigpipe [1], &signum, 1);
604 errno = old_errno; 602 errno = old_errno;
605 } 603 }
606} 604}
607 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
608static void 626static void
609sigcb (EV_P_ struct ev_io *iow, int revents) 627sigcb (EV_P_ struct ev_io *iow, int revents)
610{ 628{
611 WL w;
612 int signum; 629 int signum;
613 630
614 read (sigpipe [0], &revents, 1); 631 read (sigpipe [0], &revents, 1);
615 gotsig = 0; 632 gotsig = 0;
616 633
617 for (signum = signalmax; signum--; ) 634 for (signum = signalmax; signum--; )
618 if (signals [signum].gotsig) 635 if (signals [signum].gotsig)
619 { 636 ev_feed_signal_event (EV_A_ signum + 1);
620 signals [signum].gotsig = 0; 637}
621 638
622 for (w = signals [signum].head; w; w = w->next) 639inline void
623 event (EV_A_ (W)w, EV_SIGNAL); 640fd_intern (int fd)
624 } 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
625} 649}
626 650
627static void 651static void
628siginit (EV_P) 652siginit (EV_P)
629{ 653{
630#ifndef WIN32 654 fd_intern (sigpipe [0]);
631 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 655 fd_intern (sigpipe [1]);
632 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
633
634 /* rather than sort out wether we really need nb, set it */
635 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
636 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
637#endif
638 656
639 ev_io_set (&sigev, sigpipe [0], EV_READ); 657 ev_io_set (&sigev, sigpipe [0], EV_READ);
640 ev_io_start (EV_A_ &sigev); 658 ev_io_start (EV_A_ &sigev);
641 ev_unref (EV_A); /* child watcher should not keep loop alive */ 659 ev_unref (EV_A); /* child watcher should not keep loop alive */
642} 660}
643 661
644/*****************************************************************************/ 662/*****************************************************************************/
645 663
646static struct ev_child *childs [PID_HASHSIZE]; 664static struct ev_child *childs [PID_HASHSIZE];
647 665
648#ifndef WIN32 666#ifndef _WIN32
649 667
650static struct ev_signal childev; 668static struct ev_signal childev;
651 669
652#ifndef WCONTINUED 670#ifndef WCONTINUED
653# define WCONTINUED 0 671# define WCONTINUED 0
… …
662 if (w->pid == pid || !w->pid) 680 if (w->pid == pid || !w->pid)
663 { 681 {
664 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 682 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
665 w->rpid = pid; 683 w->rpid = pid;
666 w->rstatus = status; 684 w->rstatus = status;
667 event (EV_A_ (W)w, EV_CHILD); 685 ev_feed_event (EV_A_ (W)w, EV_CHILD);
668 } 686 }
669} 687}
670 688
671static void 689static void
672childcb (EV_P_ struct ev_signal *sw, int revents) 690childcb (EV_P_ struct ev_signal *sw, int revents)
… …
674 int pid, status; 692 int pid, status;
675 693
676 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 694 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
677 { 695 {
678 /* 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 */
679 event (EV_A_ (W)sw, EV_SIGNAL); 697 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
680 698
681 child_reap (EV_A_ sw, pid, pid, status); 699 child_reap (EV_A_ sw, pid, pid, status);
682 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 */
683 } 701 }
684} 702}
… …
714 732
715/* 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 */
716static int 734static int
717enable_secure (void) 735enable_secure (void)
718{ 736{
719#ifdef WIN32 737#ifdef _WIN32
720 return 0; 738 return 0;
721#else 739#else
722 return getuid () != geteuid () 740 return getuid () != geteuid ()
723 || getgid () != getegid (); 741 || getgid () != getegid ();
724#endif 742#endif
… …
741 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 759 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
742 have_monotonic = 1; 760 have_monotonic = 1;
743 } 761 }
744#endif 762#endif
745 763
746 rt_now = ev_time (); 764 ev_rt_now = ev_time ();
747 mn_now = get_clock (); 765 mn_now = get_clock ();
748 now_floor = mn_now; 766 now_floor = mn_now;
749 rtmn_diff = rt_now - mn_now; 767 rtmn_diff = ev_rt_now - mn_now;
750 768
751 if (methods == EVMETHOD_AUTO) 769 if (methods == EVMETHOD_AUTO)
752 if (!enable_secure () && getenv ("LIBEV_METHODS")) 770 if (!enable_secure () && getenv ("LIBEV_METHODS"))
753 methods = atoi (getenv ("LIBEV_METHODS")); 771 methods = atoi (getenv ("LIBEV_METHODS"));
754 else 772 else
755 methods = EVMETHOD_ANY; 773 methods = EVMETHOD_ANY;
756 774
757 method = 0; 775 method = 0;
758#if EV_USE_WIN32
759 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods);
760#endif
761#if EV_USE_KQUEUE 776#if EV_USE_KQUEUE
762 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 777 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
763#endif 778#endif
764#if EV_USE_EPOLL 779#if EV_USE_EPOLL
765 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 780 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
… …
769#endif 784#endif
770#if EV_USE_SELECT 785#if EV_USE_SELECT
771 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 786 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
772#endif 787#endif
773 788
774 ev_watcher_init (&sigev, sigcb); 789 ev_init (&sigev, sigcb);
775 ev_set_priority (&sigev, EV_MAXPRI); 790 ev_set_priority (&sigev, EV_MAXPRI);
776 } 791 }
777} 792}
778 793
779void 794void
780loop_destroy (EV_P) 795loop_destroy (EV_P)
781{ 796{
782 int i; 797 int i;
783 798
784#if EV_USE_WIN32
785 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A);
786#endif
787#if EV_USE_KQUEUE 799#if EV_USE_KQUEUE
788 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 800 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
789#endif 801#endif
790#if EV_USE_EPOLL 802#if EV_USE_EPOLL
791 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 803 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A);
… …
799 811
800 for (i = NUMPRI; i--; ) 812 for (i = NUMPRI; i--; )
801 array_free (pending, [i]); 813 array_free (pending, [i]);
802 814
803 /* have to use the microsoft-never-gets-it-right macro */ 815 /* have to use the microsoft-never-gets-it-right macro */
804 array_free_microshit (fdchange); 816 array_free (fdchange, EMPTY);
805 array_free_microshit (timer); 817 array_free (timer, EMPTY);
806 array_free_microshit (periodic); 818#if EV_PERIODICS
807 array_free_microshit (idle); 819 array_free (periodic, EMPTY);
808 array_free_microshit (prepare); 820#endif
809 array_free_microshit (check); 821 array_free (idle, EMPTY);
822 array_free (prepare, EMPTY);
823 array_free (check, EMPTY);
810 824
811 method = 0; 825 method = 0;
812} 826}
813 827
814static void 828static void
… …
828 ev_ref (EV_A); 842 ev_ref (EV_A);
829 ev_io_stop (EV_A_ &sigev); 843 ev_io_stop (EV_A_ &sigev);
830 close (sigpipe [0]); 844 close (sigpipe [0]);
831 close (sigpipe [1]); 845 close (sigpipe [1]);
832 846
833 while (ev_pipe (sigpipe)) 847 while (pipe (sigpipe))
834 syserr ("(libev) error creating pipe"); 848 syserr ("(libev) error creating pipe");
835 849
836 siginit (EV_A); 850 siginit (EV_A);
837 } 851 }
838 852
… …
869} 883}
870 884
871#endif 885#endif
872 886
873#if EV_MULTIPLICITY 887#if EV_MULTIPLICITY
874struct ev_loop default_loop_struct;
875static struct ev_loop *default_loop;
876
877struct ev_loop * 888struct ev_loop *
878#else 889#else
879static int default_loop;
880
881int 890int
882#endif 891#endif
883ev_default_loop (int methods) 892ev_default_loop (int methods)
884{ 893{
885 if (sigpipe [0] == sigpipe [1]) 894 if (sigpipe [0] == sigpipe [1])
886 if (ev_pipe (sigpipe)) 895 if (pipe (sigpipe))
887 return 0; 896 return 0;
888 897
889 if (!default_loop) 898 if (!default_loop)
890 { 899 {
891#if EV_MULTIPLICITY 900#if EV_MULTIPLICITY
… …
898 907
899 if (ev_method (EV_A)) 908 if (ev_method (EV_A))
900 { 909 {
901 siginit (EV_A); 910 siginit (EV_A);
902 911
903#ifndef WIN32 912#ifndef _WIN32
904 ev_signal_init (&childev, childcb, SIGCHLD); 913 ev_signal_init (&childev, childcb, SIGCHLD);
905 ev_set_priority (&childev, EV_MAXPRI); 914 ev_set_priority (&childev, EV_MAXPRI);
906 ev_signal_start (EV_A_ &childev); 915 ev_signal_start (EV_A_ &childev);
907 ev_unref (EV_A); /* child watcher should not keep loop alive */ 916 ev_unref (EV_A); /* child watcher should not keep loop alive */
908#endif 917#endif
… …
919{ 928{
920#if EV_MULTIPLICITY 929#if EV_MULTIPLICITY
921 struct ev_loop *loop = default_loop; 930 struct ev_loop *loop = default_loop;
922#endif 931#endif
923 932
924#ifndef WIN32 933#ifndef _WIN32
925 ev_ref (EV_A); /* child watcher */ 934 ev_ref (EV_A); /* child watcher */
926 ev_signal_stop (EV_A_ &childev); 935 ev_signal_stop (EV_A_ &childev);
927#endif 936#endif
928 937
929 ev_ref (EV_A); /* signal watcher */ 938 ev_ref (EV_A); /* signal watcher */
… …
945 if (method) 954 if (method)
946 postfork = 1; 955 postfork = 1;
947} 956}
948 957
949/*****************************************************************************/ 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}
950 971
951static void 972static void
952call_pending (EV_P) 973call_pending (EV_P)
953{ 974{
954 int pri; 975 int pri;
… …
959 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 980 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
960 981
961 if (p->w) 982 if (p->w)
962 { 983 {
963 p->w->pending = 0; 984 p->w->pending = 0;
964 p->w->cb (EV_A_ p->w, p->events); 985 EV_CB_INVOKE (p->w, p->events);
965 } 986 }
966 } 987 }
967} 988}
968 989
969static void 990static void
… …
977 998
978 /* first reschedule or stop timer */ 999 /* first reschedule or stop timer */
979 if (w->repeat) 1000 if (w->repeat)
980 { 1001 {
981 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
982 ((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
983 downheap ((WT *)timers, timercnt, 0); 1008 downheap ((WT *)timers, timercnt, 0);
984 } 1009 }
985 else 1010 else
986 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1011 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
987 1012
988 event (EV_A_ (W)w, EV_TIMEOUT); 1013 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
989 } 1014 }
990} 1015}
991 1016
1017#if EV_PERIODICS
992static void 1018static void
993periodics_reify (EV_P) 1019periodics_reify (EV_P)
994{ 1020{
995 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1021 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
996 { 1022 {
997 struct ev_periodic *w = periodics [0]; 1023 struct ev_periodic *w = periodics [0];
998 1024
999 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1025 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
1000 1026
1001 /* first reschedule or stop timer */ 1027 /* first reschedule or stop timer */
1002 if (w->interval) 1028 if (w->reschedule_cb)
1003 { 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 {
1004 ((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;
1005 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));
1006 downheap ((WT *)periodics, periodiccnt, 0); 1039 downheap ((WT *)periodics, periodiccnt, 0);
1007 } 1040 }
1008 else 1041 else
1009 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1042 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
1010 1043
1011 event (EV_A_ (W)w, EV_PERIODIC); 1044 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
1012 } 1045 }
1013} 1046}
1014 1047
1015static void 1048static void
1016periodics_reschedule (EV_P) 1049periodics_reschedule (EV_P)
… …
1020 /* adjust periodics after time jump */ 1053 /* adjust periodics after time jump */
1021 for (i = 0; i < periodiccnt; ++i) 1054 for (i = 0; i < periodiccnt; ++i)
1022 { 1055 {
1023 struct ev_periodic *w = periodics [i]; 1056 struct ev_periodic *w = periodics [i];
1024 1057
1058 if (w->reschedule_cb)
1059 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1025 if (w->interval) 1060 else if (w->interval)
1026 {
1027 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;
1028
1029 if (fabs (diff) >= 1e-4)
1030 {
1031 ev_periodic_stop (EV_A_ w);
1032 ev_periodic_start (EV_A_ w);
1033
1034 i = 0; /* restart loop, inefficient, but time jumps should be rare */
1035 }
1036 }
1037 } 1062 }
1063
1064 /* now rebuild the heap */
1065 for (i = periodiccnt >> 1; i--; )
1066 downheap ((WT *)periodics, periodiccnt, i);
1038} 1067}
1068#endif
1039 1069
1040inline int 1070inline int
1041time_update_monotonic (EV_P) 1071time_update_monotonic (EV_P)
1042{ 1072{
1043 mn_now = get_clock (); 1073 mn_now = get_clock ();
1044 1074
1045 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1075 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
1046 { 1076 {
1047 rt_now = rtmn_diff + mn_now; 1077 ev_rt_now = rtmn_diff + mn_now;
1048 return 0; 1078 return 0;
1049 } 1079 }
1050 else 1080 else
1051 { 1081 {
1052 now_floor = mn_now; 1082 now_floor = mn_now;
1053 rt_now = ev_time (); 1083 ev_rt_now = ev_time ();
1054 return 1; 1084 return 1;
1055 } 1085 }
1056} 1086}
1057 1087
1058static void 1088static void
… …
1067 { 1097 {
1068 ev_tstamp odiff = rtmn_diff; 1098 ev_tstamp odiff = rtmn_diff;
1069 1099
1070 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 */
1071 { 1101 {
1072 rtmn_diff = rt_now - mn_now; 1102 rtmn_diff = ev_rt_now - mn_now;
1073 1103
1074 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1104 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
1075 return; /* all is well */ 1105 return; /* all is well */
1076 1106
1077 rt_now = ev_time (); 1107 ev_rt_now = ev_time ();
1078 mn_now = get_clock (); 1108 mn_now = get_clock ();
1079 now_floor = mn_now; 1109 now_floor = mn_now;
1080 } 1110 }
1081 1111
1112# if EV_PERIODICS
1082 periodics_reschedule (EV_A); 1113 periodics_reschedule (EV_A);
1114# endif
1083 /* no timer adjustment, as the monotonic clock doesn't jump */ 1115 /* no timer adjustment, as the monotonic clock doesn't jump */
1084 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1116 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
1085 } 1117 }
1086 } 1118 }
1087 else 1119 else
1088#endif 1120#endif
1089 { 1121 {
1090 rt_now = ev_time (); 1122 ev_rt_now = ev_time ();
1091 1123
1092 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))
1093 { 1125 {
1126#if EV_PERIODICS
1094 periodics_reschedule (EV_A); 1127 periodics_reschedule (EV_A);
1128#endif
1095 1129
1096 /* 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 */
1097 for (i = 0; i < timercnt; ++i) 1131 for (i = 0; i < timercnt; ++i)
1098 ((WT)timers [i])->at += rt_now - mn_now; 1132 ((WT)timers [i])->at += ev_rt_now - mn_now;
1099 } 1133 }
1100 1134
1101 mn_now = rt_now; 1135 mn_now = ev_rt_now;
1102 } 1136 }
1103} 1137}
1104 1138
1105void 1139void
1106ev_ref (EV_P) 1140ev_ref (EV_P)
… …
1138 /* update fd-related kernel structures */ 1172 /* update fd-related kernel structures */
1139 fd_reify (EV_A); 1173 fd_reify (EV_A);
1140 1174
1141 /* calculate blocking time */ 1175 /* calculate blocking time */
1142 1176
1143 /* 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
1144 always have timers, we just calculate it always */ 1178 always have timers, we just calculate it always */
1145#if EV_USE_MONOTONIC 1179#if EV_USE_MONOTONIC
1146 if (expect_true (have_monotonic)) 1180 if (expect_true (have_monotonic))
1147 time_update_monotonic (EV_A); 1181 time_update_monotonic (EV_A);
1148 else 1182 else
1149#endif 1183#endif
1150 { 1184 {
1151 rt_now = ev_time (); 1185 ev_rt_now = ev_time ();
1152 mn_now = rt_now; 1186 mn_now = ev_rt_now;
1153 } 1187 }
1154 1188
1155 if (flags & EVLOOP_NONBLOCK || idlecnt) 1189 if (flags & EVLOOP_NONBLOCK || idlecnt)
1156 block = 0.; 1190 block = 0.;
1157 else 1191 else
… …
1162 { 1196 {
1163 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1197 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1164 if (block > to) block = to; 1198 if (block > to) block = to;
1165 } 1199 }
1166 1200
1201#if EV_PERIODICS
1167 if (periodiccnt) 1202 if (periodiccnt)
1168 { 1203 {
1169 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1204 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1170 if (block > to) block = to; 1205 if (block > to) block = to;
1171 } 1206 }
1207#endif
1172 1208
1173 if (block < 0.) block = 0.; 1209 if (block < 0.) block = 0.;
1174 } 1210 }
1175 1211
1176 method_poll (EV_A_ block); 1212 method_poll (EV_A_ block);
1177 1213
1178 /* update rt_now, do magic */ 1214 /* update ev_rt_now, do magic */
1179 time_update (EV_A); 1215 time_update (EV_A);
1180 1216
1181 /* queue pending timers and reschedule them */ 1217 /* queue pending timers and reschedule them */
1182 timers_reify (EV_A); /* relative timers called last */ 1218 timers_reify (EV_A); /* relative timers called last */
1219#if EV_PERIODICS
1183 periodics_reify (EV_A); /* absolute timers called first */ 1220 periodics_reify (EV_A); /* absolute timers called first */
1221#endif
1184 1222
1185 /* queue idle watchers unless io or timers are pending */ 1223 /* queue idle watchers unless io or timers are pending */
1186 if (!pendingcnt) 1224 if (idlecnt && !any_pending (EV_A))
1187 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1225 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1188 1226
1189 /* queue check watchers, to be executed first */ 1227 /* queue check watchers, to be executed first */
1190 if (checkcnt) 1228 if (checkcnt)
1191 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1229 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
… …
1266 return; 1304 return;
1267 1305
1268 assert (("ev_io_start called with negative fd", fd >= 0)); 1306 assert (("ev_io_start called with negative fd", fd >= 0));
1269 1307
1270 ev_start (EV_A_ (W)w, 1); 1308 ev_start (EV_A_ (W)w, 1);
1271 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1309 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1272 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1310 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1273 1311
1274 fd_change (EV_A_ fd); 1312 fd_change (EV_A_ fd);
1275} 1313}
1276 1314
… …
1279{ 1317{
1280 ev_clear_pending (EV_A_ (W)w); 1318 ev_clear_pending (EV_A_ (W)w);
1281 if (!ev_is_active (w)) 1319 if (!ev_is_active (w))
1282 return; 1320 return;
1283 1321
1322 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1323
1284 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1324 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1285 ev_stop (EV_A_ (W)w); 1325 ev_stop (EV_A_ (W)w);
1286 1326
1287 fd_change (EV_A_ w->fd); 1327 fd_change (EV_A_ w->fd);
1288} 1328}
… …
1296 ((WT)w)->at += mn_now; 1336 ((WT)w)->at += mn_now;
1297 1337
1298 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.));
1299 1339
1300 ev_start (EV_A_ (W)w, ++timercnt); 1340 ev_start (EV_A_ (W)w, ++timercnt);
1301 array_needsize (timers, timermax, timercnt, (void)); 1341 array_needsize (struct ev_timer *, timers, timermax, timercnt, (void));
1302 timers [timercnt - 1] = w; 1342 timers [timercnt - 1] = w;
1303 upheap ((WT *)timers, timercnt - 1); 1343 upheap ((WT *)timers, timercnt - 1);
1304 1344
1305 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1345 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1306} 1346}
… …
1315 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1355 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1316 1356
1317 if (((W)w)->active < timercnt--) 1357 if (((W)w)->active < timercnt--)
1318 { 1358 {
1319 timers [((W)w)->active - 1] = timers [timercnt]; 1359 timers [((W)w)->active - 1] = timers [timercnt];
1320 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1360 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1321 } 1361 }
1322 1362
1323 ((WT)w)->at = w->repeat; 1363 ((WT)w)->at -= mn_now;
1324 1364
1325 ev_stop (EV_A_ (W)w); 1365 ev_stop (EV_A_ (W)w);
1326} 1366}
1327 1367
1328void 1368void
… …
1331 if (ev_is_active (w)) 1371 if (ev_is_active (w))
1332 { 1372 {
1333 if (w->repeat) 1373 if (w->repeat)
1334 { 1374 {
1335 ((WT)w)->at = mn_now + w->repeat; 1375 ((WT)w)->at = mn_now + w->repeat;
1336 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1376 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1337 } 1377 }
1338 else 1378 else
1339 ev_timer_stop (EV_A_ w); 1379 ev_timer_stop (EV_A_ w);
1340 } 1380 }
1341 else if (w->repeat) 1381 else if (w->repeat)
1342 ev_timer_start (EV_A_ w); 1382 ev_timer_start (EV_A_ w);
1343} 1383}
1344 1384
1385#if EV_PERIODICS
1345void 1386void
1346ev_periodic_start (EV_P_ struct ev_periodic *w) 1387ev_periodic_start (EV_P_ struct ev_periodic *w)
1347{ 1388{
1348 if (ev_is_active (w)) 1389 if (ev_is_active (w))
1349 return; 1390 return;
1350 1391
1392 if (w->reschedule_cb)
1393 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1394 else if (w->interval)
1395 {
1351 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.));
1352
1353 /* 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 */
1354 if (w->interval)
1355 ((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 }
1356 1400
1357 ev_start (EV_A_ (W)w, ++periodiccnt); 1401 ev_start (EV_A_ (W)w, ++periodiccnt);
1358 array_needsize (periodics, periodicmax, periodiccnt, (void)); 1402 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, (void));
1359 periodics [periodiccnt - 1] = w; 1403 periodics [periodiccnt - 1] = w;
1360 upheap ((WT *)periodics, periodiccnt - 1); 1404 upheap ((WT *)periodics, periodiccnt - 1);
1361 1405
1362 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1406 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1363} 1407}
… …
1372 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1416 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1373 1417
1374 if (((W)w)->active < periodiccnt--) 1418 if (((W)w)->active < periodiccnt--)
1375 { 1419 {
1376 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1420 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1377 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1421 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1378 } 1422 }
1379 1423
1380 ev_stop (EV_A_ (W)w); 1424 ev_stop (EV_A_ (W)w);
1381} 1425}
1382 1426
1383void 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
1384ev_idle_start (EV_P_ struct ev_idle *w) 1437ev_idle_start (EV_P_ struct ev_idle *w)
1385{ 1438{
1386 if (ev_is_active (w)) 1439 if (ev_is_active (w))
1387 return; 1440 return;
1388 1441
1389 ev_start (EV_A_ (W)w, ++idlecnt); 1442 ev_start (EV_A_ (W)w, ++idlecnt);
1390 array_needsize (idles, idlemax, idlecnt, (void)); 1443 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, (void));
1391 idles [idlecnt - 1] = w; 1444 idles [idlecnt - 1] = w;
1392} 1445}
1393 1446
1394void 1447void
1395ev_idle_stop (EV_P_ struct ev_idle *w) 1448ev_idle_stop (EV_P_ struct ev_idle *w)
1396{ 1449{
1397 ev_clear_pending (EV_A_ (W)w); 1450 ev_clear_pending (EV_A_ (W)w);
1398 if (ev_is_active (w)) 1451 if (!ev_is_active (w))
1399 return; 1452 return;
1400 1453
1401 idles [((W)w)->active - 1] = idles [--idlecnt]; 1454 idles [((W)w)->active - 1] = idles [--idlecnt];
1402 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1403} 1456}
… …
1407{ 1460{
1408 if (ev_is_active (w)) 1461 if (ev_is_active (w))
1409 return; 1462 return;
1410 1463
1411 ev_start (EV_A_ (W)w, ++preparecnt); 1464 ev_start (EV_A_ (W)w, ++preparecnt);
1412 array_needsize (prepares, preparemax, preparecnt, (void)); 1465 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, (void));
1413 prepares [preparecnt - 1] = w; 1466 prepares [preparecnt - 1] = w;
1414} 1467}
1415 1468
1416void 1469void
1417ev_prepare_stop (EV_P_ struct ev_prepare *w) 1470ev_prepare_stop (EV_P_ struct ev_prepare *w)
1418{ 1471{
1419 ev_clear_pending (EV_A_ (W)w); 1472 ev_clear_pending (EV_A_ (W)w);
1420 if (ev_is_active (w)) 1473 if (!ev_is_active (w))
1421 return; 1474 return;
1422 1475
1423 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1476 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1424 ev_stop (EV_A_ (W)w); 1477 ev_stop (EV_A_ (W)w);
1425} 1478}
… …
1429{ 1482{
1430 if (ev_is_active (w)) 1483 if (ev_is_active (w))
1431 return; 1484 return;
1432 1485
1433 ev_start (EV_A_ (W)w, ++checkcnt); 1486 ev_start (EV_A_ (W)w, ++checkcnt);
1434 array_needsize (checks, checkmax, checkcnt, (void)); 1487 array_needsize (struct ev_check *, checks, checkmax, checkcnt, (void));
1435 checks [checkcnt - 1] = w; 1488 checks [checkcnt - 1] = w;
1436} 1489}
1437 1490
1438void 1491void
1439ev_check_stop (EV_P_ struct ev_check *w) 1492ev_check_stop (EV_P_ struct ev_check *w)
1440{ 1493{
1441 ev_clear_pending (EV_A_ (W)w); 1494 ev_clear_pending (EV_A_ (W)w);
1442 if (ev_is_active (w)) 1495 if (!ev_is_active (w))
1443 return; 1496 return;
1444 1497
1445 checks [((W)w)->active - 1] = checks [--checkcnt]; 1498 checks [((W)w)->active - 1] = checks [--checkcnt];
1446 ev_stop (EV_A_ (W)w); 1499 ev_stop (EV_A_ (W)w);
1447} 1500}
… …
1460 return; 1513 return;
1461 1514
1462 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));
1463 1516
1464 ev_start (EV_A_ (W)w, 1); 1517 ev_start (EV_A_ (W)w, 1);
1465 array_needsize (signals, signalmax, w->signum, signals_init); 1518 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1466 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1519 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1467 1520
1468 if (!((WL)w)->next) 1521 if (!((WL)w)->next)
1469 { 1522 {
1470#if WIN32 1523#if _WIN32
1471 signal (w->signum, sighandler); 1524 signal (w->signum, sighandler);
1472#else 1525#else
1473 struct sigaction sa; 1526 struct sigaction sa;
1474 sa.sa_handler = sighandler; 1527 sa.sa_handler = sighandler;
1475 sigfillset (&sa.sa_mask); 1528 sigfillset (&sa.sa_mask);
… …
1508 1561
1509void 1562void
1510ev_child_stop (EV_P_ struct ev_child *w) 1563ev_child_stop (EV_P_ struct ev_child *w)
1511{ 1564{
1512 ev_clear_pending (EV_A_ (W)w); 1565 ev_clear_pending (EV_A_ (W)w);
1513 if (ev_is_active (w)) 1566 if (!ev_is_active (w))
1514 return; 1567 return;
1515 1568
1516 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1569 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1517 ev_stop (EV_A_ (W)w); 1570 ev_stop (EV_A_ (W)w);
1518} 1571}
… …
1553} 1606}
1554 1607
1555void 1608void
1556ev_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)
1557{ 1610{
1558 struct ev_once *once = ev_malloc (sizeof (struct ev_once)); 1611 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1559 1612
1560 if (!once) 1613 if (!once)
1561 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1614 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1562 else 1615 else
1563 { 1616 {
1564 once->cb = cb; 1617 once->cb = cb;
1565 once->arg = arg; 1618 once->arg = arg;
1566 1619
1567 ev_watcher_init (&once->io, once_cb_io); 1620 ev_init (&once->io, once_cb_io);
1568 if (fd >= 0) 1621 if (fd >= 0)
1569 { 1622 {
1570 ev_io_set (&once->io, fd, events); 1623 ev_io_set (&once->io, fd, events);
1571 ev_io_start (EV_A_ &once->io); 1624 ev_io_start (EV_A_ &once->io);
1572 } 1625 }
1573 1626
1574 ev_watcher_init (&once->to, once_cb_to); 1627 ev_init (&once->to, once_cb_to);
1575 if (timeout >= 0.) 1628 if (timeout >= 0.)
1576 { 1629 {
1577 ev_timer_set (&once->to, timeout, 0.); 1630 ev_timer_set (&once->to, timeout, 0.);
1578 ev_timer_start (EV_A_ &once->to); 1631 ev_timer_start (EV_A_ &once->to);
1579 } 1632 }
1580 } 1633 }
1581} 1634}
1582 1635
1636#ifdef __cplusplus
1637}
1638#endif
1639

Diff Legend

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