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

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

Diff Legend

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