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

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

Diff Legend

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