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

Comparing libev/ev.c (file contents):
Revision 1.36 by root, Thu Nov 1 13:11:11 2007 UTC vs.
Revision 1.55 by root, Sun Nov 4 00:39:24 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#if EV_USE_CONFIG_H 31#ifndef EV_STANDALONE
32# include "config.h" 32# include "config.h"
33#endif 33#endif
34 34
35#include <math.h> 35#include <math.h>
36#include <stdlib.h> 36#include <stdlib.h>
42#include <stdio.h> 42#include <stdio.h>
43 43
44#include <assert.h> 44#include <assert.h>
45#include <errno.h> 45#include <errno.h>
46#include <sys/types.h> 46#include <sys/types.h>
47#ifndef WIN32
47#include <sys/wait.h> 48# include <sys/wait.h>
49#endif
48#include <sys/time.h> 50#include <sys/time.h>
49#include <time.h> 51#include <time.h>
50 52
53/**/
54
51#ifndef EV_USE_MONOTONIC 55#ifndef EV_USE_MONOTONIC
52# ifdef CLOCK_MONOTONIC
53# define EV_USE_MONOTONIC 1 56# define EV_USE_MONOTONIC 1
54# endif
55#endif 57#endif
56 58
57#ifndef EV_USE_SELECT 59#ifndef EV_USE_SELECT
58# define EV_USE_SELECT 1 60# define EV_USE_SELECT 1
59#endif 61#endif
60 62
63#ifndef EV_USEV_POLL
64# define EV_USEV_POLL 0 /* poll is usually slower than select, and not as well tested */
65#endif
66
61#ifndef EV_USE_EPOLL 67#ifndef EV_USE_EPOLL
62# define EV_USE_EPOLL 0 68# define EV_USE_EPOLL 0
63#endif 69#endif
64 70
71#ifndef EV_USE_KQUEUE
72# define EV_USE_KQUEUE 0
73#endif
74
75#ifndef EV_USE_REALTIME
76# define EV_USE_REALTIME 1
77#endif
78
79/**/
80
81#ifndef CLOCK_MONOTONIC
82# undef EV_USE_MONOTONIC
83# define EV_USE_MONOTONIC 0
84#endif
85
65#ifndef CLOCK_REALTIME 86#ifndef CLOCK_REALTIME
87# undef EV_USE_REALTIME
66# define EV_USE_REALTIME 0 88# define EV_USE_REALTIME 0
67#endif 89#endif
68#ifndef EV_USE_REALTIME 90
69# define EV_USE_REALTIME 1 /* posix requirement, but might be slower */ 91/**/
70#endif
71 92
72#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 93#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
73#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detetc time jumps) */ 94#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */
74#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */ 95#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
75#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */ 96/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */
76 97
77#include "ev.h" 98#include "ev.h"
99
100#if __GNUC__ >= 3
101# define expect(expr,value) __builtin_expect ((expr),(value))
102# define inline inline
103#else
104# define expect(expr,value) (expr)
105# define inline static
106#endif
107
108#define expect_false(expr) expect ((expr) != 0, 0)
109#define expect_true(expr) expect ((expr) != 0, 1)
110
111#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
112#define ABSPRI(w) ((w)->priority - EV_MINPRI)
78 113
79typedef struct ev_watcher *W; 114typedef struct ev_watcher *W;
80typedef struct ev_watcher_list *WL; 115typedef struct ev_watcher_list *WL;
81typedef struct ev_watcher_time *WT; 116typedef struct ev_watcher_time *WT;
82 117
83static ev_tstamp now, diff; /* monotonic clock */ 118static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
84ev_tstamp ev_now;
85int ev_method;
86
87static int have_monotonic; /* runtime */
88
89static ev_tstamp method_fudge; /* stupid epoll-returns-early bug */
90static void (*method_modify)(int fd, int oev, int nev);
91static void (*method_poll)(ev_tstamp timeout);
92 119
93/*****************************************************************************/ 120/*****************************************************************************/
94 121
95ev_tstamp 122typedef struct
123{
124 struct ev_watcher_list *head;
125 unsigned char events;
126 unsigned char reify;
127} ANFD;
128
129typedef struct
130{
131 W w;
132 int events;
133} ANPENDING;
134
135#if EV_MULTIPLICITY
136
137struct ev_loop
138{
139# define VAR(name,decl) decl;
140# include "ev_vars.h"
141};
142# undef VAR
143# include "ev_wrap.h"
144
145#else
146
147# define VAR(name,decl) static decl;
148# include "ev_vars.h"
149# undef VAR
150
151#endif
152
153/*****************************************************************************/
154
155inline ev_tstamp
96ev_time (void) 156ev_time (void)
97{ 157{
98#if EV_USE_REALTIME 158#if EV_USE_REALTIME
99 struct timespec ts; 159 struct timespec ts;
100 clock_gettime (CLOCK_REALTIME, &ts); 160 clock_gettime (CLOCK_REALTIME, &ts);
104 gettimeofday (&tv, 0); 164 gettimeofday (&tv, 0);
105 return tv.tv_sec + tv.tv_usec * 1e-6; 165 return tv.tv_sec + tv.tv_usec * 1e-6;
106#endif 166#endif
107} 167}
108 168
109static ev_tstamp 169inline ev_tstamp
110get_clock (void) 170get_clock (void)
111{ 171{
112#if EV_USE_MONOTONIC 172#if EV_USE_MONOTONIC
113 if (have_monotonic) 173 if (expect_true (have_monotonic))
114 { 174 {
115 struct timespec ts; 175 struct timespec ts;
116 clock_gettime (CLOCK_MONOTONIC, &ts); 176 clock_gettime (CLOCK_MONOTONIC, &ts);
117 return ts.tv_sec + ts.tv_nsec * 1e-9; 177 return ts.tv_sec + ts.tv_nsec * 1e-9;
118 } 178 }
119#endif 179#endif
120 180
121 return ev_time (); 181 return ev_time ();
122} 182}
123 183
184ev_tstamp
185ev_now (EV_P)
186{
187 return rt_now;
188}
189
124#define array_roundsize(base,n) ((n) | 4 & ~3) 190#define array_roundsize(base,n) ((n) | 4 & ~3)
125 191
126#define array_needsize(base,cur,cnt,init) \ 192#define array_needsize(base,cur,cnt,init) \
127 if ((cnt) > cur) \ 193 if (expect_false ((cnt) > cur)) \
128 { \ 194 { \
129 int newcnt = cur; \ 195 int newcnt = cur; \
130 do \ 196 do \
131 { \ 197 { \
132 newcnt = array_roundsize (base, newcnt << 1); \ 198 newcnt = array_roundsize (base, newcnt << 1); \
138 cur = newcnt; \ 204 cur = newcnt; \
139 } 205 }
140 206
141/*****************************************************************************/ 207/*****************************************************************************/
142 208
143typedef struct
144{
145 struct ev_io *head;
146 unsigned char events;
147 unsigned char reify;
148} ANFD;
149
150static ANFD *anfds;
151static int anfdmax;
152
153static void 209static void
154anfds_init (ANFD *base, int count) 210anfds_init (ANFD *base, int count)
155{ 211{
156 while (count--) 212 while (count--)
157 { 213 {
161 217
162 ++base; 218 ++base;
163 } 219 }
164} 220}
165 221
166typedef struct
167{
168 W w;
169 int events;
170} ANPENDING;
171
172static ANPENDING *pendings;
173static int pendingmax, pendingcnt;
174
175static void 222static void
176event (W w, int events) 223event (EV_P_ W w, int events)
177{ 224{
178 if (w->pending) 225 if (w->pending)
179 { 226 {
180 pendings [w->pending - 1].events |= events; 227 pendings [ABSPRI (w)][w->pending - 1].events |= events;
181 return; 228 return;
182 } 229 }
183 230
184 w->pending = ++pendingcnt; 231 w->pending = ++pendingcnt [ABSPRI (w)];
185 array_needsize (pendings, pendingmax, pendingcnt, ); 232 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
186 pendings [pendingcnt - 1].w = w; 233 pendings [ABSPRI (w)][w->pending - 1].w = w;
187 pendings [pendingcnt - 1].events = events; 234 pendings [ABSPRI (w)][w->pending - 1].events = events;
188} 235}
189 236
190static void 237static void
191queue_events (W *events, int eventcnt, int type) 238queue_events (EV_P_ W *events, int eventcnt, int type)
192{ 239{
193 int i; 240 int i;
194 241
195 for (i = 0; i < eventcnt; ++i) 242 for (i = 0; i < eventcnt; ++i)
196 event (events [i], type); 243 event (EV_A_ events [i], type);
197} 244}
198 245
199static void 246static void
200fd_event (int fd, int events) 247fd_event (EV_P_ int fd, int events)
201{ 248{
202 ANFD *anfd = anfds + fd; 249 ANFD *anfd = anfds + fd;
203 struct ev_io *w; 250 struct ev_io *w;
204 251
205 for (w = anfd->head; w; w = w->next) 252 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
206 { 253 {
207 int ev = w->events & events; 254 int ev = w->events & events;
208 255
209 if (ev) 256 if (ev)
210 event ((W)w, ev); 257 event (EV_A_ (W)w, ev);
211 } 258 }
212} 259}
213 260
214/*****************************************************************************/ 261/*****************************************************************************/
215 262
216static int *fdchanges;
217static int fdchangemax, fdchangecnt;
218
219static void 263static void
220fd_reify (void) 264fd_reify (EV_P)
221{ 265{
222 int i; 266 int i;
223 267
224 for (i = 0; i < fdchangecnt; ++i) 268 for (i = 0; i < fdchangecnt; ++i)
225 { 269 {
227 ANFD *anfd = anfds + fd; 271 ANFD *anfd = anfds + fd;
228 struct ev_io *w; 272 struct ev_io *w;
229 273
230 int events = 0; 274 int events = 0;
231 275
232 for (w = anfd->head; w; w = w->next) 276 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next)
233 events |= w->events; 277 events |= w->events;
234 278
235 anfd->reify = 0; 279 anfd->reify = 0;
236 280
237 if (anfd->events != events) 281 if (anfd->events != events)
238 { 282 {
239 method_modify (fd, anfd->events, events); 283 method_modify (EV_A_ fd, anfd->events, events);
240 anfd->events = events; 284 anfd->events = events;
241 } 285 }
242 } 286 }
243 287
244 fdchangecnt = 0; 288 fdchangecnt = 0;
245} 289}
246 290
247static void 291static void
248fd_change (int fd) 292fd_change (EV_P_ int fd)
249{ 293{
250 if (anfds [fd].reify || fdchangecnt < 0) 294 if (anfds [fd].reify || fdchangecnt < 0)
251 return; 295 return;
252 296
253 anfds [fd].reify = 1; 297 anfds [fd].reify = 1;
255 ++fdchangecnt; 299 ++fdchangecnt;
256 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 300 array_needsize (fdchanges, fdchangemax, fdchangecnt, );
257 fdchanges [fdchangecnt - 1] = fd; 301 fdchanges [fdchangecnt - 1] = fd;
258} 302}
259 303
304static void
305fd_kill (EV_P_ int fd)
306{
307 struct ev_io *w;
308
309 while ((w = (struct ev_io *)anfds [fd].head))
310 {
311 ev_io_stop (EV_A_ w);
312 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
313 }
314}
315
260/* called on EBADF to verify fds */ 316/* called on EBADF to verify fds */
261static void 317static void
262fd_recheck (void) 318fd_ebadf (EV_P)
263{ 319{
264 int fd; 320 int fd;
265 321
266 for (fd = 0; fd < anfdmax; ++fd) 322 for (fd = 0; fd < anfdmax; ++fd)
267 if (anfds [fd].events) 323 if (anfds [fd].events)
268 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 324 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF)
269 while (anfds [fd].head) 325 fd_kill (EV_A_ fd);
326}
327
328/* called on ENOMEM in select/poll to kill some fds and retry */
329static void
330fd_enomem (EV_P)
331{
332 int fd = anfdmax;
333
334 while (fd--)
335 if (anfds [fd].events)
270 { 336 {
271 ev_io_stop (anfds [fd].head); 337 close (fd);
272 event ((W)anfds [fd].head, EV_ERROR | EV_READ | EV_WRITE); 338 fd_kill (EV_A_ fd);
339 return;
273 } 340 }
274} 341}
275 342
276/*****************************************************************************/ 343/*****************************************************************************/
277 344
278static struct ev_timer **timers;
279static int timermax, timercnt;
280
281static struct ev_periodic **periodics;
282static int periodicmax, periodiccnt;
283
284static void 345static void
285upheap (WT *timers, int k) 346upheap (WT *heap, int k)
286{ 347{
287 WT w = timers [k]; 348 WT w = heap [k];
288 349
289 while (k && timers [k >> 1]->at > w->at) 350 while (k && heap [k >> 1]->at > w->at)
290 { 351 {
291 timers [k] = timers [k >> 1]; 352 heap [k] = heap [k >> 1];
292 timers [k]->active = k + 1; 353 heap [k]->active = k + 1;
293 k >>= 1; 354 k >>= 1;
294 } 355 }
295 356
296 timers [k] = w; 357 heap [k] = w;
297 timers [k]->active = k + 1; 358 heap [k]->active = k + 1;
298 359
299} 360}
300 361
301static void 362static void
302downheap (WT *timers, int N, int k) 363downheap (WT *heap, int N, int k)
303{ 364{
304 WT w = timers [k]; 365 WT w = heap [k];
305 366
306 while (k < (N >> 1)) 367 while (k < (N >> 1))
307 { 368 {
308 int j = k << 1; 369 int j = k << 1;
309 370
310 if (j + 1 < N && timers [j]->at > timers [j + 1]->at) 371 if (j + 1 < N && heap [j]->at > heap [j + 1]->at)
311 ++j; 372 ++j;
312 373
313 if (w->at <= timers [j]->at) 374 if (w->at <= heap [j]->at)
314 break; 375 break;
315 376
316 timers [k] = timers [j]; 377 heap [k] = heap [j];
317 timers [k]->active = k + 1; 378 heap [k]->active = k + 1;
318 k = j; 379 k = j;
319 } 380 }
320 381
321 timers [k] = w; 382 heap [k] = w;
322 timers [k]->active = k + 1; 383 heap [k]->active = k + 1;
323} 384}
324 385
325/*****************************************************************************/ 386/*****************************************************************************/
326 387
327typedef struct 388typedef struct
328{ 389{
329 struct ev_signal *head; 390 struct ev_watcher_list *head;
330 sig_atomic_t volatile gotsig; 391 sig_atomic_t volatile gotsig;
331} ANSIG; 392} ANSIG;
332 393
333static ANSIG *signals; 394static ANSIG *signals;
334static int signalmax; 395static int signalmax;
335 396
336static int sigpipe [2]; 397static int sigpipe [2];
337static sig_atomic_t volatile gotsig; 398static sig_atomic_t volatile gotsig;
338static struct ev_io sigev;
339 399
340static void 400static void
341signals_init (ANSIG *base, int count) 401signals_init (ANSIG *base, int count)
342{ 402{
343 while (count--) 403 while (count--)
354{ 414{
355 signals [signum - 1].gotsig = 1; 415 signals [signum - 1].gotsig = 1;
356 416
357 if (!gotsig) 417 if (!gotsig)
358 { 418 {
419 int old_errno = errno;
359 gotsig = 1; 420 gotsig = 1;
360 write (sigpipe [1], &signum, 1); 421 write (sigpipe [1], &signum, 1);
422 errno = old_errno;
361 } 423 }
362} 424}
363 425
364static void 426static void
365sigcb (struct ev_io *iow, int revents) 427sigcb (EV_P_ struct ev_io *iow, int revents)
366{ 428{
367 struct ev_signal *w; 429 struct ev_watcher_list *w;
368 int sig; 430 int signum;
369 431
370 read (sigpipe [0], &revents, 1); 432 read (sigpipe [0], &revents, 1);
371 gotsig = 0; 433 gotsig = 0;
372 434
373 for (sig = signalmax; sig--; ) 435 for (signum = signalmax; signum--; )
374 if (signals [sig].gotsig) 436 if (signals [signum].gotsig)
375 { 437 {
376 signals [sig].gotsig = 0; 438 signals [signum].gotsig = 0;
377 439
378 for (w = signals [sig].head; w; w = w->next) 440 for (w = signals [signum].head; w; w = w->next)
379 event ((W)w, EV_SIGNAL); 441 event (EV_A_ (W)w, EV_SIGNAL);
380 } 442 }
381} 443}
382 444
383static void 445static void
384siginit (void) 446siginit (EV_P)
385{ 447{
448#ifndef WIN32
386 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 449 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC);
387 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC); 450 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
388 451
389 /* rather than sort out wether we really need nb, set it */ 452 /* rather than sort out wether we really need nb, set it */
390 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK); 453 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
391 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK); 454 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
455#endif
392 456
393 ev_io_set (&sigev, sigpipe [0], EV_READ); 457 ev_io_set (&sigev, sigpipe [0], EV_READ);
394 ev_io_start (&sigev); 458 ev_io_start (EV_A_ &sigev);
459 ev_unref (EV_A); /* child watcher should not keep loop alive */
395} 460}
396 461
397/*****************************************************************************/ 462/*****************************************************************************/
398 463
399static struct ev_idle **idles; 464#ifndef WIN32
400static int idlemax, idlecnt;
401
402static struct ev_prepare **prepares;
403static int preparemax, preparecnt;
404
405static struct ev_check **checks;
406static int checkmax, checkcnt;
407
408/*****************************************************************************/
409
410static struct ev_child *childs [PID_HASHSIZE];
411static struct ev_signal childev;
412 465
413#ifndef WCONTINUED 466#ifndef WCONTINUED
414# define WCONTINUED 0 467# define WCONTINUED 0
415#endif 468#endif
416 469
417static void 470static void
418childcb (struct ev_signal *sw, int revents) 471child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status)
419{ 472{
420 struct ev_child *w; 473 struct ev_child *w;
474
475 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)
477 {
478 w->priority = sw->priority; /* need to do it *now* */
479 w->rpid = pid;
480 w->rstatus = status;
481 event (EV_A_ (W)w, EV_CHILD);
482 }
483}
484
485static void
486childcb (EV_P_ struct ev_signal *sw, int revents)
487{
421 int pid, status; 488 int pid, status;
422 489
423 while ((pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)) != -1) 490 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
424 for (w = childs [pid & (PID_HASHSIZE - 1)]; w; w = w->next) 491 {
425 if (w->pid == pid || w->pid == -1) 492 /* make sure we are called again until all childs have been reaped */
426 { 493 event (EV_A_ (W)sw, EV_SIGNAL);
427 w->status = status; 494
428 event ((W)w, EV_CHILD); 495 child_reap (EV_A_ sw, pid, pid, status);
429 } 496 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */
497 }
430} 498}
499
500#endif
431 501
432/*****************************************************************************/ 502/*****************************************************************************/
433 503
504#if EV_USE_KQUEUE
505# include "ev_kqueue.c"
506#endif
434#if EV_USE_EPOLL 507#if EV_USE_EPOLL
435# include "ev_epoll.c" 508# include "ev_epoll.c"
436#endif 509#endif
510#if EV_USEV_POLL
511# include "ev_poll.c"
512#endif
437#if EV_USE_SELECT 513#if EV_USE_SELECT
438# include "ev_select.c" 514# include "ev_select.c"
439#endif 515#endif
440 516
441int 517int
448ev_version_minor (void) 524ev_version_minor (void)
449{ 525{
450 return EV_VERSION_MINOR; 526 return EV_VERSION_MINOR;
451} 527}
452 528
453int ev_init (int flags) 529/* return true if we are running with elevated privileges and should ignore env variables */
530static int
531enable_secure (void)
454{ 532{
533#ifdef WIN32
534 return 0;
535#else
536 return getuid () != geteuid ()
537 || getgid () != getegid ();
538#endif
539}
540
541int
542ev_method (EV_P)
543{
544 return method;
545}
546
547inline int
548loop_init (EV_P_ int methods)
549{
455 if (!ev_method) 550 if (!method)
456 { 551 {
457#if EV_USE_MONOTONIC 552#if EV_USE_MONOTONIC
458 { 553 {
459 struct timespec ts; 554 struct timespec ts;
460 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 555 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
461 have_monotonic = 1; 556 have_monotonic = 1;
462 } 557 }
463#endif 558#endif
464 559
465 ev_now = ev_time (); 560 rt_now = ev_time ();
466 now = get_clock (); 561 mn_now = get_clock ();
562 now_floor = mn_now;
467 diff = ev_now - now; 563 rtmn_diff = rt_now - mn_now;
468 564
469 if (pipe (sigpipe)) 565 if (pipe (sigpipe))
470 return 0; 566 return 0;
471 567
568 if (methods == EVMETHOD_AUTO)
569 if (!enable_secure () && getenv ("LIBmethodS"))
570 methods = atoi (getenv ("LIBmethodS"));
571 else
472 ev_method = EVMETHOD_NONE; 572 methods = EVMETHOD_ANY;
573
574 method = 0;
575#if EV_USE_KQUEUE
576 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods);
577#endif
473#if EV_USE_EPOLL 578#if EV_USE_EPOLL
474 if (ev_method == EVMETHOD_NONE) epoll_init (flags); 579 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods);
580#endif
581#if EV_USEV_POLL
582 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods);
475#endif 583#endif
476#if EV_USE_SELECT 584#if EV_USE_SELECT
477 if (ev_method == EVMETHOD_NONE) select_init (flags); 585 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods);
478#endif 586#endif
479 587
480 if (ev_method) 588 if (method)
481 { 589 {
482 ev_watcher_init (&sigev, sigcb); 590 ev_watcher_init (&sigev, sigcb);
591 ev_set_priority (&sigev, EV_MAXPRI);
483 siginit (); 592 siginit (EV_A);
484 593
594#ifndef WIN32
485 ev_signal_init (&childev, childcb, SIGCHLD); 595 ev_signal_init (&childev, childcb, SIGCHLD);
596 ev_set_priority (&childev, EV_MAXPRI);
486 ev_signal_start (&childev); 597 ev_signal_start (EV_A_ &childev);
598 ev_unref (EV_A); /* child watcher should not keep loop alive */
599#endif
487 } 600 }
488 } 601 }
489 602
490 return ev_method; 603 return method;
491} 604}
605
606#if EV_MULTIPLICITY
607
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 if (loop_init (EV_A_ methods))
614 return loop;
615
616 ev_loop_delete (loop);
617
618 return 0;
619}
620
621void
622ev_loop_delete (EV_P)
623{
624 /*TODO*/
625 free (loop);
626}
627
628#else
629
630int
631ev_init (int methods)
632{
633 return loop_init (methods);
634}
635
636#endif
492 637
493/*****************************************************************************/ 638/*****************************************************************************/
494 639
495void 640void
496ev_fork_prepare (void) 641ev_fork_prepare (void)
505} 650}
506 651
507void 652void
508ev_fork_child (void) 653ev_fork_child (void)
509{ 654{
655 /*TODO*/
656#if !EV_MULTIPLICITY
510#if EV_USE_EPOLL 657#if EV_USE_EPOLL
511 if (ev_method == EVMETHOD_EPOLL) 658 if (method == EVMETHOD_EPOLL)
512 epoll_postfork_child (); 659 epoll_postfork_child (EV_A);
513#endif 660#endif
514 661
515 ev_io_stop (&sigev); 662 ev_io_stop (EV_A_ &sigev);
516 close (sigpipe [0]); 663 close (sigpipe [0]);
517 close (sigpipe [1]); 664 close (sigpipe [1]);
518 pipe (sigpipe); 665 pipe (sigpipe);
519 siginit (); 666 siginit (EV_A);
667#endif
520} 668}
521 669
522/*****************************************************************************/ 670/*****************************************************************************/
523 671
524static void 672static void
525call_pending (void) 673call_pending (EV_P)
526{ 674{
675 int pri;
676
677 for (pri = NUMPRI; pri--; )
527 while (pendingcnt) 678 while (pendingcnt [pri])
528 { 679 {
529 ANPENDING *p = pendings + --pendingcnt; 680 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
530 681
531 if (p->w) 682 if (p->w)
532 { 683 {
533 p->w->pending = 0; 684 p->w->pending = 0;
534 p->w->cb (p->w, p->events); 685 p->w->cb (EV_A_ p->w, p->events);
535 } 686 }
536 } 687 }
537} 688}
538 689
539static void 690static void
540timers_reify (void) 691timers_reify (EV_P)
541{ 692{
542 while (timercnt && timers [0]->at <= now) 693 while (timercnt && timers [0]->at <= mn_now)
543 { 694 {
544 struct ev_timer *w = timers [0]; 695 struct ev_timer *w = timers [0];
545 696
546 /* first reschedule or stop timer */ 697 /* first reschedule or stop timer */
547 if (w->repeat) 698 if (w->repeat)
548 { 699 {
549 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 700 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
550 w->at = now + w->repeat; 701 w->at = mn_now + w->repeat;
551 downheap ((WT *)timers, timercnt, 0); 702 downheap ((WT *)timers, timercnt, 0);
552 } 703 }
553 else 704 else
554 ev_timer_stop (w); /* nonrepeating: stop timer */ 705 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
555 706
556 event ((W)w, EV_TIMEOUT); 707 event (EV_A_ (W)w, EV_TIMEOUT);
557 } 708 }
558} 709}
559 710
560static void 711static void
561periodics_reify (void) 712periodics_reify (EV_P)
562{ 713{
563 while (periodiccnt && periodics [0]->at <= ev_now) 714 while (periodiccnt && periodics [0]->at <= rt_now)
564 { 715 {
565 struct ev_periodic *w = periodics [0]; 716 struct ev_periodic *w = periodics [0];
566 717
567 /* first reschedule or stop timer */ 718 /* first reschedule or stop timer */
568 if (w->interval) 719 if (w->interval)
569 { 720 {
570 w->at += floor ((ev_now - w->at) / w->interval + 1.) * w->interval; 721 w->at += floor ((rt_now - w->at) / w->interval + 1.) * w->interval;
571 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > ev_now)); 722 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", w->at > rt_now));
572 downheap ((WT *)periodics, periodiccnt, 0); 723 downheap ((WT *)periodics, periodiccnt, 0);
573 } 724 }
574 else 725 else
575 ev_periodic_stop (w); /* nonrepeating: stop timer */ 726 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
576 727
577 event ((W)w, EV_PERIODIC); 728 event (EV_A_ (W)w, EV_PERIODIC);
578 } 729 }
579} 730}
580 731
581static void 732static void
582periodics_reschedule (ev_tstamp diff) 733periodics_reschedule (EV_P)
583{ 734{
584 int i; 735 int i;
585 736
586 /* adjust periodics after time jump */ 737 /* adjust periodics after time jump */
587 for (i = 0; i < periodiccnt; ++i) 738 for (i = 0; i < periodiccnt; ++i)
588 { 739 {
589 struct ev_periodic *w = periodics [i]; 740 struct ev_periodic *w = periodics [i];
590 741
591 if (w->interval) 742 if (w->interval)
592 { 743 {
593 ev_tstamp diff = ceil ((ev_now - w->at) / w->interval) * w->interval; 744 ev_tstamp diff = ceil ((rt_now - w->at) / w->interval) * w->interval;
594 745
595 if (fabs (diff) >= 1e-4) 746 if (fabs (diff) >= 1e-4)
596 { 747 {
597 ev_periodic_stop (w); 748 ev_periodic_stop (EV_A_ w);
598 ev_periodic_start (w); 749 ev_periodic_start (EV_A_ w);
599 750
600 i = 0; /* restart loop, inefficient, but time jumps should be rare */ 751 i = 0; /* restart loop, inefficient, but time jumps should be rare */
601 } 752 }
602 } 753 }
603 } 754 }
604} 755}
605 756
757inline int
758time_update_monotonic (EV_P)
759{
760 mn_now = get_clock ();
761
762 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
763 {
764 rt_now = rtmn_diff + mn_now;
765 return 0;
766 }
767 else
768 {
769 now_floor = mn_now;
770 rt_now = ev_time ();
771 return 1;
772 }
773}
774
606static void 775static void
607time_update (void) 776time_update (EV_P)
608{ 777{
609 int i; 778 int i;
610 779
611 ev_now = ev_time (); 780#if EV_USE_MONOTONIC
612
613 if (have_monotonic) 781 if (expect_true (have_monotonic))
614 { 782 {
615 ev_tstamp odiff = diff; 783 if (time_update_monotonic (EV_A))
616
617 for (i = 4; --i; ) /* loop a few times, before making important decisions */
618 { 784 {
619 now = get_clock (); 785 ev_tstamp odiff = rtmn_diff;
786
787 for (i = 4; --i; ) /* loop a few times, before making important decisions */
788 {
620 diff = ev_now - now; 789 rtmn_diff = rt_now - mn_now;
621 790
622 if (fabs (odiff - diff) < MIN_TIMEJUMP) 791 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
623 return; /* all is well */ 792 return; /* all is well */
624 793
625 ev_now = ev_time (); 794 rt_now = ev_time ();
795 mn_now = get_clock ();
796 now_floor = mn_now;
797 }
798
799 periodics_reschedule (EV_A);
800 /* no timer adjustment, as the monotonic clock doesn't jump */
801 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
626 } 802 }
627
628 periodics_reschedule (diff - odiff);
629 /* no timer adjustment, as the monotonic clock doesn't jump */
630 } 803 }
631 else 804 else
805#endif
632 { 806 {
633 if (now > ev_now || now < ev_now - MAX_BLOCKTIME - MIN_TIMEJUMP) 807 rt_now = ev_time ();
808
809 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
634 { 810 {
635 periodics_reschedule (ev_now - now); 811 periodics_reschedule (EV_A);
636 812
637 /* adjust timers. this is easy, as the offset is the same for all */ 813 /* adjust timers. this is easy, as the offset is the same for all */
638 for (i = 0; i < timercnt; ++i) 814 for (i = 0; i < timercnt; ++i)
639 timers [i]->at += diff; 815 timers [i]->at += rt_now - mn_now;
640 } 816 }
641 817
642 now = ev_now; 818 mn_now = rt_now;
643 } 819 }
644} 820}
645 821
646int ev_loop_done; 822void
823ev_ref (EV_P)
824{
825 ++activecnt;
826}
647 827
828void
829ev_unref (EV_P)
830{
831 --activecnt;
832}
833
834static int loop_done;
835
836void
648void ev_loop (int flags) 837ev_loop (EV_P_ int flags)
649{ 838{
650 double block; 839 double block;
651 ev_loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 840 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0;
652 841
653 do 842 do
654 { 843 {
655 /* queue check watchers (and execute them) */ 844 /* queue check watchers (and execute them) */
656 if (preparecnt) 845 if (expect_false (preparecnt))
657 { 846 {
658 queue_events ((W *)prepares, preparecnt, EV_PREPARE); 847 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
659 call_pending (); 848 call_pending (EV_A);
660 } 849 }
661 850
662 /* update fd-related kernel structures */ 851 /* update fd-related kernel structures */
663 fd_reify (); 852 fd_reify (EV_A);
664 853
665 /* calculate blocking time */ 854 /* calculate blocking time */
666 855
667 /* we only need this for !monotonic clockor timers, but as we basically 856 /* we only need this for !monotonic clockor timers, but as we basically
668 always have timers, we just calculate it always */ 857 always have timers, we just calculate it always */
858#if EV_USE_MONOTONIC
859 if (expect_true (have_monotonic))
860 time_update_monotonic (EV_A);
861 else
862#endif
863 {
669 ev_now = ev_time (); 864 rt_now = ev_time ();
865 mn_now = rt_now;
866 }
670 867
671 if (flags & EVLOOP_NONBLOCK || idlecnt) 868 if (flags & EVLOOP_NONBLOCK || idlecnt)
672 block = 0.; 869 block = 0.;
673 else 870 else
674 { 871 {
675 block = MAX_BLOCKTIME; 872 block = MAX_BLOCKTIME;
676 873
677 if (timercnt) 874 if (timercnt)
678 { 875 {
679 ev_tstamp to = timers [0]->at - (have_monotonic ? get_clock () : ev_now) + method_fudge; 876 ev_tstamp to = timers [0]->at - mn_now + method_fudge;
680 if (block > to) block = to; 877 if (block > to) block = to;
681 } 878 }
682 879
683 if (periodiccnt) 880 if (periodiccnt)
684 { 881 {
685 ev_tstamp to = periodics [0]->at - ev_now + method_fudge; 882 ev_tstamp to = periodics [0]->at - rt_now + method_fudge;
686 if (block > to) block = to; 883 if (block > to) block = to;
687 } 884 }
688 885
689 if (block < 0.) block = 0.; 886 if (block < 0.) block = 0.;
690 } 887 }
691 888
692 method_poll (block); 889 method_poll (EV_A_ block);
693 890
694 /* update ev_now, do magic */ 891 /* update rt_now, do magic */
695 time_update (); 892 time_update (EV_A);
696 893
697 /* queue pending timers and reschedule them */ 894 /* queue pending timers and reschedule them */
698 timers_reify (); /* relative timers called last */ 895 timers_reify (EV_A); /* relative timers called last */
699 periodics_reify (); /* absolute timers called first */ 896 periodics_reify (EV_A); /* absolute timers called first */
700 897
701 /* queue idle watchers unless io or timers are pending */ 898 /* queue idle watchers unless io or timers are pending */
702 if (!pendingcnt) 899 if (!pendingcnt)
703 queue_events ((W *)idles, idlecnt, EV_IDLE); 900 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
704 901
705 /* queue check watchers, to be executed first */ 902 /* queue check watchers, to be executed first */
706 if (checkcnt) 903 if (checkcnt)
707 queue_events ((W *)checks, checkcnt, EV_CHECK); 904 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
708 905
709 call_pending (); 906 call_pending (EV_A);
710 } 907 }
711 while (!ev_loop_done); 908 while (activecnt && !loop_done);
712 909
713 if (ev_loop_done != 2) 910 if (loop_done != 2)
714 ev_loop_done = 0; 911 loop_done = 0;
912}
913
914void
915ev_unloop (EV_P_ int how)
916{
917 loop_done = how;
715} 918}
716 919
717/*****************************************************************************/ 920/*****************************************************************************/
718 921
719static void 922inline void
720wlist_add (WL *head, WL elem) 923wlist_add (WL *head, WL elem)
721{ 924{
722 elem->next = *head; 925 elem->next = *head;
723 *head = elem; 926 *head = elem;
724} 927}
725 928
726static void 929inline void
727wlist_del (WL *head, WL elem) 930wlist_del (WL *head, WL elem)
728{ 931{
729 while (*head) 932 while (*head)
730 { 933 {
731 if (*head == elem) 934 if (*head == elem)
736 939
737 head = &(*head)->next; 940 head = &(*head)->next;
738 } 941 }
739} 942}
740 943
741static void 944inline void
742ev_clear_pending (W w) 945ev_clear_pending (EV_P_ W w)
743{ 946{
744 if (w->pending) 947 if (w->pending)
745 { 948 {
746 pendings [w->pending - 1].w = 0; 949 pendings [ABSPRI (w)][w->pending - 1].w = 0;
747 w->pending = 0; 950 w->pending = 0;
748 } 951 }
749} 952}
750 953
751static void 954inline void
752ev_start (W w, int active) 955ev_start (EV_P_ W w, int active)
753{ 956{
957 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
958 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
959
754 w->active = active; 960 w->active = active;
961 ev_ref (EV_A);
755} 962}
756 963
757static void 964inline void
758ev_stop (W w) 965ev_stop (EV_P_ W w)
759{ 966{
967 ev_unref (EV_A);
760 w->active = 0; 968 w->active = 0;
761} 969}
762 970
763/*****************************************************************************/ 971/*****************************************************************************/
764 972
765void 973void
766ev_io_start (struct ev_io *w) 974ev_io_start (EV_P_ struct ev_io *w)
767{ 975{
976 int fd = w->fd;
977
768 if (ev_is_active (w)) 978 if (ev_is_active (w))
769 return; 979 return;
770 980
771 int fd = w->fd;
772
773 assert (("ev_io_start called with negative fd", fd >= 0)); 981 assert (("ev_io_start called with negative fd", fd >= 0));
774 982
775 ev_start ((W)w, 1); 983 ev_start (EV_A_ (W)w, 1);
776 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 984 array_needsize (anfds, anfdmax, fd + 1, anfds_init);
777 wlist_add ((WL *)&anfds[fd].head, (WL)w); 985 wlist_add ((WL *)&anfds[fd].head, (WL)w);
778 986
779 fd_change (fd); 987 fd_change (EV_A_ fd);
780} 988}
781 989
782void 990void
783ev_io_stop (struct ev_io *w) 991ev_io_stop (EV_P_ struct ev_io *w)
784{ 992{
785 ev_clear_pending ((W)w); 993 ev_clear_pending (EV_A_ (W)w);
786 if (!ev_is_active (w)) 994 if (!ev_is_active (w))
787 return; 995 return;
788 996
789 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 997 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
790 ev_stop ((W)w); 998 ev_stop (EV_A_ (W)w);
791 999
792 fd_change (w->fd); 1000 fd_change (EV_A_ w->fd);
793} 1001}
794 1002
795void 1003void
796ev_timer_start (struct ev_timer *w) 1004ev_timer_start (EV_P_ struct ev_timer *w)
797{ 1005{
798 if (ev_is_active (w)) 1006 if (ev_is_active (w))
799 return; 1007 return;
800 1008
801 w->at += now; 1009 w->at += mn_now;
802 1010
803 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1011 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
804 1012
805 ev_start ((W)w, ++timercnt); 1013 ev_start (EV_A_ (W)w, ++timercnt);
806 array_needsize (timers, timermax, timercnt, ); 1014 array_needsize (timers, timermax, timercnt, );
807 timers [timercnt - 1] = w; 1015 timers [timercnt - 1] = w;
808 upheap ((WT *)timers, timercnt - 1); 1016 upheap ((WT *)timers, timercnt - 1);
809} 1017}
810 1018
811void 1019void
812ev_timer_stop (struct ev_timer *w) 1020ev_timer_stop (EV_P_ struct ev_timer *w)
813{ 1021{
814 ev_clear_pending ((W)w); 1022 ev_clear_pending (EV_A_ (W)w);
815 if (!ev_is_active (w)) 1023 if (!ev_is_active (w))
816 return; 1024 return;
817 1025
818 if (w->active < timercnt--) 1026 if (w->active < timercnt--)
819 { 1027 {
821 downheap ((WT *)timers, timercnt, w->active - 1); 1029 downheap ((WT *)timers, timercnt, w->active - 1);
822 } 1030 }
823 1031
824 w->at = w->repeat; 1032 w->at = w->repeat;
825 1033
826 ev_stop ((W)w); 1034 ev_stop (EV_A_ (W)w);
827} 1035}
828 1036
829void 1037void
830ev_timer_again (struct ev_timer *w) 1038ev_timer_again (EV_P_ struct ev_timer *w)
831{ 1039{
832 if (ev_is_active (w)) 1040 if (ev_is_active (w))
833 { 1041 {
834 if (w->repeat) 1042 if (w->repeat)
835 { 1043 {
836 w->at = now + w->repeat; 1044 w->at = mn_now + w->repeat;
837 downheap ((WT *)timers, timercnt, w->active - 1); 1045 downheap ((WT *)timers, timercnt, w->active - 1);
838 } 1046 }
839 else 1047 else
840 ev_timer_stop (w); 1048 ev_timer_stop (EV_A_ w);
841 } 1049 }
842 else if (w->repeat) 1050 else if (w->repeat)
843 ev_timer_start (w); 1051 ev_timer_start (EV_A_ w);
844} 1052}
845 1053
846void 1054void
847ev_periodic_start (struct ev_periodic *w) 1055ev_periodic_start (EV_P_ struct ev_periodic *w)
848{ 1056{
849 if (ev_is_active (w)) 1057 if (ev_is_active (w))
850 return; 1058 return;
851 1059
852 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1060 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
853 1061
854 /* this formula differs from the one in periodic_reify because we do not always round up */ 1062 /* this formula differs from the one in periodic_reify because we do not always round up */
855 if (w->interval) 1063 if (w->interval)
856 w->at += ceil ((ev_now - w->at) / w->interval) * w->interval; 1064 w->at += ceil ((rt_now - w->at) / w->interval) * w->interval;
857 1065
858 ev_start ((W)w, ++periodiccnt); 1066 ev_start (EV_A_ (W)w, ++periodiccnt);
859 array_needsize (periodics, periodicmax, periodiccnt, ); 1067 array_needsize (periodics, periodicmax, periodiccnt, );
860 periodics [periodiccnt - 1] = w; 1068 periodics [periodiccnt - 1] = w;
861 upheap ((WT *)periodics, periodiccnt - 1); 1069 upheap ((WT *)periodics, periodiccnt - 1);
862} 1070}
863 1071
864void 1072void
865ev_periodic_stop (struct ev_periodic *w) 1073ev_periodic_stop (EV_P_ struct ev_periodic *w)
866{ 1074{
867 ev_clear_pending ((W)w); 1075 ev_clear_pending (EV_A_ (W)w);
868 if (!ev_is_active (w)) 1076 if (!ev_is_active (w))
869 return; 1077 return;
870 1078
871 if (w->active < periodiccnt--) 1079 if (w->active < periodiccnt--)
872 { 1080 {
873 periodics [w->active - 1] = periodics [periodiccnt]; 1081 periodics [w->active - 1] = periodics [periodiccnt];
874 downheap ((WT *)periodics, periodiccnt, w->active - 1); 1082 downheap ((WT *)periodics, periodiccnt, w->active - 1);
875 } 1083 }
876 1084
877 ev_stop ((W)w); 1085 ev_stop (EV_A_ (W)w);
878} 1086}
879 1087
1088#ifndef SA_RESTART
1089# define SA_RESTART 0
1090#endif
1091
880void 1092void
881ev_signal_start (struct ev_signal *w) 1093ev_signal_start (EV_P_ struct ev_signal *w)
882{ 1094{
883 if (ev_is_active (w)) 1095 if (ev_is_active (w))
884 return; 1096 return;
885 1097
886 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1098 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
887 1099
888 ev_start ((W)w, 1); 1100 ev_start (EV_A_ (W)w, 1);
889 array_needsize (signals, signalmax, w->signum, signals_init); 1101 array_needsize (signals, signalmax, w->signum, signals_init);
890 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1102 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
891 1103
892 if (!w->next) 1104 if (!w->next)
893 { 1105 {
894 struct sigaction sa; 1106 struct sigaction sa;
895 sa.sa_handler = sighandler; 1107 sa.sa_handler = sighandler;
896 sigfillset (&sa.sa_mask); 1108 sigfillset (&sa.sa_mask);
897 sa.sa_flags = 0; 1109 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
898 sigaction (w->signum, &sa, 0); 1110 sigaction (w->signum, &sa, 0);
899 } 1111 }
900} 1112}
901 1113
902void 1114void
903ev_signal_stop (struct ev_signal *w) 1115ev_signal_stop (EV_P_ struct ev_signal *w)
904{ 1116{
905 ev_clear_pending ((W)w); 1117 ev_clear_pending (EV_A_ (W)w);
906 if (!ev_is_active (w)) 1118 if (!ev_is_active (w))
907 return; 1119 return;
908 1120
909 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1121 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
910 ev_stop ((W)w); 1122 ev_stop (EV_A_ (W)w);
911 1123
912 if (!signals [w->signum - 1].head) 1124 if (!signals [w->signum - 1].head)
913 signal (w->signum, SIG_DFL); 1125 signal (w->signum, SIG_DFL);
914} 1126}
915 1127
916void 1128void
917ev_idle_start (struct ev_idle *w) 1129ev_idle_start (EV_P_ struct ev_idle *w)
918{ 1130{
919 if (ev_is_active (w)) 1131 if (ev_is_active (w))
920 return; 1132 return;
921 1133
922 ev_start ((W)w, ++idlecnt); 1134 ev_start (EV_A_ (W)w, ++idlecnt);
923 array_needsize (idles, idlemax, idlecnt, ); 1135 array_needsize (idles, idlemax, idlecnt, );
924 idles [idlecnt - 1] = w; 1136 idles [idlecnt - 1] = w;
925} 1137}
926 1138
927void 1139void
928ev_idle_stop (struct ev_idle *w) 1140ev_idle_stop (EV_P_ struct ev_idle *w)
929{ 1141{
930 ev_clear_pending ((W)w); 1142 ev_clear_pending (EV_A_ (W)w);
931 if (ev_is_active (w)) 1143 if (ev_is_active (w))
932 return; 1144 return;
933 1145
934 idles [w->active - 1] = idles [--idlecnt]; 1146 idles [w->active - 1] = idles [--idlecnt];
935 ev_stop ((W)w); 1147 ev_stop (EV_A_ (W)w);
936} 1148}
937 1149
938void 1150void
939ev_prepare_start (struct ev_prepare *w) 1151ev_prepare_start (EV_P_ struct ev_prepare *w)
940{ 1152{
941 if (ev_is_active (w)) 1153 if (ev_is_active (w))
942 return; 1154 return;
943 1155
944 ev_start ((W)w, ++preparecnt); 1156 ev_start (EV_A_ (W)w, ++preparecnt);
945 array_needsize (prepares, preparemax, preparecnt, ); 1157 array_needsize (prepares, preparemax, preparecnt, );
946 prepares [preparecnt - 1] = w; 1158 prepares [preparecnt - 1] = w;
947} 1159}
948 1160
949void 1161void
950ev_prepare_stop (struct ev_prepare *w) 1162ev_prepare_stop (EV_P_ struct ev_prepare *w)
951{ 1163{
952 ev_clear_pending ((W)w); 1164 ev_clear_pending (EV_A_ (W)w);
953 if (ev_is_active (w)) 1165 if (ev_is_active (w))
954 return; 1166 return;
955 1167
956 prepares [w->active - 1] = prepares [--preparecnt]; 1168 prepares [w->active - 1] = prepares [--preparecnt];
957 ev_stop ((W)w); 1169 ev_stop (EV_A_ (W)w);
958} 1170}
959 1171
960void 1172void
961ev_check_start (struct ev_check *w) 1173ev_check_start (EV_P_ struct ev_check *w)
962{ 1174{
963 if (ev_is_active (w)) 1175 if (ev_is_active (w))
964 return; 1176 return;
965 1177
966 ev_start ((W)w, ++checkcnt); 1178 ev_start (EV_A_ (W)w, ++checkcnt);
967 array_needsize (checks, checkmax, checkcnt, ); 1179 array_needsize (checks, checkmax, checkcnt, );
968 checks [checkcnt - 1] = w; 1180 checks [checkcnt - 1] = w;
969} 1181}
970 1182
971void 1183void
972ev_check_stop (struct ev_check *w) 1184ev_check_stop (EV_P_ struct ev_check *w)
973{ 1185{
974 ev_clear_pending ((W)w); 1186 ev_clear_pending (EV_A_ (W)w);
975 if (ev_is_active (w)) 1187 if (ev_is_active (w))
976 return; 1188 return;
977 1189
978 checks [w->active - 1] = checks [--checkcnt]; 1190 checks [w->active - 1] = checks [--checkcnt];
979 ev_stop ((W)w); 1191 ev_stop (EV_A_ (W)w);
980} 1192}
981 1193
982void 1194void
983ev_child_start (struct ev_child *w) 1195ev_child_start (EV_P_ struct ev_child *w)
984{ 1196{
985 if (ev_is_active (w)) 1197 if (ev_is_active (w))
986 return; 1198 return;
987 1199
988 ev_start ((W)w, 1); 1200 ev_start (EV_A_ (W)w, 1);
989 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1201 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
990} 1202}
991 1203
992void 1204void
993ev_child_stop (struct ev_child *w) 1205ev_child_stop (EV_P_ struct ev_child *w)
994{ 1206{
995 ev_clear_pending ((W)w); 1207 ev_clear_pending (EV_A_ (W)w);
996 if (ev_is_active (w)) 1208 if (ev_is_active (w))
997 return; 1209 return;
998 1210
999 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1211 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w);
1000 ev_stop ((W)w); 1212 ev_stop (EV_A_ (W)w);
1001} 1213}
1002 1214
1003/*****************************************************************************/ 1215/*****************************************************************************/
1004 1216
1005struct ev_once 1217struct ev_once
1009 void (*cb)(int revents, void *arg); 1221 void (*cb)(int revents, void *arg);
1010 void *arg; 1222 void *arg;
1011}; 1223};
1012 1224
1013static void 1225static void
1014once_cb (struct ev_once *once, int revents) 1226once_cb (EV_P_ struct ev_once *once, int revents)
1015{ 1227{
1016 void (*cb)(int revents, void *arg) = once->cb; 1228 void (*cb)(int revents, void *arg) = once->cb;
1017 void *arg = once->arg; 1229 void *arg = once->arg;
1018 1230
1019 ev_io_stop (&once->io); 1231 ev_io_stop (EV_A_ &once->io);
1020 ev_timer_stop (&once->to); 1232 ev_timer_stop (EV_A_ &once->to);
1021 free (once); 1233 free (once);
1022 1234
1023 cb (revents, arg); 1235 cb (revents, arg);
1024} 1236}
1025 1237
1026static void 1238static void
1027once_cb_io (struct ev_io *w, int revents) 1239once_cb_io (EV_P_ struct ev_io *w, int revents)
1028{ 1240{
1029 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 1241 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1030} 1242}
1031 1243
1032static void 1244static void
1033once_cb_to (struct ev_timer *w, int revents) 1245once_cb_to (EV_P_ struct ev_timer *w, int revents)
1034{ 1246{
1035 once_cb ((struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 1247 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1036} 1248}
1037 1249
1038void 1250void
1039ev_once (int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 1251ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1040{ 1252{
1041 struct ev_once *once = malloc (sizeof (struct ev_once)); 1253 struct ev_once *once = malloc (sizeof (struct ev_once));
1042 1254
1043 if (!once) 1255 if (!once)
1044 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 1256 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1049 1261
1050 ev_watcher_init (&once->io, once_cb_io); 1262 ev_watcher_init (&once->io, once_cb_io);
1051 if (fd >= 0) 1263 if (fd >= 0)
1052 { 1264 {
1053 ev_io_set (&once->io, fd, events); 1265 ev_io_set (&once->io, fd, events);
1054 ev_io_start (&once->io); 1266 ev_io_start (EV_A_ &once->io);
1055 } 1267 }
1056 1268
1057 ev_watcher_init (&once->to, once_cb_to); 1269 ev_watcher_init (&once->to, once_cb_to);
1058 if (timeout >= 0.) 1270 if (timeout >= 0.)
1059 { 1271 {
1060 ev_timer_set (&once->to, timeout, 0.); 1272 ev_timer_set (&once->to, timeout, 0.);
1061 ev_timer_start (&once->to); 1273 ev_timer_start (EV_A_ &once->to);
1062 } 1274 }
1063 } 1275 }
1064} 1276}
1065 1277
1066/*****************************************************************************/ 1278/*****************************************************************************/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines