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

Comparing libev/ev.c (file contents):
Revision 1.54 by root, Sun Nov 4 00:24:16 2007 UTC vs.
Revision 1.103 by root, Mon Nov 12 00:31:08 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines