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

Diff Legend

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