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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines