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

Comparing libev/ev.c (file contents):
Revision 1.57 by root, Sun Nov 4 16:43:53 2007 UTC vs.
Revision 1.104 by root, Mon Nov 12 00:39:45 2007 UTC

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

Diff Legend

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