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

Diff Legend

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