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

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

Diff Legend

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