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

Comparing libev/ev.c (file contents):
Revision 1.59 by root, Sun Nov 4 18:15:16 2007 UTC vs.
Revision 1.85 by root, Sat Nov 10 03:13:50 2007 UTC

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

Diff Legend

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