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

Comparing libev/ev.c (file contents):
Revision 1.62 by root, Sun Nov 4 20:38:07 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
188#ifdef _WIN32
189# include "ev_win32.c"
190#endif
191
150/*****************************************************************************/ 192/*****************************************************************************/
151 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
152typedef struct 242typedef struct
153{ 243{
154 struct ev_watcher_list *head; 244 WL head;
155 unsigned char events; 245 unsigned char events;
156 unsigned char reify; 246 unsigned char reify;
247#if EV_SELECT_IS_WINSOCKET
248 SOCKET handle;
249#endif
157} ANFD; 250} ANFD;
158 251
159typedef struct 252typedef struct
160{ 253{
161 W w; 254 W w;
162 int events; 255 int events;
163} ANPENDING; 256} ANPENDING;
164 257
165#if EV_MULTIPLICITY 258#if EV_MULTIPLICITY
166 259
167struct ev_loop 260 struct ev_loop
168{ 261 {
262 ev_tstamp ev_rt_now;
263 #define ev_rt_now ((loop)->ev_rt_now)
169# define VAR(name,decl) decl; 264 #define VAR(name,decl) decl;
170# include "ev_vars.h" 265 #include "ev_vars.h"
171};
172# undef VAR 266 #undef VAR
267 };
173# 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;
174 272
175#else 273#else
176 274
275 ev_tstamp ev_rt_now;
177# define VAR(name,decl) static decl; 276 #define VAR(name,decl) static decl;
178# include "ev_vars.h" 277 #include "ev_vars.h"
179# undef VAR 278 #undef VAR
279
280 static int ev_default_loop_ptr;
180 281
181#endif 282#endif
182 283
183/*****************************************************************************/ 284/*****************************************************************************/
184 285
185inline ev_tstamp 286ev_tstamp
186ev_time (void) 287ev_time (void)
187{ 288{
188#if EV_USE_REALTIME 289#if EV_USE_REALTIME
189 struct timespec ts; 290 struct timespec ts;
190 clock_gettime (CLOCK_REALTIME, &ts); 291 clock_gettime (CLOCK_REALTIME, &ts);
… …
209#endif 310#endif
210 311
211 return ev_time (); 312 return ev_time ();
212} 313}
213 314
315#if EV_MULTIPLICITY
214ev_tstamp 316ev_tstamp
215ev_now (EV_P) 317ev_now (EV_P)
216{ 318{
217 return rt_now; 319 return ev_rt_now;
218} 320}
321#endif
219 322
220#define array_roundsize(base,n) ((n) | 4 & ~3) 323#define array_roundsize(type,n) (((n) | 4) & ~3)
221 324
222#define array_needsize(base,cur,cnt,init) \ 325#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 326 if (expect_false ((cnt) > cur)) \
224 { \ 327 { \
225 int newcnt = cur; \ 328 int newcnt = cur; \
226 do \ 329 do \
227 { \ 330 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 331 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 332 } \
230 while ((cnt) > newcnt); \ 333 while ((cnt) > newcnt); \
231 \ 334 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 335 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 336 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 337 cur = newcnt; \
235 } 338 }
339
340#define array_slim(type,stem) \
341 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
342 { \
343 stem ## max = array_roundsize (stem ## cnt >> 1); \
344 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
345 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
346 }
347
348#define array_free(stem, idx) \
349 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 350
237/*****************************************************************************/ 351/*****************************************************************************/
238 352
239static void 353static void
240anfds_init (ANFD *base, int count) 354anfds_init (ANFD *base, int count)
… …
247 361
248 ++base; 362 ++base;
249 } 363 }
250} 364}
251 365
252static void 366void
253event (EV_P_ W w, int events) 367ev_feed_event (EV_P_ void *w, int revents)
254{ 368{
369 W w_ = (W)w;
370
255 if (w->pending) 371 if (w_->pending)
256 { 372 {
257 pendings [ABSPRI (w)][w->pending - 1].events |= events; 373 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
258 return; 374 return;
259 } 375 }
260 376
261 w->pending = ++pendingcnt [ABSPRI (w)]; 377 w_->pending = ++pendingcnt [ABSPRI (w_)];
262 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);
263 pendings [ABSPRI (w)][w->pending - 1].w = w; 379 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
264 pendings [ABSPRI (w)][w->pending - 1].events = events; 380 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
265} 381}
266 382
267static void 383static void
268queue_events (EV_P_ W *events, int eventcnt, int type) 384queue_events (EV_P_ W *events, int eventcnt, int type)
269{ 385{
270 int i; 386 int i;
271 387
272 for (i = 0; i < eventcnt; ++i) 388 for (i = 0; i < eventcnt; ++i)
273 event (EV_A_ events [i], type); 389 ev_feed_event (EV_A_ events [i], type);
274} 390}
275 391
276static void 392inline void
277fd_event (EV_P_ int fd, int events) 393fd_event (EV_P_ int fd, int revents)
278{ 394{
279 ANFD *anfd = anfds + fd; 395 ANFD *anfd = anfds + fd;
280 struct ev_io *w; 396 struct ev_io *w;
281 397
282 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)
283 { 399 {
284 int ev = w->events & events; 400 int ev = w->events & revents;
285 401
286 if (ev) 402 if (ev)
287 event (EV_A_ (W)w, ev); 403 ev_feed_event (EV_A_ (W)w, ev);
288 } 404 }
405}
406
407void
408ev_feed_fd_event (EV_P_ int fd, int revents)
409{
410 fd_event (EV_A_ fd, revents);
289} 411}
290 412
291/*****************************************************************************/ 413/*****************************************************************************/
292 414
293static void 415static void
… …
304 int events = 0; 426 int events = 0;
305 427
306 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)
307 events |= w->events; 429 events |= w->events;
308 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
309 anfd->reify = 0; 440 anfd->reify = 0;
310 441
311 if (anfd->events != events)
312 {
313 method_modify (EV_A_ fd, anfd->events, events); 442 method_modify (EV_A_ fd, anfd->events, events);
314 anfd->events = events; 443 anfd->events = events;
315 }
316 } 444 }
317 445
318 fdchangecnt = 0; 446 fdchangecnt = 0;
319} 447}
320 448
321static void 449static void
322fd_change (EV_P_ int fd) 450fd_change (EV_P_ int fd)
323{ 451{
324 if (anfds [fd].reify || fdchangecnt < 0) 452 if (anfds [fd].reify)
325 return; 453 return;
326 454
327 anfds [fd].reify = 1; 455 anfds [fd].reify = 1;
328 456
329 ++fdchangecnt; 457 ++fdchangecnt;
330 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 458 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
331 fdchanges [fdchangecnt - 1] = fd; 459 fdchanges [fdchangecnt - 1] = fd;
332} 460}
333 461
334static void 462static void
335fd_kill (EV_P_ int fd) 463fd_kill (EV_P_ int fd)
… …
337 struct ev_io *w; 465 struct ev_io *w;
338 466
339 while ((w = (struct ev_io *)anfds [fd].head)) 467 while ((w = (struct ev_io *)anfds [fd].head))
340 { 468 {
341 ev_io_stop (EV_A_ w); 469 ev_io_stop (EV_A_ w);
342 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);
343 } 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
344} 482}
345 483
346/* called on EBADF to verify fds */ 484/* called on EBADF to verify fds */
347static void 485static void
348fd_ebadf (EV_P) 486fd_ebadf (EV_P)
349{ 487{
350 int fd; 488 int fd;
351 489
352 for (fd = 0; fd < anfdmax; ++fd) 490 for (fd = 0; fd < anfdmax; ++fd)
353 if (anfds [fd].events) 491 if (anfds [fd].events)
354 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 492 if (!fd_valid (fd) == -1 && errno == EBADF)
355 fd_kill (EV_A_ fd); 493 fd_kill (EV_A_ fd);
356} 494}
357 495
358/* 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 */
359static void 497static void
… …
362 int fd; 500 int fd;
363 501
364 for (fd = anfdmax; fd--; ) 502 for (fd = anfdmax; fd--; )
365 if (anfds [fd].events) 503 if (anfds [fd].events)
366 { 504 {
367 close (fd);
368 fd_kill (EV_A_ fd); 505 fd_kill (EV_A_ fd);
369 return; 506 return;
370 } 507 }
371} 508}
372 509
373/* 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 */
374static void 511static void
375fd_rearm_all (EV_P) 512fd_rearm_all (EV_P)
376{ 513{
377 int fd; 514 int fd;
378 515
… …
426 563
427 heap [k] = w; 564 heap [k] = w;
428 ((W)heap [k])->active = k + 1; 565 ((W)heap [k])->active = k + 1;
429} 566}
430 567
568inline void
569adjustheap (WT *heap, int N, int k)
570{
571 upheap (heap, k);
572 downheap (heap, N, k);
573}
574
431/*****************************************************************************/ 575/*****************************************************************************/
432 576
433typedef struct 577typedef struct
434{ 578{
435 struct ev_watcher_list *head; 579 WL head;
436 sig_atomic_t volatile gotsig; 580 sig_atomic_t volatile gotsig;
437} ANSIG; 581} ANSIG;
438 582
439static ANSIG *signals; 583static ANSIG *signals;
440static int signalmax; 584static int signalmax;
… …
456} 600}
457 601
458static void 602static void
459sighandler (int signum) 603sighandler (int signum)
460{ 604{
605#if _WIN32
606 signal (signum, sighandler);
607#endif
608
461 signals [signum - 1].gotsig = 1; 609 signals [signum - 1].gotsig = 1;
462 610
463 if (!gotsig) 611 if (!gotsig)
464 { 612 {
465 int old_errno = errno; 613 int old_errno = errno;
… …
467 write (sigpipe [1], &signum, 1); 615 write (sigpipe [1], &signum, 1);
468 errno = old_errno; 616 errno = old_errno;
469 } 617 }
470} 618}
471 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
472static void 640static void
473sigcb (EV_P_ struct ev_io *iow, int revents) 641sigcb (EV_P_ struct ev_io *iow, int revents)
474{ 642{
475 struct ev_watcher_list *w;
476 int signum; 643 int signum;
477 644
478 read (sigpipe [0], &revents, 1); 645 read (sigpipe [0], &revents, 1);
479 gotsig = 0; 646 gotsig = 0;
480 647
481 for (signum = signalmax; signum--; ) 648 for (signum = signalmax; signum--; )
482 if (signals [signum].gotsig) 649 if (signals [signum].gotsig)
483 { 650 ev_feed_signal_event (EV_A_ signum + 1);
484 signals [signum].gotsig = 0; 651}
485 652
486 for (w = signals [signum].head; w; w = w->next) 653inline void
487 event (EV_A_ (W)w, EV_SIGNAL); 654fd_intern (int fd)
488 } 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
489} 663}
490 664
491static void 665static void
492siginit (EV_P) 666siginit (EV_P)
493{ 667{
494#ifndef WIN32 668 fd_intern (sigpipe [0]);
495 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 669 fd_intern (sigpipe [1]);
496 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
497
498 /* rather than sort out wether we really need nb, set it */
499 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
500 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
501#endif
502 670
503 ev_io_set (&sigev, sigpipe [0], EV_READ); 671 ev_io_set (&sigev, sigpipe [0], EV_READ);
504 ev_io_start (EV_A_ &sigev); 672 ev_io_start (EV_A_ &sigev);
505 ev_unref (EV_A); /* child watcher should not keep loop alive */ 673 ev_unref (EV_A); /* child watcher should not keep loop alive */
506} 674}
507 675
508/*****************************************************************************/ 676/*****************************************************************************/
509 677
510#ifndef WIN32
511
512static struct ev_child *childs [PID_HASHSIZE]; 678static struct ev_child *childs [PID_HASHSIZE];
679
680#ifndef _WIN32
681
513static struct ev_signal childev; 682static struct ev_signal childev;
514 683
515#ifndef WCONTINUED 684#ifndef WCONTINUED
516# define WCONTINUED 0 685# define WCONTINUED 0
517#endif 686#endif
… …
522 struct ev_child *w; 691 struct ev_child *w;
523 692
524 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 693 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next)
525 if (w->pid == pid || !w->pid) 694 if (w->pid == pid || !w->pid)
526 { 695 {
527 w->priority = sw->priority; /* need to do it *now* */ 696 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
528 w->rpid = pid; 697 w->rpid = pid;
529 w->rstatus = status; 698 w->rstatus = status;
530 event (EV_A_ (W)w, EV_CHILD); 699 ev_feed_event (EV_A_ (W)w, EV_CHILD);
531 } 700 }
532} 701}
533 702
534static void 703static void
535childcb (EV_P_ struct ev_signal *sw, int revents) 704childcb (EV_P_ struct ev_signal *sw, int revents)
… …
537 int pid, status; 706 int pid, status;
538 707
539 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 708 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
540 { 709 {
541 /* 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 */
542 event (EV_A_ (W)sw, EV_SIGNAL); 711 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
543 712
544 child_reap (EV_A_ sw, pid, pid, status); 713 child_reap (EV_A_ sw, pid, pid, status);
545 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 714 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
546 } 715 }
547} 716}
548 717
549#endif 718#endif
550 719
551/*****************************************************************************/ 720/*****************************************************************************/
552 721
722#if EV_USE_PORT
723# include "ev_port.c"
724#endif
553#if EV_USE_KQUEUE 725#if EV_USE_KQUEUE
554# include "ev_kqueue.c" 726# include "ev_kqueue.c"
555#endif 727#endif
556#if EV_USE_EPOLL 728#if EV_USE_EPOLL
557# include "ev_epoll.c" 729# include "ev_epoll.c"
… …
577 749
578/* 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 */
579static int 751static int
580enable_secure (void) 752enable_secure (void)
581{ 753{
582#ifdef WIN32 754#ifdef _WIN32
583 return 0; 755 return 0;
584#else 756#else
585 return getuid () != geteuid () 757 return getuid () != geteuid ()
586 || getgid () != getegid (); 758 || getgid () != getegid ();
587#endif 759#endif
588} 760}
589 761
590int 762unsigned int
591ev_method (EV_P) 763ev_method (EV_P)
592{ 764{
593 return method; 765 return method;
594} 766}
595 767
596static void 768static void
597loop_init (EV_P_ int methods) 769loop_init (EV_P_ unsigned int flags)
598{ 770{
599 if (!method) 771 if (!method)
600 { 772 {
601#if EV_USE_MONOTONIC 773#if EV_USE_MONOTONIC
602 { 774 {
… …
604 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 776 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
605 have_monotonic = 1; 777 have_monotonic = 1;
606 } 778 }
607#endif 779#endif
608 780
609 rt_now = ev_time (); 781 ev_rt_now = ev_time ();
610 mn_now = get_clock (); 782 mn_now = get_clock ();
611 now_floor = mn_now; 783 now_floor = mn_now;
612 rtmn_diff = rt_now - mn_now; 784 rtmn_diff = ev_rt_now - mn_now;
613 785
614 if (methods == EVMETHOD_AUTO) 786 if (!(flags & EVFLAG_NOENV) && !enable_secure () && getenv ("LIBEV_FLAGS"))
615 if (!enable_secure () && getenv ("LIBEV_METHODS"))
616 methods = atoi (getenv ("LIBEV_METHODS")); 787 flags = atoi (getenv ("LIBEV_FLAGS"));
617 else 788
618 methods = EVMETHOD_ANY; 789 if (!(flags & 0x0000ffff))
790 flags |= 0x0000ffff;
619 791
620 method = 0; 792 method = 0;
621#if EV_USE_WIN32 793#if EV_USE_PORT
622 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 794 if (!method && (flags & EVMETHOD_PORT )) method = port_init (EV_A_ flags);
623#endif 795#endif
624#if EV_USE_KQUEUE 796#if EV_USE_KQUEUE
625 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 797 if (!method && (flags & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ flags);
626#endif 798#endif
627#if EV_USE_EPOLL 799#if EV_USE_EPOLL
628 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 800 if (!method && (flags & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ flags);
629#endif 801#endif
630#if EV_USE_POLL 802#if EV_USE_POLL
631 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 803 if (!method && (flags & EVMETHOD_POLL )) method = poll_init (EV_A_ flags);
632#endif 804#endif
633#if EV_USE_SELECT 805#if EV_USE_SELECT
634 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 806 if (!method && (flags & EVMETHOD_SELECT)) method = select_init (EV_A_ flags);
635#endif 807#endif
808
809 ev_init (&sigev, sigcb);
810 ev_set_priority (&sigev, EV_MAXPRI);
636 } 811 }
637} 812}
638 813
639void 814void
640loop_destroy (EV_P) 815loop_destroy (EV_P)
641{ 816{
642#if EV_USE_WIN32 817 int i;
818
819#if EV_USE_PORT
643 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 820 if (method == EVMETHOD_PORT ) port_destroy (EV_A);
644#endif 821#endif
645#if EV_USE_KQUEUE 822#if EV_USE_KQUEUE
646 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 823 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A);
647#endif 824#endif
648#if EV_USE_EPOLL 825#if EV_USE_EPOLL
… …
653#endif 830#endif
654#if EV_USE_SELECT 831#if EV_USE_SELECT
655 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 832 if (method == EVMETHOD_SELECT) select_destroy (EV_A);
656#endif 833#endif
657 834
835 for (i = NUMPRI; i--; )
836 array_free (pending, [i]);
837
838 /* have to use the microsoft-never-gets-it-right macro */
839 array_free (fdchange, EMPTY0);
840 array_free (timer, EMPTY0);
841#if EV_PERIODICS
842 array_free (periodic, EMPTY0);
843#endif
844 array_free (idle, EMPTY0);
845 array_free (prepare, EMPTY0);
846 array_free (check, EMPTY0);
847
658 method = 0; 848 method = 0;
659 /*TODO*/
660} 849}
661 850
662void 851static void
663loop_fork (EV_P) 852loop_fork (EV_P)
664{ 853{
665 /*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
666#if EV_USE_EPOLL 860#if EV_USE_EPOLL
667 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 861 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A);
668#endif 862#endif
669#if EV_USE_KQUEUE 863
670 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 864 if (ev_is_active (&sigev))
671#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;
672} 880}
673 881
674#if EV_MULTIPLICITY 882#if EV_MULTIPLICITY
675struct ev_loop * 883struct ev_loop *
676ev_loop_new (int methods) 884ev_loop_new (unsigned int flags)
677{ 885{
678 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));
679 887
888 memset (loop, 0, sizeof (struct ev_loop));
889
680 loop_init (EV_A_ methods); 890 loop_init (EV_A_ flags);
681 891
682 if (ev_method (EV_A)) 892 if (ev_method (EV_A))
683 return loop; 893 return loop;
684 894
685 return 0; 895 return 0;
… …
687 897
688void 898void
689ev_loop_destroy (EV_P) 899ev_loop_destroy (EV_P)
690{ 900{
691 loop_destroy (EV_A); 901 loop_destroy (EV_A);
692 free (loop); 902 ev_free (loop);
693} 903}
694 904
695void 905void
696ev_loop_fork (EV_P) 906ev_loop_fork (EV_P)
697{ 907{
698 loop_fork (EV_A); 908 postfork = 1;
699} 909}
700 910
701#endif 911#endif
702 912
703#if EV_MULTIPLICITY 913#if EV_MULTIPLICITY
704struct ev_loop default_loop_struct;
705static struct ev_loop *default_loop;
706
707struct ev_loop * 914struct ev_loop *
915ev_default_loop_ (unsigned int flags)
708#else 916#else
709static int default_loop;
710
711int 917int
918ev_default_loop (unsigned int flags)
712#endif 919#endif
713ev_default_loop (int methods)
714{ 920{
715 if (sigpipe [0] == sigpipe [1]) 921 if (sigpipe [0] == sigpipe [1])
716 if (pipe (sigpipe)) 922 if (pipe (sigpipe))
717 return 0; 923 return 0;
718 924
719 if (!default_loop) 925 if (!ev_default_loop_ptr)
720 { 926 {
721#if EV_MULTIPLICITY 927#if EV_MULTIPLICITY
722 struct ev_loop *loop = default_loop = &default_loop_struct; 928 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
723#else 929#else
724 default_loop = 1; 930 ev_default_loop_ptr = 1;
725#endif 931#endif
726 932
727 loop_init (EV_A_ methods); 933 loop_init (EV_A_ flags);
728 934
729 if (ev_method (EV_A)) 935 if (ev_method (EV_A))
730 { 936 {
731 ev_watcher_init (&sigev, sigcb);
732 ev_set_priority (&sigev, EV_MAXPRI);
733 siginit (EV_A); 937 siginit (EV_A);
734 938
735#ifndef WIN32 939#ifndef _WIN32
736 ev_signal_init (&childev, childcb, SIGCHLD); 940 ev_signal_init (&childev, childcb, SIGCHLD);
737 ev_set_priority (&childev, EV_MAXPRI); 941 ev_set_priority (&childev, EV_MAXPRI);
738 ev_signal_start (EV_A_ &childev); 942 ev_signal_start (EV_A_ &childev);
739 ev_unref (EV_A); /* child watcher should not keep loop alive */ 943 ev_unref (EV_A); /* child watcher should not keep loop alive */
740#endif 944#endif
741 } 945 }
742 else 946 else
743 default_loop = 0; 947 ev_default_loop_ptr = 0;
744 } 948 }
745 949
746 return default_loop; 950 return ev_default_loop_ptr;
747} 951}
748 952
749void 953void
750ev_default_destroy (void) 954ev_default_destroy (void)
751{ 955{
752#if EV_MULTIPLICITY 956#if EV_MULTIPLICITY
753 struct ev_loop *loop = default_loop; 957 struct ev_loop *loop = ev_default_loop_ptr;
754#endif 958#endif
755 959
960#ifndef _WIN32
756 ev_ref (EV_A); /* child watcher */ 961 ev_ref (EV_A); /* child watcher */
757 ev_signal_stop (EV_A_ &childev); 962 ev_signal_stop (EV_A_ &childev);
963#endif
758 964
759 ev_ref (EV_A); /* signal watcher */ 965 ev_ref (EV_A); /* signal watcher */
760 ev_io_stop (EV_A_ &sigev); 966 ev_io_stop (EV_A_ &sigev);
761 967
762 close (sigpipe [0]); sigpipe [0] = 0; 968 close (sigpipe [0]); sigpipe [0] = 0;
… …
767 973
768void 974void
769ev_default_fork (void) 975ev_default_fork (void)
770{ 976{
771#if EV_MULTIPLICITY 977#if EV_MULTIPLICITY
772 struct ev_loop *loop = default_loop; 978 struct ev_loop *loop = ev_default_loop_ptr;
773#endif 979#endif
774 980
775 loop_fork (EV_A); 981 if (method)
776 982 postfork = 1;
777 ev_io_stop (EV_A_ &sigev);
778 close (sigpipe [0]);
779 close (sigpipe [1]);
780 pipe (sigpipe);
781
782 ev_ref (EV_A); /* signal watcher */
783 siginit (EV_A);
784} 983}
785 984
786/*****************************************************************************/ 985/*****************************************************************************/
787 986
788static 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
789call_pending (EV_P) 1000call_pending (EV_P)
790{ 1001{
791 int pri; 1002 int pri;
792 1003
793 for (pri = NUMPRI; pri--; ) 1004 for (pri = NUMPRI; pri--; )
794 while (pendingcnt [pri]) 1005 while (pendingcnt [pri])
795 { 1006 {
796 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1007 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
797 1008
798 if (p->w) 1009 if (expect_true (p->w))
799 { 1010 {
800 p->w->pending = 0; 1011 p->w->pending = 0;
801 p->w->cb (EV_A_ p->w, p->events); 1012 EV_CB_INVOKE (p->w, p->events);
802 } 1013 }
803 } 1014 }
804} 1015}
805 1016
806static void 1017static void
807timers_reify (EV_P) 1018timers_reify (EV_P)
808{ 1019{
809 while (timercnt && timers [0]->at <= mn_now) 1020 while (timercnt && ((WT)timers [0])->at <= mn_now)
810 { 1021 {
811 struct ev_timer *w = timers [0]; 1022 struct ev_timer *w = timers [0];
812 1023
813 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1024 assert (("inactive timer on timer heap detected", ev_is_active (w)));
814 1025
815 /* first reschedule or stop timer */ 1026 /* first reschedule or stop timer */
816 if (w->repeat) 1027 if (w->repeat)
817 { 1028 {
818 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
819 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
820 downheap ((WT *)timers, timercnt, 0); 1035 downheap ((WT *)timers, timercnt, 0);
821 } 1036 }
822 else 1037 else
823 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1038 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
824 1039
825 event (EV_A_ (W)w, EV_TIMEOUT); 1040 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
826 } 1041 }
827} 1042}
828 1043
1044#if EV_PERIODICS
829static void 1045static void
830periodics_reify (EV_P) 1046periodics_reify (EV_P)
831{ 1047{
832 while (periodiccnt && periodics [0]->at <= rt_now) 1048 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
833 { 1049 {
834 struct ev_periodic *w = periodics [0]; 1050 struct ev_periodic *w = periodics [0];
835 1051
836 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1052 assert (("inactive timer on periodic heap detected", ev_is_active (w)));
837 1053
838 /* first reschedule or stop timer */ 1054 /* first reschedule or stop timer */
839 if (w->interval) 1055 if (w->reschedule_cb)
840 { 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 {
841 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval; 1063 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
842 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now)); 1064 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
843 downheap ((WT *)periodics, periodiccnt, 0); 1065 downheap ((WT *)periodics, periodiccnt, 0);
844 } 1066 }
845 else 1067 else
846 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1068 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
847 1069
848 event (EV_A_ (W)w, EV_PERIODIC); 1070 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
849 } 1071 }
850} 1072}
851 1073
852static void 1074static void
853periodics_reschedule (EV_P) 1075periodics_reschedule (EV_P)
… …
857 /* adjust periodics after time jump */ 1079 /* adjust periodics after time jump */
858 for (i = 0; i < periodiccnt; ++i) 1080 for (i = 0; i < periodiccnt; ++i)
859 { 1081 {
860 struct ev_periodic *w = periodics [i]; 1082 struct ev_periodic *w = periodics [i];
861 1083
1084 if (w->reschedule_cb)
1085 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
862 if (w->interval) 1086 else if (w->interval)
863 {
864 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval; 1087 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
865
866 if (fabs (diff) >= 1e-4)
867 {
868 ev_periodic_stop (EV_A_ w);
869 ev_periodic_start (EV_A_ w);
870
871 i = 0; /* restart loop, inefficient, but time jumps should be rare */
872 }
873 }
874 } 1088 }
1089
1090 /* now rebuild the heap */
1091 for (i = periodiccnt >> 1; i--; )
1092 downheap ((WT *)periodics, periodiccnt, i);
875} 1093}
1094#endif
876 1095
877inline int 1096inline int
878time_update_monotonic (EV_P) 1097time_update_monotonic (EV_P)
879{ 1098{
880 mn_now = get_clock (); 1099 mn_now = get_clock ();
881 1100
882 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1101 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
883 { 1102 {
884 rt_now = rtmn_diff + mn_now; 1103 ev_rt_now = rtmn_diff + mn_now;
885 return 0; 1104 return 0;
886 } 1105 }
887 else 1106 else
888 { 1107 {
889 now_floor = mn_now; 1108 now_floor = mn_now;
890 rt_now = ev_time (); 1109 ev_rt_now = ev_time ();
891 return 1; 1110 return 1;
892 } 1111 }
893} 1112}
894 1113
895static void 1114static void
… …
904 { 1123 {
905 ev_tstamp odiff = rtmn_diff; 1124 ev_tstamp odiff = rtmn_diff;
906 1125
907 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 */
908 { 1127 {
909 rtmn_diff = rt_now - mn_now; 1128 rtmn_diff = ev_rt_now - mn_now;
910 1129
911 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1130 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
912 return; /* all is well */ 1131 return; /* all is well */
913 1132
914 rt_now = ev_time (); 1133 ev_rt_now = ev_time ();
915 mn_now = get_clock (); 1134 mn_now = get_clock ();
916 now_floor = mn_now; 1135 now_floor = mn_now;
917 } 1136 }
918 1137
1138# if EV_PERIODICS
919 periodics_reschedule (EV_A); 1139 periodics_reschedule (EV_A);
1140# endif
920 /* no timer adjustment, as the monotonic clock doesn't jump */ 1141 /* no timer adjustment, as the monotonic clock doesn't jump */
921 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1142 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
922 } 1143 }
923 } 1144 }
924 else 1145 else
925#endif 1146#endif
926 { 1147 {
927 rt_now = ev_time (); 1148 ev_rt_now = ev_time ();
928 1149
929 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))
930 { 1151 {
1152#if EV_PERIODICS
931 periodics_reschedule (EV_A); 1153 periodics_reschedule (EV_A);
1154#endif
932 1155
933 /* 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 */
934 for (i = 0; i < timercnt; ++i) 1157 for (i = 0; i < timercnt; ++i)
935 timers [i]->at += rt_now - mn_now; 1158 ((WT)timers [i])->at += ev_rt_now - mn_now;
936 } 1159 }
937 1160
938 mn_now = rt_now; 1161 mn_now = ev_rt_now;
939 } 1162 }
940} 1163}
941 1164
942void 1165void
943ev_ref (EV_P) 1166ev_ref (EV_P)
… …
957ev_loop (EV_P_ int flags) 1180ev_loop (EV_P_ int flags)
958{ 1181{
959 double block; 1182 double block;
960 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1183 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
961 1184
962 do 1185 while (activecnt)
963 { 1186 {
964 /* queue check watchers (and execute them) */ 1187 /* queue check watchers (and execute them) */
965 if (expect_false (preparecnt)) 1188 if (expect_false (preparecnt))
966 { 1189 {
967 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1190 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
968 call_pending (EV_A); 1191 call_pending (EV_A);
969 } 1192 }
970 1193
1194 /* we might have forked, so reify kernel state if necessary */
1195 if (expect_false (postfork))
1196 loop_fork (EV_A);
1197
971 /* update fd-related kernel structures */ 1198 /* update fd-related kernel structures */
972 fd_reify (EV_A); 1199 fd_reify (EV_A);
973 1200
974 /* calculate blocking time */ 1201 /* calculate blocking time */
975 1202
976 /* 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
977 always have timers, we just calculate it always */ 1204 always have timers, we just calculate it always */
978#if EV_USE_MONOTONIC 1205#if EV_USE_MONOTONIC
979 if (expect_true (have_monotonic)) 1206 if (expect_true (have_monotonic))
980 time_update_monotonic (EV_A); 1207 time_update_monotonic (EV_A);
981 else 1208 else
982#endif 1209#endif
983 { 1210 {
984 rt_now = ev_time (); 1211 ev_rt_now = ev_time ();
985 mn_now = rt_now; 1212 mn_now = ev_rt_now;
986 } 1213 }
987 1214
988 if (flags & EVLOOP_NONBLOCK || idlecnt) 1215 if (flags & EVLOOP_NONBLOCK || idlecnt)
989 block = 0.; 1216 block = 0.;
990 else 1217 else
991 { 1218 {
992 block = MAX_BLOCKTIME; 1219 block = MAX_BLOCKTIME;
993 1220
994 if (timercnt) 1221 if (timercnt)
995 { 1222 {
996 ev_tstamp to = timers [0]->at - mn_now + method_fudge; 1223 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge;
997 if (block > to) block = to; 1224 if (block > to) block = to;
998 } 1225 }
999 1226
1227#if EV_PERIODICS
1000 if (periodiccnt) 1228 if (periodiccnt)
1001 { 1229 {
1002 ev_tstamp to = periodics [0]->at - rt_now + method_fudge; 1230 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + method_fudge;
1003 if (block > to) block = to; 1231 if (block > to) block = to;
1004 } 1232 }
1233#endif
1005 1234
1006 if (block < 0.) block = 0.; 1235 if (block < 0.) block = 0.;
1007 } 1236 }
1008 1237
1009 method_poll (EV_A_ block); 1238 method_poll (EV_A_ block);
1010 1239
1011 /* update rt_now, do magic */ 1240 /* update ev_rt_now, do magic */
1012 time_update (EV_A); 1241 time_update (EV_A);
1013 1242
1014 /* queue pending timers and reschedule them */ 1243 /* queue pending timers and reschedule them */
1015 timers_reify (EV_A); /* relative timers called last */ 1244 timers_reify (EV_A); /* relative timers called last */
1245#if EV_PERIODICS
1016 periodics_reify (EV_A); /* absolute timers called first */ 1246 periodics_reify (EV_A); /* absolute timers called first */
1247#endif
1017 1248
1018 /* queue idle watchers unless io or timers are pending */ 1249 /* queue idle watchers unless io or timers are pending */
1019 if (!pendingcnt) 1250 if (idlecnt && !any_pending (EV_A))
1020 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1251 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1021 1252
1022 /* queue check watchers, to be executed first */ 1253 /* queue check watchers, to be executed first */
1023 if (checkcnt) 1254 if (checkcnt)
1024 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1255 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1025 1256
1026 call_pending (EV_A); 1257 call_pending (EV_A);
1258
1259 if (loop_done)
1260 break;
1027 } 1261 }
1028 while (activecnt && !loop_done);
1029 1262
1030 if (loop_done != 2) 1263 if (loop_done != 2)
1031 loop_done = 0; 1264 loop_done = 0;
1032} 1265}
1033 1266
… …
1099 return; 1332 return;
1100 1333
1101 assert (("ev_io_start called with negative fd", fd >= 0)); 1334 assert (("ev_io_start called with negative fd", fd >= 0));
1102 1335
1103 ev_start (EV_A_ (W)w, 1); 1336 ev_start (EV_A_ (W)w, 1);
1104 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1337 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1105 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1338 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1106 1339
1107 fd_change (EV_A_ fd); 1340 fd_change (EV_A_ fd);
1108} 1341}
1109 1342
… …
1112{ 1345{
1113 ev_clear_pending (EV_A_ (W)w); 1346 ev_clear_pending (EV_A_ (W)w);
1114 if (!ev_is_active (w)) 1347 if (!ev_is_active (w))
1115 return; 1348 return;
1116 1349
1350 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1351
1117 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1352 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1118 ev_stop (EV_A_ (W)w); 1353 ev_stop (EV_A_ (W)w);
1119 1354
1120 fd_change (EV_A_ w->fd); 1355 fd_change (EV_A_ w->fd);
1121} 1356}
… …
1124ev_timer_start (EV_P_ struct ev_timer *w) 1359ev_timer_start (EV_P_ struct ev_timer *w)
1125{ 1360{
1126 if (ev_is_active (w)) 1361 if (ev_is_active (w))
1127 return; 1362 return;
1128 1363
1129 w->at += mn_now; 1364 ((WT)w)->at += mn_now;
1130 1365
1131 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.));
1132 1367
1133 ev_start (EV_A_ (W)w, ++timercnt); 1368 ev_start (EV_A_ (W)w, ++timercnt);
1134 array_needsize (timers, timermax, timercnt, ); 1369 array_needsize (struct ev_timer *, timers, timermax, timercnt, EMPTY2);
1135 timers [timercnt - 1] = w; 1370 timers [timercnt - 1] = w;
1136 upheap ((WT *)timers, timercnt - 1); 1371 upheap ((WT *)timers, timercnt - 1);
1137 1372
1138 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1373 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1139} 1374}
… …
1148 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1383 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1149 1384
1150 if (((W)w)->active < timercnt--) 1385 if (((W)w)->active < timercnt--)
1151 { 1386 {
1152 timers [((W)w)->active - 1] = timers [timercnt]; 1387 timers [((W)w)->active - 1] = timers [timercnt];
1153 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1388 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1154 } 1389 }
1155 1390
1156 w->at = w->repeat; 1391 ((WT)w)->at -= mn_now;
1157 1392
1158 ev_stop (EV_A_ (W)w); 1393 ev_stop (EV_A_ (W)w);
1159} 1394}
1160 1395
1161void 1396void
… …
1163{ 1398{
1164 if (ev_is_active (w)) 1399 if (ev_is_active (w))
1165 { 1400 {
1166 if (w->repeat) 1401 if (w->repeat)
1167 { 1402 {
1168 w->at = mn_now + w->repeat; 1403 ((WT)w)->at = mn_now + w->repeat;
1169 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1404 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1170 } 1405 }
1171 else 1406 else
1172 ev_timer_stop (EV_A_ w); 1407 ev_timer_stop (EV_A_ w);
1173 } 1408 }
1174 else if (w->repeat) 1409 else if (w->repeat)
1410 {
1411 w->at = w->repeat;
1175 ev_timer_start (EV_A_ w); 1412 ev_timer_start (EV_A_ w);
1413 }
1176} 1414}
1177 1415
1416#if EV_PERIODICS
1178void 1417void
1179ev_periodic_start (EV_P_ struct ev_periodic *w) 1418ev_periodic_start (EV_P_ struct ev_periodic *w)
1180{ 1419{
1181 if (ev_is_active (w)) 1420 if (ev_is_active (w))
1182 return; 1421 return;
1183 1422
1423 if (w->reschedule_cb)
1424 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1425 else if (w->interval)
1426 {
1184 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.));
1185
1186 /* 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 */
1187 if (w->interval)
1188 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval; 1429 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1430 }
1189 1431
1190 ev_start (EV_A_ (W)w, ++periodiccnt); 1432 ev_start (EV_A_ (W)w, ++periodiccnt);
1191 array_needsize (periodics, periodicmax, periodiccnt, ); 1433 array_needsize (struct ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1192 periodics [periodiccnt - 1] = w; 1434 periodics [periodiccnt - 1] = w;
1193 upheap ((WT *)periodics, periodiccnt - 1); 1435 upheap ((WT *)periodics, periodiccnt - 1);
1194 1436
1195 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1437 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1196} 1438}
… …
1205 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1447 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1206 1448
1207 if (((W)w)->active < periodiccnt--) 1449 if (((W)w)->active < periodiccnt--)
1208 { 1450 {
1209 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1451 periodics [((W)w)->active - 1] = periodics [periodiccnt];
1210 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1452 adjustheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1);
1211 } 1453 }
1212 1454
1213 ev_stop (EV_A_ (W)w); 1455 ev_stop (EV_A_ (W)w);
1214} 1456}
1215 1457
1216void 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
1217ev_idle_start (EV_P_ struct ev_idle *w) 1468ev_idle_start (EV_P_ struct ev_idle *w)
1218{ 1469{
1219 if (ev_is_active (w)) 1470 if (ev_is_active (w))
1220 return; 1471 return;
1221 1472
1222 ev_start (EV_A_ (W)w, ++idlecnt); 1473 ev_start (EV_A_ (W)w, ++idlecnt);
1223 array_needsize (idles, idlemax, idlecnt, ); 1474 array_needsize (struct ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1224 idles [idlecnt - 1] = w; 1475 idles [idlecnt - 1] = w;
1225} 1476}
1226 1477
1227void 1478void
1228ev_idle_stop (EV_P_ struct ev_idle *w) 1479ev_idle_stop (EV_P_ struct ev_idle *w)
1229{ 1480{
1230 ev_clear_pending (EV_A_ (W)w); 1481 ev_clear_pending (EV_A_ (W)w);
1231 if (ev_is_active (w)) 1482 if (!ev_is_active (w))
1232 return; 1483 return;
1233 1484
1234 idles [((W)w)->active - 1] = idles [--idlecnt]; 1485 idles [((W)w)->active - 1] = idles [--idlecnt];
1235 ev_stop (EV_A_ (W)w); 1486 ev_stop (EV_A_ (W)w);
1236} 1487}
… …
1240{ 1491{
1241 if (ev_is_active (w)) 1492 if (ev_is_active (w))
1242 return; 1493 return;
1243 1494
1244 ev_start (EV_A_ (W)w, ++preparecnt); 1495 ev_start (EV_A_ (W)w, ++preparecnt);
1245 array_needsize (prepares, preparemax, preparecnt, ); 1496 array_needsize (struct ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1246 prepares [preparecnt - 1] = w; 1497 prepares [preparecnt - 1] = w;
1247} 1498}
1248 1499
1249void 1500void
1250ev_prepare_stop (EV_P_ struct ev_prepare *w) 1501ev_prepare_stop (EV_P_ struct ev_prepare *w)
1251{ 1502{
1252 ev_clear_pending (EV_A_ (W)w); 1503 ev_clear_pending (EV_A_ (W)w);
1253 if (ev_is_active (w)) 1504 if (!ev_is_active (w))
1254 return; 1505 return;
1255 1506
1256 prepares [((W)w)->active - 1] = prepares [--preparecnt]; 1507 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1257 ev_stop (EV_A_ (W)w); 1508 ev_stop (EV_A_ (W)w);
1258} 1509}
… …
1262{ 1513{
1263 if (ev_is_active (w)) 1514 if (ev_is_active (w))
1264 return; 1515 return;
1265 1516
1266 ev_start (EV_A_ (W)w, ++checkcnt); 1517 ev_start (EV_A_ (W)w, ++checkcnt);
1267 array_needsize (checks, checkmax, checkcnt, ); 1518 array_needsize (struct ev_check *, checks, checkmax, checkcnt, EMPTY2);
1268 checks [checkcnt - 1] = w; 1519 checks [checkcnt - 1] = w;
1269} 1520}
1270 1521
1271void 1522void
1272ev_check_stop (EV_P_ struct ev_check *w) 1523ev_check_stop (EV_P_ struct ev_check *w)
1273{ 1524{
1274 ev_clear_pending (EV_A_ (W)w); 1525 ev_clear_pending (EV_A_ (W)w);
1275 if (ev_is_active (w)) 1526 if (!ev_is_active (w))
1276 return; 1527 return;
1277 1528
1278 checks [((W)w)->active - 1] = checks [--checkcnt]; 1529 checks [((W)w)->active - 1] = checks [--checkcnt];
1279 ev_stop (EV_A_ (W)w); 1530 ev_stop (EV_A_ (W)w);
1280} 1531}
… …
1285 1536
1286void 1537void
1287ev_signal_start (EV_P_ struct ev_signal *w) 1538ev_signal_start (EV_P_ struct ev_signal *w)
1288{ 1539{
1289#if EV_MULTIPLICITY 1540#if EV_MULTIPLICITY
1290 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));
1291#endif 1542#endif
1292 if (ev_is_active (w)) 1543 if (ev_is_active (w))
1293 return; 1544 return;
1294 1545
1295 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));
1296 1547
1297 ev_start (EV_A_ (W)w, 1); 1548 ev_start (EV_A_ (W)w, 1);
1298 array_needsize (signals, signalmax, w->signum, signals_init); 1549 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1299 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1550 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1300 1551
1301 if (!w->next) 1552 if (!((WL)w)->next)
1302 { 1553 {
1554#if _WIN32
1555 signal (w->signum, sighandler);
1556#else
1303 struct sigaction sa; 1557 struct sigaction sa;
1304 sa.sa_handler = sighandler; 1558 sa.sa_handler = sighandler;
1305 sigfillset (&sa.sa_mask); 1559 sigfillset (&sa.sa_mask);
1306 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1560 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1307 sigaction (w->signum, &sa, 0); 1561 sigaction (w->signum, &sa, 0);
1562#endif
1308 } 1563 }
1309} 1564}
1310 1565
1311void 1566void
1312ev_signal_stop (EV_P_ struct ev_signal *w) 1567ev_signal_stop (EV_P_ struct ev_signal *w)
… …
1324 1579
1325void 1580void
1326ev_child_start (EV_P_ struct ev_child *w) 1581ev_child_start (EV_P_ struct ev_child *w)
1327{ 1582{
1328#if EV_MULTIPLICITY 1583#if EV_MULTIPLICITY
1329 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));
1330#endif 1585#endif
1331 if (ev_is_active (w)) 1586 if (ev_is_active (w))
1332 return; 1587 return;
1333 1588
1334 ev_start (EV_A_ (W)w, 1); 1589 ev_start (EV_A_ (W)w, 1);
… …
1337 1592
1338void 1593void
1339ev_child_stop (EV_P_ struct ev_child *w) 1594ev_child_stop (EV_P_ struct ev_child *w)
1340{ 1595{
1341 ev_clear_pending (EV_A_ (W)w); 1596 ev_clear_pending (EV_A_ (W)w);
1342 if (ev_is_active (w)) 1597 if (!ev_is_active (w))
1343 return; 1598 return;
1344 1599
1345 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1600 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1346 ev_stop (EV_A_ (W)w); 1601 ev_stop (EV_A_ (W)w);
1347} 1602}
… …
1362 void (*cb)(int revents, void *arg) = once->cb; 1617 void (*cb)(int revents, void *arg) = once->cb;
1363 void *arg = once->arg; 1618 void *arg = once->arg;
1364 1619
1365 ev_io_stop (EV_A_ &once->io); 1620 ev_io_stop (EV_A_ &once->io);
1366 ev_timer_stop (EV_A_ &once->to); 1621 ev_timer_stop (EV_A_ &once->to);
1367 free (once); 1622 ev_free (once);
1368 1623
1369 cb (revents, arg); 1624 cb (revents, arg);
1370} 1625}
1371 1626
1372static void 1627static void
… …
1382} 1637}
1383 1638
1384void 1639void
1385ev_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)
1386{ 1641{
1387 struct ev_once *once = malloc (sizeof (struct ev_once)); 1642 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1388 1643
1389 if (!once) 1644 if (!once)
1390 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1645 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1391 else 1646 else
1392 { 1647 {
1393 once->cb = cb; 1648 once->cb = cb;
1394 once->arg = arg; 1649 once->arg = arg;
1395 1650
1396 ev_watcher_init (&once->io, once_cb_io); 1651 ev_init (&once->io, once_cb_io);
1397 if (fd >= 0) 1652 if (fd >= 0)
1398 { 1653 {
1399 ev_io_set (&once->io, fd, events); 1654 ev_io_set (&once->io, fd, events);
1400 ev_io_start (EV_A_ &once->io); 1655 ev_io_start (EV_A_ &once->io);
1401 } 1656 }
1402 1657
1403 ev_watcher_init (&once->to, once_cb_to); 1658 ev_init (&once->to, once_cb_to);
1404 if (timeout >= 0.) 1659 if (timeout >= 0.)
1405 { 1660 {
1406 ev_timer_set (&once->to, timeout, 0.); 1661 ev_timer_set (&once->to, timeout, 0.);
1407 ev_timer_start (EV_A_ &once->to); 1662 ev_timer_start (EV_A_ &once->to);
1408 } 1663 }
1409 } 1664 }
1410} 1665}
1411 1666
1667#ifdef __cplusplus
1668}
1669#endif
1670

Diff Legend

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