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

Comparing libev/ev.c (file contents):
Revision 1.67 by root, Mon Nov 5 16:42:15 2007 UTC vs.
Revision 1.122 by root, Sat Nov 17 02:00:48 2007 UTC

… …
26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
32# include "config.h" 37# include "config.h"
33 38
34# if HAVE_CLOCK_GETTIME 39# if HAVE_CLOCK_GETTIME
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
64# if HAVE_PORT_H && HAVE_PORT_CREATE && !defined (EV_USE_PORT)
65# define EV_USE_PORT 1
66# endif
67
55#endif 68#endif
56 69
57#include <math.h> 70#include <math.h>
58#include <stdlib.h> 71#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 72#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 73#include <stddef.h>
63 74
64#include <stdio.h> 75#include <stdio.h>
65 76
66#include <assert.h> 77#include <assert.h>
67#include <errno.h> 78#include <errno.h>
68#include <sys/types.h> 79#include <sys/types.h>
80#include <time.h>
81
82#include <signal.h>
83
69#ifndef WIN32 84#ifndef _WIN32
85# include <unistd.h>
86# include <sys/time.h>
70# include <sys/wait.h> 87# include <sys/wait.h>
88#else
89# define WIN32_LEAN_AND_MEAN
90# include <windows.h>
91# ifndef EV_SELECT_IS_WINSOCKET
92# define EV_SELECT_IS_WINSOCKET 1
71#endif 93# endif
72#include <sys/time.h> 94#endif
73#include <time.h>
74 95
75/**/ 96/**/
76 97
77#ifndef EV_USE_MONOTONIC 98#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 99# define EV_USE_MONOTONIC 0
100#endif
101
102#ifndef EV_USE_REALTIME
103# define EV_USE_REALTIME 0
79#endif 104#endif
80 105
81#ifndef EV_USE_SELECT 106#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 107# define EV_USE_SELECT 1
83#endif 108#endif
84 109
85#ifndef EV_USE_POLL 110#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 111# ifdef _WIN32
112# define EV_USE_POLL 0
113# else
114# define EV_USE_POLL 1
115# endif
87#endif 116#endif
88 117
89#ifndef EV_USE_EPOLL 118#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 119# define EV_USE_EPOLL 0
91#endif 120#endif
92 121
93#ifndef EV_USE_KQUEUE 122#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 123# define EV_USE_KQUEUE 0
95#endif 124#endif
96 125
97#ifndef EV_USE_WIN32
98# ifdef WIN32
99# define EV_USE_WIN32 1
100# else
101# define EV_USE_WIN32 0
102# endif
103#endif
104
105#ifndef EV_USE_REALTIME 126#ifndef EV_USE_PORT
106# define EV_USE_REALTIME 1 127# define EV_USE_PORT 0
107#endif 128#endif
108 129
109/**/ 130/**/
131
132/* darwin simply cannot be helped */
133#ifdef __APPLE__
134# undef EV_USE_POLL
135# undef EV_USE_KQUEUE
136#endif
110 137
111#ifndef CLOCK_MONOTONIC 138#ifndef CLOCK_MONOTONIC
112# undef EV_USE_MONOTONIC 139# undef EV_USE_MONOTONIC
113# define EV_USE_MONOTONIC 0 140# define EV_USE_MONOTONIC 0
114#endif 141#endif
… …
116#ifndef CLOCK_REALTIME 143#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 144# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 145# define EV_USE_REALTIME 0
119#endif 146#endif
120 147
148#if EV_SELECT_IS_WINSOCKET
149# include <winsock.h>
150#endif
151
121/**/ 152/**/
122 153
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 154#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 155#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 156#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 157/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127 158
159#ifdef EV_H
160# include EV_H
161#else
128#include "ev.h" 162# include "ev.h"
163#endif
129 164
130#if __GNUC__ >= 3 165#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 166# define expect(expr,value) __builtin_expect ((expr),(value))
132# define inline inline 167# define inline inline
133#else 168#else
… …
139#define expect_true(expr) expect ((expr) != 0, 1) 174#define expect_true(expr) expect ((expr) != 0, 1)
140 175
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 176#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 177#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 178
179#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
180#define EMPTY2(a,b) /* used to suppress some warnings */
181
144typedef struct ev_watcher *W; 182typedef struct ev_watcher *W;
145typedef struct ev_watcher_list *WL; 183typedef struct ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 184typedef struct ev_watcher_time *WT;
147 185
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 186static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 187
150#if WIN32 188#ifdef _WIN32
151/* note: the comment below could not be substantiated, but what would I care */ 189# include "ev_win32.c"
152/* MSDN says this is required to handle SIGFPE */
153volatile double SIGFPE_REQ = 0.0f;
154#endif 190#endif
155 191
156/*****************************************************************************/ 192/*****************************************************************************/
157 193
194static void (*syserr_cb)(const char *msg);
195
196void ev_set_syserr_cb (void (*cb)(const char *msg))
197{
198 syserr_cb = cb;
199}
200
201static void
202syserr (const char *msg)
203{
204 if (!msg)
205 msg = "(libev) system error";
206
207 if (syserr_cb)
208 syserr_cb (msg);
209 else
210 {
211 perror (msg);
212 abort ();
213 }
214}
215
216static void *(*alloc)(void *ptr, long size);
217
218void ev_set_allocator (void *(*cb)(void *ptr, long size))
219{
220 alloc = cb;
221}
222
223static void *
224ev_realloc (void *ptr, long size)
225{
226 ptr = alloc ? alloc (ptr, size) : realloc (ptr, size);
227
228 if (!ptr && size)
229 {
230 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", size);
231 abort ();
232 }
233
234 return ptr;
235}
236
237#define ev_malloc(size) ev_realloc (0, (size))
238#define ev_free(ptr) ev_realloc ((ptr), 0)
239
240/*****************************************************************************/
241
158typedef struct 242typedef struct
159{ 243{
160 struct ev_watcher_list *head; 244 WL head;
161 unsigned char events; 245 unsigned char events;
162 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
163} ANFD; 250} ANFD;
164 251
165typedef struct 252typedef struct
166{ 253{
167 W w; 254 W w;
168 int events; 255 int events;
169} ANPENDING; 256} ANPENDING;
170 257
171#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
172 259
173struct ev_loop 260 struct ev_loop
174{ 261 {
262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
175# define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
176# include "ev_vars.h" 265 #include "ev_vars.h"
177};
178# undef VAR 266 #undef VAR
267 };
179# include "ev_wrap.h" 268 #include "ev_wrap.h"
269
270 static struct ev_loop default_loop_struct;
271 struct ev_loop *ev_default_loop_ptr;
180 272
181#else 273#else
182 274
275 ev_tstamp ev_rt_now;
183# define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
184# include "ev_vars.h" 277 #include "ev_vars.h"
185# undef VAR 278 #undef VAR
279
280 static int ev_default_loop_ptr;
186 281
187#endif 282#endif
188 283
189/*****************************************************************************/ 284/*****************************************************************************/
190 285
191inline ev_tstamp 286ev_tstamp
192ev_time (void) 287ev_time (void)
193{ 288{
194#if EV_USE_REALTIME 289#if EV_USE_REALTIME
195 struct timespec ts; 290 struct timespec ts;
196 clock_gettime (CLOCK_REALTIME, &ts); 291 clock_gettime (CLOCK_REALTIME, &ts);
… …
215#endif 310#endif
216 311
217 return ev_time (); 312 return ev_time ();
218} 313}
219 314
315#if EV_MULTIPLICITY
220ev_tstamp 316ev_tstamp
221ev_now (EV_P) 317ev_now (EV_P)
222{ 318{
223 return rt_now; 319 return ev_rt_now;
224} 320}
321#endif
225 322
226#define array_roundsize(base,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
227 324
228#define array_needsize(base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
229 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
230 { \ 327 { \
231 int newcnt = cur; \ 328 int newcnt = cur; \
232 do \ 329 do \
233 { \ 330 { \
234 newcnt = array_roundsize (base, newcnt << 1); \ 331 newcnt = array_roundsize (type, newcnt << 1); \
235 } \ 332 } \
236 while ((cnt) > newcnt); \ 333 while ((cnt) > newcnt); \
237 \ 334 \
238 base = realloc (base, sizeof (*base) * (newcnt)); \ 335 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
239 init (base + cur, newcnt - cur); \ 336 init (base + cur, newcnt - cur); \
240 cur = newcnt; \ 337 cur = newcnt; \
241 } 338 }
242 339
243#define array_slim(stem) \ 340#define array_slim(type,stem) \
244 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \ 341 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
245 { \ 342 { \
246 stem ## max = array_roundsize (stem ## cnt >> 1); \ 343 stem ## max = array_roundsize (stem ## cnt >> 1); \
247 base = realloc (base, sizeof (*base) * (stem ## max)); \ 344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
248 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\ 345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
249 } 346 }
250 347
251#define array_free(stem, idx) \ 348#define array_free(stem, idx) \
252 free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0; 349 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
253 350
254/*****************************************************************************/ 351/*****************************************************************************/
255 352
256static void 353static void
257anfds_init (ANFD *base, int count) 354anfds_init (ANFD *base, int count)
… …
264 361
265 ++base; 362 ++base;
266 } 363 }
267} 364}
268 365
269static void 366void
270event (EV_P_ W w, int events) 367ev_feed_event (EV_P_ void *w, int revents)
271{ 368{
369 W w_ = (W)w;
370
272 if (w->pending) 371 if (w_->pending)
273 { 372 {
274 pendings [ABSPRI (w)][w->pending - 1].events |= events; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
275 return; 374 return;
276 } 375 }
277 376
278 w->pending = ++pendingcnt [ABSPRI (w)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
279 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], ); 378 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
280 pendings [ABSPRI (w)][w->pending - 1].w = w; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
281 pendings [ABSPRI (w)][w->pending - 1].events = events; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
282} 381}
283 382
284static void 383static void
285queue_events (EV_P_ W *events, int eventcnt, int type) 384queue_events (EV_P_ W *events, int eventcnt, int type)
286{ 385{
287 int i; 386 int i;
288 387
289 for (i = 0; i < eventcnt; ++i) 388 for (i = 0; i < eventcnt; ++i)
290 event (EV_A_ events [i], type); 389 ev_feed_event (EV_A_ events [i], type);
291} 390}
292 391
293static void 392inline void
294fd_event (EV_P_ int fd, int events) 393fd_event (EV_P_ int fd, int revents)
295{ 394{
296 ANFD *anfd = anfds + fd; 395 ANFD *anfd = anfds + fd;
297 struct ev_io *w; 396 struct ev_io *w;
298 397
299 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 398 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
300 { 399 {
301 int ev = w->events & events; 400 int ev = w->events & revents;
302 401
303 if (ev) 402 if (ev)
304 event (EV_A_ (W)w, ev); 403 ev_feed_event (EV_A_ (W)w, ev);
305 } 404 }
405}
406
407void
408ev_feed_fd_event (EV_P_ int fd, int revents)
409{
410 fd_event (EV_A_ fd, revents);
306} 411}
307 412
308/*****************************************************************************/ 413/*****************************************************************************/
309 414
310static void 415static void
… …
321 int events = 0; 426 int events = 0;
322 427
323 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 428 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
324 events |= w->events; 429 events |= w->events;
325 430
431#if EV_SELECT_IS_WINSOCKET
432 if (events)
433 {
434 unsigned long argp;
435 anfd->handle = _get_osfhandle (fd);
436 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
437 }
438#endif
439
326 anfd->reify = 0; 440 anfd->reify = 0;
327 441
328 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
329 anfd->events = events; 443 anfd->events = events;
330 } 444 }
… …
333} 447}
334 448
335static void 449static void
336fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
337{ 451{
338 if (anfds [fd].reify || fdchangecnt < 0) 452 if (anfds [fd].reify)
339 return; 453 return;
340 454
341 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
342 456
343 ++fdchangecnt; 457 ++fdchangecnt;
344 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
345 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
346} 460}
347 461
348static void 462static void
349fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
… …
351 struct ev_io *w; 465 struct ev_io *w;
352 466
353 while ((w = (struct ev_io *)anfds [fd].head)) 467 while ((w = (struct ev_io *)anfds [fd].head))
354 { 468 {
355 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
356 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 470 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
357 } 471 }
472}
473
474static int
475fd_valid (int fd)
476{
477#ifdef _WIN32
478 return _get_osfhandle (fd) != -1;
479#else
480 return fcntl (fd, F_GETFD) != -1;
481#endif
358} 482}
359 483
360/* called on EBADF to verify fds */ 484/* called on EBADF to verify fds */
361static void 485static void
362fd_ebadf (EV_P) 486fd_ebadf (EV_P)
363{ 487{
364 int fd; 488 int fd;
365 489
366 for (fd = 0; fd < anfdmax; ++fd) 490 for (fd = 0; fd < anfdmax; ++fd)
367 if (anfds [fd].events) 491 if (anfds [fd].events)
368 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 492 if (!fd_valid (fd) == -1 && errno == EBADF)
369 fd_kill (EV_A_ fd); 493 fd_kill (EV_A_ fd);
370} 494}
371 495
372/* called on ENOMEM in select/poll to kill some fds and retry */ 496/* called on ENOMEM in select/poll to kill some fds and retry */
373static void 497static void
… …
376 int fd; 500 int fd;
377 501
378 for (fd = anfdmax; fd--; ) 502 for (fd = anfdmax; fd--; )
379 if (anfds [fd].events) 503 if (anfds [fd].events)
380 { 504 {
381 close (fd);
382 fd_kill (EV_A_ fd); 505 fd_kill (EV_A_ fd);
383 return; 506 return;
384 } 507 }
385} 508}
386 509
387/* susually called after fork if method needs to re-arm all fds from scratch */ 510/* usually called after fork if method needs to re-arm all fds from scratch */
388static void 511static void
389fd_rearm_all (EV_P) 512fd_rearm_all (EV_P)
390{ 513{
391 int fd; 514 int fd;
392 515
… …
440 563
441 heap [k] = w; 564 heap [k] = w;
442 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
443} 566}
444 567
568inline void
569adjustheap (WT *heap, int N, int k)
570{
571 upheap (heap, k);
572 downheap (heap, N, k);
573}
574
445/*****************************************************************************/ 575/*****************************************************************************/
446 576
447typedef struct 577typedef struct
448{ 578{
449 struct ev_watcher_list *head; 579 WL head;
450 sig_atomic_t volatile gotsig; 580 sig_atomic_t volatile gotsig;
451} ANSIG; 581} ANSIG;
452 582
453static ANSIG *signals; 583static ANSIG *signals;
454static int signalmax; 584static int signalmax;
… …
470} 600}
471 601
472static void 602static void
473sighandler (int signum) 603sighandler (int signum)
474{ 604{
475#if WIN32 605#if _WIN32
476 signal (signum, sighandler); 606 signal (signum, sighandler);
477#endif 607#endif
478 608
479 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
480 610
… …
485 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
486 errno = old_errno; 616 errno = old_errno;
487 } 617 }
488} 618}
489 619
620void
621ev_feed_signal_event (EV_P_ int signum)
622{
623 WL w;
624
625#if EV_MULTIPLICITY
626 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
627#endif
628
629 --signum;
630
631 if (signum < 0 || signum >= signalmax)
632 return;
633
634 signals [signum].gotsig = 0;
635
636 for (w = signals [signum].head; w; w = w->next)
637 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
638}
639
490static void 640static void
491sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
492{ 642{
493 struct ev_watcher_list *w;
494 int signum; 643 int signum;
495 644
496 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
497 gotsig = 0; 646 gotsig = 0;
498 647
499 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
500 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
501 { 650 ev_feed_signal_event (EV_A_ signum + 1);
502 signals [signum].gotsig = 0; 651}
503 652
504 for (w = signals [signum].head; w; w = w->next) 653inline void
505 event (EV_A_ (W)w, EV_SIGNAL); 654fd_intern (int fd)
506 } 655{
656#ifdef _WIN32
657 int arg = 1;
658 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
659#else
660 fcntl (fd, F_SETFD, FD_CLOEXEC);
661 fcntl (fd, F_SETFL, O_NONBLOCK);
662#endif
507} 663}
508 664
509static void 665static void
510siginit (EV_P) 666siginit (EV_P)
511{ 667{
512#ifndef WIN32 668 fd_intern (sigpipe [0]);
513 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 fd_intern (sigpipe [1]);
514 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
515
516 /* rather than sort out wether we really need nb, set it */
517 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
518 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
519#endif
520 670
521 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
522 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
523 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
524} 674}
525 675
526/*****************************************************************************/ 676/*****************************************************************************/
527 677
528#ifndef WIN32
529
530static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
679
680#ifndef _WIN32
681
531static struct ev_signal childev; 682static struct ev_signal childev;
532 683
533#ifndef WCONTINUED 684#ifndef WCONTINUED
534# define WCONTINUED 0 685# define WCONTINUED 0
535#endif 686#endif
… …
543 if (w->pid == pid || !w->pid) 694 if (w->pid == pid || !w->pid)
544 { 695 {
545 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 696 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
546 w->rpid = pid; 697 w->rpid = pid;
547 w->rstatus = status; 698 w->rstatus = status;
548 event (EV_A_ (W)w, EV_CHILD); 699 ev_feed_event (EV_A_ (W)w, EV_CHILD);
549 } 700 }
550} 701}
551 702
552static void 703static void
553childcb (EV_P_ struct ev_signal *sw, int revents) 704childcb (EV_P_ struct ev_signal *sw, int revents)
… …
555 int pid, status; 706 int pid, status;
556 707
557 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
558 { 709 {
559 /* make sure we are called again until all childs have been reaped */ 710 /* make sure we are called again until all childs have been reaped */
560 event (EV_A_ (W)sw, EV_SIGNAL); 711 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
561 712
562 child_reap (EV_A_ sw, pid, pid, status); 713 child_reap (EV_A_ sw, pid, pid, status);
563 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 714 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
564 } 715 }
565} 716}
566 717
567#endif 718#endif
568 719
569/*****************************************************************************/ 720/*****************************************************************************/
570 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
571#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
572# include "ev_kqueue.c" 726# include "ev_kqueue.c"
573#endif 727#endif
574#if EV_USE_EPOLL 728#if EV_USE_EPOLL
575# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
595 749
596/* return true if we are running with elevated privileges and should ignore env variables */ 750/* return true if we are running with elevated privileges and should ignore env variables */
597static int 751static int
598enable_secure (void) 752enable_secure (void)
599{ 753{
600#ifdef WIN32 754#ifdef _WIN32
601 return 0; 755 return 0;
602#else 756#else
603 return getuid () != geteuid () 757 return getuid () != geteuid ()
604 || getgid () != getegid (); 758 || getgid () != getegid ();
605#endif 759#endif
606} 760}
607 761
608int 762unsigned int
609ev_method (EV_P) 763ev_method (EV_P)
610{ 764{
611 return method; 765 return method;
612} 766}
613 767
614static void 768static void
615loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
616{ 770{
617 if (!method) 771 if (!method)
618 { 772 {
619#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
620 { 774 {
… …
622 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 776 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
623 have_monotonic = 1; 777 have_monotonic = 1;
624 } 778 }
625#endif 779#endif
626 780
627 rt_now = ev_time (); 781 ev_rt_now = ev_time ();
628 mn_now = get_clock (); 782 mn_now = get_clock ();
629 now_floor = mn_now; 783 now_floor = mn_now;
630 rtmn_diff = rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
631 785
632 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
633 if (!enable_secure () && getenv ("LIBEV_METHODS"))
634 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
635 else 788
636 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
637 791
638 method = 0; 792 method = 0;
639#if EV_USE_WIN32 793#if EV_USE_PORT
640 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
641#endif 795#endif
642#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
643 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
644#endif 798#endif
645#if EV_USE_EPOLL 799#if EV_USE_EPOLL
646 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
647#endif 801#endif
648#if EV_USE_POLL 802#if EV_USE_POLL
649 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
650#endif 804#endif
651#if EV_USE_SELECT 805#if EV_USE_SELECT
652 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
653#endif 807#endif
808
809 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI);
654 } 811 }
655} 812}
656 813
657void 814void
658loop_destroy (EV_P) 815loop_destroy (EV_P)
659{ 816{
660 int i; 817 int i;
661 818
662#if EV_USE_WIN32 819#if EV_USE_PORT
663 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
664#endif 821#endif
665#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
666 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
667#endif 824#endif
668#if EV_USE_EPOLL 825#if EV_USE_EPOLL
… …
676#endif 833#endif
677 834
678 for (i = NUMPRI; i--; ) 835 for (i = NUMPRI; i--; )
679 array_free (pending, [i]); 836 array_free (pending, [i]);
680 837
838 /* have to use the microsoft-never-gets-it-right macro */
681 array_free (fdchange, ); 839 array_free (fdchange, EMPTY0);
682 array_free (timer, ); 840 array_free (timer, EMPTY0);
841#if EV_PERIODICS
683 array_free (periodic, ); 842 array_free (periodic, EMPTY0);
843#endif
684 array_free (idle, ); 844 array_free (idle, EMPTY0);
685 array_free (prepare, ); 845 array_free (prepare, EMPTY0);
686 array_free (check, ); 846 array_free (check, EMPTY0);
687 847
688 method = 0; 848 method = 0;
689 /*TODO*/
690} 849}
691 850
692void 851static void
693loop_fork (EV_P) 852loop_fork (EV_P)
694{ 853{
695 /*TODO*/ 854#if EV_USE_PORT
855 if (method == EVMETHOD_PORT ) port_fork (EV_A);
856#endif
857#if EV_USE_KQUEUE
858 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A);
859#endif
696#if EV_USE_EPOLL 860#if EV_USE_EPOLL
697 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
698#endif 862#endif
699#if EV_USE_KQUEUE 863
700 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 864 if (ev_is_active (&sigev))
701#endif 865 {
866 /* default loop */
867
868 ev_ref (EV_A);
869 ev_io_stop (EV_A_ &sigev);
870 close (sigpipe [0]);
871 close (sigpipe [1]);
872
873 while (pipe (sigpipe))
874 syserr ("(libev) error creating pipe");
875
876 siginit (EV_A);
877 }
878
879 postfork = 0;
702} 880}
703 881
704#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
705struct ev_loop * 883struct ev_loop *
706ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
707{ 885{
708 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 886 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
709 887
888 memset (loop, 0, sizeof (struct ev_loop));
889
710 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
711 891
712 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
713 return loop; 893 return loop;
714 894
715 return 0; 895 return 0;
… …
717 897
718void 898void
719ev_loop_destroy (EV_P) 899ev_loop_destroy (EV_P)
720{ 900{
721 loop_destroy (EV_A); 901 loop_destroy (EV_A);
722 free (loop); 902 ev_free (loop);
723} 903}
724 904
725void 905void
726ev_loop_fork (EV_P) 906ev_loop_fork (EV_P)
727{ 907{
728 loop_fork (EV_A); 908 postfork = 1;
729} 909}
730 910
731#endif 911#endif
732 912
733#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
734struct ev_loop default_loop_struct;
735static struct ev_loop *default_loop;
736
737struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
738#else 916#else
739static int default_loop;
740
741int 917int
918ev_default_loop (unsigned int flags)
742#endif 919#endif
743ev_default_loop (int methods)
744{ 920{
745 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
746 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
747 return 0; 923 return 0;
748 924
749 if (!default_loop) 925 if (!ev_default_loop_ptr)
750 { 926 {
751#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
752 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
753#else 929#else
754 default_loop = 1; 930 ev_default_loop_ptr = 1;
755#endif 931#endif
756 932
757 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
758 934
759 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
760 { 936 {
761 ev_watcher_init (&sigev, sigcb);
762 ev_set_priority (&sigev, EV_MAXPRI);
763 siginit (EV_A); 937 siginit (EV_A);
764 938
765#ifndef WIN32 939#ifndef _WIN32
766 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
767 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
768 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
769 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
770#endif 944#endif
771 } 945 }
772 else 946 else
773 default_loop = 0; 947 ev_default_loop_ptr = 0;
774 } 948 }
775 949
776 return default_loop; 950 return ev_default_loop_ptr;
777} 951}
778 952
779void 953void
780ev_default_destroy (void) 954ev_default_destroy (void)
781{ 955{
782#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
783 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
784#endif 958#endif
785 959
960#ifndef _WIN32
786 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
787 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
963#endif
788 964
789 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
790 ev_io_stop (EV_A_ &sigev); 966 ev_io_stop (EV_A_ &sigev);
791 967
792 close (sigpipe [0]); sigpipe [0] = 0; 968 close (sigpipe [0]); sigpipe [0] = 0;
… …
797 973
798void 974void
799ev_default_fork (void) 975ev_default_fork (void)
800{ 976{
801#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
802 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
803#endif 979#endif
804 980
805 loop_fork (EV_A); 981 if (method)
806 982 postfork = 1;
807 ev_io_stop (EV_A_ &sigev);
808 close (sigpipe [0]);
809 close (sigpipe [1]);
810 pipe (sigpipe);
811
812 ev_ref (EV_A); /* signal watcher */
813 siginit (EV_A);
814} 983}
815 984
816/*****************************************************************************/ 985/*****************************************************************************/
817 986
818static void 987static int
988any_pending (EV_P)
989{
990 int pri;
991
992 for (pri = NUMPRI; pri--; )
993 if (pendingcnt [pri])
994 return 1;
995
996 return 0;
997}
998
999inline void
819call_pending (EV_P) 1000call_pending (EV_P)
820{ 1001{
821 int pri; 1002 int pri;
822 1003
823 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
824 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
825 { 1006 {
826 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
827 1008
828 if (p->w) 1009 if (expect_true (p->w))
829 { 1010 {
830 p->w->pending = 0; 1011 p->w->pending = 0;
831 p->w->cb (EV_A_ p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
832 } 1013 }
833 } 1014 }
834} 1015}
835 1016
836static void 1017static void
… …
844 1025
845 /* first reschedule or stop timer */ 1026 /* first reschedule or stop timer */
846 if (w->repeat) 1027 if (w->repeat)
847 { 1028 {
848 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1029 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1030
849 ((WT)w)->at = mn_now + w->repeat; 1031 ((WT)w)->at += w->repeat;
1032 if (((WT)w)->at < mn_now)
1033 ((WT)w)->at = mn_now;
1034
850 downheap ((WT *)timers, timercnt, 0); 1035 downheap ((WT *)timers, timercnt, 0);
851 } 1036 }
852 else 1037 else
853 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1038 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
854 1039
855 event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
856 } 1041 }
857} 1042}
858 1043
1044#if EV_PERIODICS
859static void 1045static void
860periodics_reify (EV_P) 1046periodics_reify (EV_P)
861{ 1047{
862 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
863 { 1049 {
864 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
865 1051
866 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
867 1053
868 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
869 if (w->interval) 1055 if (w->reschedule_cb)
870 { 1056 {
1057 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1058 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1059 downheap ((WT *)periodics, periodiccnt, 0);
1060 }
1061 else if (w->interval)
1062 {
871 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1063 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
872 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1064 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
873 downheap ((WT *)periodics, periodiccnt, 0); 1065 downheap ((WT *)periodics, periodiccnt, 0);
874 } 1066 }
875 else 1067 else
876 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1068 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
877 1069
878 event (EV_A_ (W)w, EV_PERIODIC); 1070 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
879 } 1071 }
880} 1072}
881 1073
882static void 1074static void
883periodics_reschedule (EV_P) 1075periodics_reschedule (EV_P)
… …
887 /* adjust periodics after time jump */ 1079 /* adjust periodics after time jump */
888 for (i = 0; i < periodiccnt; ++i) 1080 for (i = 0; i < periodiccnt; ++i)
889 { 1081 {
890 struct ev_periodic *w = periodics [i]; 1082 struct ev_periodic *w = periodics [i];
891 1083
1084 if (w->reschedule_cb)
1085 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
892 if (w->interval) 1086 else if (w->interval)
893 {
894 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1087 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
895
896 if (fabs (diff) >= 1e-4)
897 {
898 ev_periodic_stop (EV_A_ w);
899 ev_periodic_start (EV_A_ w);
900
901 i = 0; /* restart loop, inefficient, but time jumps should be rare */
902 }
903 }
904 } 1088 }
1089
1090 /* now rebuild the heap */
1091 for (i = periodiccnt >> 1; i--; )
1092 downheap ((WT *)periodics, periodiccnt, i);
905} 1093}
1094#endif
906 1095
907inline int 1096inline int
908time_update_monotonic (EV_P) 1097time_update_monotonic (EV_P)
909{ 1098{
910 mn_now = get_clock (); 1099 mn_now = get_clock ();
911 1100
912 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1101 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
913 { 1102 {
914 rt_now = rtmn_diff + mn_now; 1103 ev_rt_now = rtmn_diff + mn_now;
915 return 0; 1104 return 0;
916 } 1105 }
917 else 1106 else
918 { 1107 {
919 now_floor = mn_now; 1108 now_floor = mn_now;
920 rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
921 return 1; 1110 return 1;
922 } 1111 }
923} 1112}
924 1113
925static void 1114static void
… …
934 { 1123 {
935 ev_tstamp odiff = rtmn_diff; 1124 ev_tstamp odiff = rtmn_diff;
936 1125
937 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1126 for (i = 4; --i; ) /* loop a few times, before making important decisions */
938 { 1127 {
939 rtmn_diff = rt_now - mn_now; 1128 rtmn_diff = ev_rt_now - mn_now;
940 1129
941 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1130 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
942 return; /* all is well */ 1131 return; /* all is well */
943 1132
944 rt_now = ev_time (); 1133 ev_rt_now = ev_time ();
945 mn_now = get_clock (); 1134 mn_now = get_clock ();
946 now_floor = mn_now; 1135 now_floor = mn_now;
947 } 1136 }
948 1137
1138# if EV_PERIODICS
949 periodics_reschedule (EV_A); 1139 periodics_reschedule (EV_A);
1140# endif
950 /* no timer adjustment, as the monotonic clock doesn't jump */ 1141 /* no timer adjustment, as the monotonic clock doesn't jump */
951 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
952 } 1143 }
953 } 1144 }
954 else 1145 else
955#endif 1146#endif
956 { 1147 {
957 rt_now = ev_time (); 1148 ev_rt_now = ev_time ();
958 1149
959 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1150 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
960 { 1151 {
1152#if EV_PERIODICS
961 periodics_reschedule (EV_A); 1153 periodics_reschedule (EV_A);
1154#endif
962 1155
963 /* adjust timers. this is easy, as the offset is the same for all */ 1156 /* adjust timers. this is easy, as the offset is the same for all */
964 for (i = 0; i < timercnt; ++i) 1157 for (i = 0; i < timercnt; ++i)
965 ((WT)timers [i])->at += rt_now - mn_now; 1158 ((WT)timers [i])->at += ev_rt_now - mn_now;
966 } 1159 }
967 1160
968 mn_now = rt_now; 1161 mn_now = ev_rt_now;
969 } 1162 }
970} 1163}
971 1164
972void 1165void
973ev_ref (EV_P) 1166ev_ref (EV_P)
… …
987ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
988{ 1181{
989 double block; 1182 double block;
990 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
991 1184
992 do 1185 while (activecnt)
993 { 1186 {
994 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
995 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
996 { 1189 {
997 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
998 call_pending (EV_A); 1191 call_pending (EV_A);
999 } 1192 }
1000 1193
1194 /* we might have forked, so reify kernel state if necessary */
1195 if (expect_false (postfork))
1196 loop_fork (EV_A);
1197
1001 /* update fd-related kernel structures */ 1198 /* update fd-related kernel structures */
1002 fd_reify (EV_A); 1199 fd_reify (EV_A);
1003 1200
1004 /* calculate blocking time */ 1201 /* calculate blocking time */
1005 1202
1006 /* we only need this for !monotonic clockor timers, but as we basically 1203 /* we only need this for !monotonic clock or timers, but as we basically
1007 always have timers, we just calculate it always */ 1204 always have timers, we just calculate it always */
1008#if EV_USE_MONOTONIC 1205#if EV_USE_MONOTONIC
1009 if (expect_true (have_monotonic)) 1206 if (expect_true (have_monotonic))
1010 time_update_monotonic (EV_A); 1207 time_update_monotonic (EV_A);
1011 else 1208 else
1012#endif 1209#endif
1013 { 1210 {
1014 rt_now = ev_time (); 1211 ev_rt_now = ev_time ();
1015 mn_now = rt_now; 1212 mn_now = ev_rt_now;
1016 } 1213 }
1017 1214
1018 if (flags & EVLOOP_NONBLOCK || idlecnt) 1215 if (flags & EVLOOP_NONBLOCK || idlecnt)
1019 block = 0.; 1216 block = 0.;
1020 else 1217 else
… …
1025 { 1222 {
1026 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
1027 if (block > to) block = to; 1224 if (block > to) block = to;
1028 } 1225 }
1029 1226
1227#if EV_PERIODICS
1030 if (periodiccnt) 1228 if (periodiccnt)
1031 { 1229 {
1032 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1033 if (block > to) block = to; 1231 if (block > to) block = to;
1034 } 1232 }
1233#endif
1035 1234
1036 if (block < 0.) block = 0.; 1235 if (block < 0.) block = 0.;
1037 } 1236 }
1038 1237
1039 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1040 1239
1041 /* update rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
1042 time_update (EV_A); 1241 time_update (EV_A);
1043 1242
1044 /* queue pending timers and reschedule them */ 1243 /* queue pending timers and reschedule them */
1045 timers_reify (EV_A); /* relative timers called last */ 1244 timers_reify (EV_A); /* relative timers called last */
1245#if EV_PERIODICS
1046 periodics_reify (EV_A); /* absolute timers called first */ 1246 periodics_reify (EV_A); /* absolute timers called first */
1247#endif
1047 1248
1048 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1049 if (!pendingcnt) 1250 if (idlecnt && !any_pending (EV_A))
1050 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1051 1252
1052 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1053 if (checkcnt) 1254 if (checkcnt)
1054 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1055 1256
1056 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (loop_done)
1260 break;
1057 } 1261 }
1058 while (activecnt && !loop_done);
1059 1262
1060 if (loop_done != 2) 1263 if (loop_done != 2)
1061 loop_done = 0; 1264 loop_done = 0;
1062} 1265}
1063 1266
… …
1129 return; 1332 return;
1130 1333
1131 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1132 1335
1133 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
1134 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1337 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1135 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1338 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1136 1339
1137 fd_change (EV_A_ fd); 1340 fd_change (EV_A_ fd);
1138} 1341}
1139 1342
… …
1142{ 1345{
1143 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1144 if (!ev_is_active (w)) 1347 if (!ev_is_active (w))
1145 return; 1348 return;
1146 1349
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351
1147 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1148 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1149 1354
1150 fd_change (EV_A_ w->fd); 1355 fd_change (EV_A_ w->fd);
1151} 1356}
… …
1159 ((WT)w)->at += mn_now; 1364 ((WT)w)->at += mn_now;
1160 1365
1161 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1366 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1162 1367
1163 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1164 array_needsize (timers, timermax, timercnt, ); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1165 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1166 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1167 1372
1168 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1169} 1374}
… …
1178 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1179 1384
1180 if (((W)w)->active < timercnt--) 1385 if (((W)w)->active < timercnt--)
1181 { 1386 {
1182 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1183 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1184 } 1389 }
1185 1390
1186 ((WT)w)->at = w->repeat; 1391 ((WT)w)->at -= mn_now;
1187 1392
1188 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
1189} 1394}
1190 1395
1191void 1396void
… …
1194 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1195 { 1400 {
1196 if (w->repeat) 1401 if (w->repeat)
1197 { 1402 {
1198 ((WT)w)->at = mn_now + w->repeat; 1403 ((WT)w)->at = mn_now + w->repeat;
1199 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1200 } 1405 }
1201 else 1406 else
1202 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1203 } 1408 }
1204 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1205 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1206} 1414}
1207 1415
1416#if EV_PERIODICS
1208void 1417void
1209ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1210{ 1419{
1211 if (ev_is_active (w)) 1420 if (ev_is_active (w))
1212 return; 1421 return;
1213 1422
1423 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval)
1426 {
1214 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1427 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1215
1216 /* this formula differs from the one in periodic_reify because we do not always round up */ 1428 /* this formula differs from the one in periodic_reify because we do not always round up */
1217 if (w->interval)
1218 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1430 }
1219 1431
1220 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1221 array_needsize (periodics, periodicmax, periodiccnt, ); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1222 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1223 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1224 1436
1225 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1226} 1438}
… …
1235 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1236 1448
1237 if (((W)w)->active < periodiccnt--) 1449 if (((W)w)->active < periodiccnt--)
1238 { 1450 {
1239 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1240 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1241 } 1453 }
1242 1454
1243 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1244} 1456}
1245 1457
1246void 1458void
1459ev_periodic_again (EV_P_ struct ev_periodic *w)
1460{
1461 /* TODO: use adjustheap and recalculation */
1462 ev_periodic_stop (EV_A_ w);
1463 ev_periodic_start (EV_A_ w);
1464}
1465#endif
1466
1467void
1247ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1248{ 1469{
1249 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1250 return; 1471 return;
1251 1472
1252 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1253 array_needsize (idles, idlemax, idlecnt, ); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1254 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1255} 1476}
1256 1477
1257void 1478void
1258ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1259{ 1480{
1260 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1261 if (ev_is_active (w)) 1482 if (!ev_is_active (w))
1262 return; 1483 return;
1263 1484
1264 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1265 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1266} 1487}
… …
1270{ 1491{
1271 if (ev_is_active (w)) 1492 if (ev_is_active (w))
1272 return; 1493 return;
1273 1494
1274 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1275 array_needsize (prepares, preparemax, preparecnt, ); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1276 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1277} 1498}
1278 1499
1279void 1500void
1280ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1281{ 1502{
1282 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1283 if (ev_is_active (w)) 1504 if (!ev_is_active (w))
1284 return; 1505 return;
1285 1506
1286 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1287 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1288} 1509}
… …
1292{ 1513{
1293 if (ev_is_active (w)) 1514 if (ev_is_active (w))
1294 return; 1515 return;
1295 1516
1296 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1297 array_needsize (checks, checkmax, checkcnt, ); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1298 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1299} 1520}
1300 1521
1301void 1522void
1302ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1303{ 1524{
1304 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1305 if (ev_is_active (w)) 1526 if (!ev_is_active (w))
1306 return; 1527 return;
1307 1528
1308 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1309 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1310} 1531}
… …
1315 1536
1316void 1537void
1317ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1318{ 1539{
1319#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1320 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1541 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1321#endif 1542#endif
1322 if (ev_is_active (w)) 1543 if (ev_is_active (w))
1323 return; 1544 return;
1324 1545
1325 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1546 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1326 1547
1327 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
1328 array_needsize (signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1329 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1330 1551
1331 if (!((WL)w)->next) 1552 if (!((WL)w)->next)
1332 { 1553 {
1333#if WIN32 1554#if _WIN32
1334 signal (w->signum, sighandler); 1555 signal (w->signum, sighandler);
1335#else 1556#else
1336 struct sigaction sa; 1557 struct sigaction sa;
1337 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1338 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
… …
1358 1579
1359void 1580void
1360ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1361{ 1582{
1362#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1363 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1584 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1364#endif 1585#endif
1365 if (ev_is_active (w)) 1586 if (ev_is_active (w))
1366 return; 1587 return;
1367 1588
1368 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
… …
1371 1592
1372void 1593void
1373ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1374{ 1595{
1375 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1376 if (ev_is_active (w)) 1597 if (!ev_is_active (w))
1377 return; 1598 return;
1378 1599
1379 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1380 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1381} 1602}
… …
1396 void (*cb)(int revents, void *arg) = once->cb; 1617 void (*cb)(int revents, void *arg) = once->cb;
1397 void *arg = once->arg; 1618 void *arg = once->arg;
1398 1619
1399 ev_io_stop (EV_A_ &once->io); 1620 ev_io_stop (EV_A_ &once->io);
1400 ev_timer_stop (EV_A_ &once->to); 1621 ev_timer_stop (EV_A_ &once->to);
1401 free (once); 1622 ev_free (once);
1402 1623
1403 cb (revents, arg); 1624 cb (revents, arg);
1404} 1625}
1405 1626
1406static void 1627static void
… …
1416} 1637}
1417 1638
1418void 1639void
1419ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1640ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1420{ 1641{
1421 struct ev_once *once = malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1422 1643
1423 if (!once) 1644 if (!once)
1424 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1425 else 1646 else
1426 { 1647 {
1427 once->cb = cb; 1648 once->cb = cb;
1428 once->arg = arg; 1649 once->arg = arg;
1429 1650
1430 ev_watcher_init (&once->io, once_cb_io); 1651 ev_init (&once->io, once_cb_io);
1431 if (fd >= 0) 1652 if (fd >= 0)
1432 { 1653 {
1433 ev_io_set (&once->io, fd, events); 1654 ev_io_set (&once->io, fd, events);
1434 ev_io_start (EV_A_ &once->io); 1655 ev_io_start (EV_A_ &once->io);
1435 } 1656 }
1436 1657
1437 ev_watcher_init (&once->to, once_cb_to); 1658 ev_init (&once->to, once_cb_to);
1438 if (timeout >= 0.) 1659 if (timeout >= 0.)
1439 { 1660 {
1440 ev_timer_set (&once->to, timeout, 0.); 1661 ev_timer_set (&once->to, timeout, 0.);
1441 ev_timer_start (EV_A_ &once->to); 1662 ev_timer_start (EV_A_ &once->to);
1442 } 1663 }
1443 } 1664 }
1444} 1665}
1445 1666
1667#ifdef __cplusplus
1668}
1669#endif
1670

Diff Legend

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