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

Comparing libev/ev.c (file contents):
Revision 1.64 by root, Sun Nov 4 23:14:11 2007 UTC vs.
Revision 1.153 by root, Wed Nov 28 11:41:18 2007 UTC

26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 26 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 27 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 28 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 29 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31
32#ifdef __cplusplus
33extern "C" {
34#endif
35
31#ifndef EV_STANDALONE 36#ifndef EV_STANDALONE
37# ifdef EV_CONFIG_H
38# include EV_CONFIG_H
39# else
32# include "config.h" 40# include "config.h"
41# endif
33 42
34# if HAVE_CLOCK_GETTIME 43# if HAVE_CLOCK_GETTIME
44# ifndef EV_USE_MONOTONIC
35# define EV_USE_MONOTONIC 1 45# define EV_USE_MONOTONIC 1
46# endif
47# ifndef EV_USE_REALTIME
36# define EV_USE_REALTIME 1 48# define EV_USE_REALTIME 1
49# endif
50# else
51# ifndef EV_USE_MONOTONIC
52# define EV_USE_MONOTONIC 0
53# endif
54# ifndef EV_USE_REALTIME
55# define EV_USE_REALTIME 0
56# endif
37# endif 57# endif
38 58
59# ifndef EV_USE_SELECT
39# if HAVE_SELECT && HAVE_SYS_SELECT_H 60# if HAVE_SELECT && HAVE_SYS_SELECT_H
40# define EV_USE_SELECT 1 61# define EV_USE_SELECT 1
62# else
63# define EV_USE_SELECT 0
64# endif
41# endif 65# endif
42 66
67# ifndef EV_USE_POLL
43# if HAVE_POLL && HAVE_POLL_H 68# if HAVE_POLL && HAVE_POLL_H
44# define EV_USE_POLL 1 69# define EV_USE_POLL 1
70# else
71# define EV_USE_POLL 0
72# endif
45# endif 73# endif
46 74
75# ifndef EV_USE_EPOLL
47# if HAVE_EPOLL && HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H 76# if HAVE_EPOLL_CTL && HAVE_SYS_EPOLL_H
48# define EV_USE_EPOLL 1 77# define EV_USE_EPOLL 1
78# else
79# define EV_USE_EPOLL 0
80# endif
49# endif 81# endif
50 82
83# ifndef EV_USE_KQUEUE
51# if HAVE_KQUEUE && HAVE_WORKING_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H 84# if HAVE_KQUEUE && HAVE_SYS_EVENT_H && HAVE_SYS_QUEUE_H
52# define EV_USE_KQUEUE 1 85# define EV_USE_KQUEUE 1
86# else
87# define EV_USE_KQUEUE 0
88# endif
89# endif
90
91# ifndef EV_USE_PORT
92# if HAVE_PORT_H && HAVE_PORT_CREATE
93# define EV_USE_PORT 1
94# else
95# define EV_USE_PORT 0
96# endif
97# endif
98
99# ifndef EV_USE_INOTIFY
100# if HAVE_INOTIFY_INIT && HAVE_SYS_INOTIFY_H
101# define EV_USE_INOTIFY 1
102# else
103# define EV_USE_INOTIFY 0
104# endif
53# endif 105# endif
54 106
55#endif 107#endif
56 108
57#include <math.h> 109#include <math.h>
58#include <stdlib.h> 110#include <stdlib.h>
59#include <unistd.h>
60#include <fcntl.h> 111#include <fcntl.h>
61#include <signal.h>
62#include <stddef.h> 112#include <stddef.h>
63 113
64#include <stdio.h> 114#include <stdio.h>
65 115
66#include <assert.h> 116#include <assert.h>
67#include <errno.h> 117#include <errno.h>
68#include <sys/types.h> 118#include <sys/types.h>
119#include <time.h>
120
121#include <signal.h>
122
123#ifdef EV_H
124# include EV_H
125#else
126# include "ev.h"
127#endif
128
69#ifndef WIN32 129#ifndef _WIN32
130# include <sys/time.h>
70# include <sys/wait.h> 131# include <sys/wait.h>
132# include <unistd.h>
133#else
134# define WIN32_LEAN_AND_MEAN
135# include <windows.h>
136# ifndef EV_SELECT_IS_WINSOCKET
137# define EV_SELECT_IS_WINSOCKET 1
71#endif 138# endif
72#include <sys/time.h> 139#endif
73#include <time.h>
74 140
75/**/ 141/**/
76 142
77#ifndef EV_USE_MONOTONIC 143#ifndef EV_USE_MONOTONIC
78# define EV_USE_MONOTONIC 1 144# define EV_USE_MONOTONIC 0
145#endif
146
147#ifndef EV_USE_REALTIME
148# define EV_USE_REALTIME 0
79#endif 149#endif
80 150
81#ifndef EV_USE_SELECT 151#ifndef EV_USE_SELECT
82# define EV_USE_SELECT 1 152# define EV_USE_SELECT 1
83#endif 153#endif
84 154
85#ifndef EV_USE_POLL 155#ifndef EV_USE_POLL
86# define EV_USE_POLL 0 /* poll is usually slower than select, and not as well tested */ 156# ifdef _WIN32
157# define EV_USE_POLL 0
158# else
159# define EV_USE_POLL 1
160# endif
87#endif 161#endif
88 162
89#ifndef EV_USE_EPOLL 163#ifndef EV_USE_EPOLL
90# define EV_USE_EPOLL 0 164# define EV_USE_EPOLL 0
91#endif 165#endif
92 166
93#ifndef EV_USE_KQUEUE 167#ifndef EV_USE_KQUEUE
94# define EV_USE_KQUEUE 0 168# define EV_USE_KQUEUE 0
95#endif 169#endif
96 170
171#ifndef EV_USE_PORT
172# define EV_USE_PORT 0
173#endif
174
97#ifndef EV_USE_WIN32 175#ifndef EV_USE_INOTIFY
98# ifdef WIN32 176# define EV_USE_INOTIFY 0
99# define EV_USE_WIN32 1 177#endif
178
179#ifndef EV_PID_HASHSIZE
180# if EV_MINIMAL
181# define EV_PID_HASHSIZE 1
100# else 182# else
101# define EV_USE_WIN32 0 183# define EV_PID_HASHSIZE 16
102# endif 184# endif
103#endif 185#endif
104 186
105#ifndef EV_USE_REALTIME 187#ifndef EV_INOTIFY_HASHSIZE
106# define EV_USE_REALTIME 1 188# if EV_MINIMAL
189# define EV_INOTIFY_HASHSIZE 1
190# else
191# define EV_INOTIFY_HASHSIZE 16
192# endif
107#endif 193#endif
108 194
109/**/ 195/**/
110 196
111#ifndef CLOCK_MONOTONIC 197#ifndef CLOCK_MONOTONIC
116#ifndef CLOCK_REALTIME 202#ifndef CLOCK_REALTIME
117# undef EV_USE_REALTIME 203# undef EV_USE_REALTIME
118# define EV_USE_REALTIME 0 204# define EV_USE_REALTIME 0
119#endif 205#endif
120 206
207#if EV_SELECT_IS_WINSOCKET
208# include <winsock.h>
209#endif
210
211#if !EV_STAT_ENABLE
212# define EV_USE_INOTIFY 0
213#endif
214
215#if EV_USE_INOTIFY
216# include <sys/inotify.h>
217#endif
218
121/**/ 219/**/
122 220
123#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 221#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
124#define MAX_BLOCKTIME 59.731 /* never wait longer than this time (to detect time jumps) */ 222#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
125#define PID_HASHSIZE 16 /* size of pid hash table, must be power of two */
126/*#define CLEANUP_INTERVAL 300. /* how often to try to free memory and re-check fds */ 223/*#define CLEANUP_INTERVAL (MAX_BLOCKTIME * 5.) /* how often to try to free memory and re-check fds */
127
128#include "ev.h"
129 224
130#if __GNUC__ >= 3 225#if __GNUC__ >= 3
131# define expect(expr,value) __builtin_expect ((expr),(value)) 226# define expect(expr,value) __builtin_expect ((expr),(value))
227# define inline_size static inline /* inline for codesize */
228# if EV_MINIMAL
132# define inline inline 229# define noinline __attribute__ ((noinline))
230# define inline_speed static noinline
231# else
232# define noinline
233# define inline_speed static inline
234# endif
133#else 235#else
134# define expect(expr,value) (expr) 236# define expect(expr,value) (expr)
237# define inline_speed static
135# define inline static 238# define inline_size static
239# define noinline
136#endif 240#endif
137 241
138#define expect_false(expr) expect ((expr) != 0, 0) 242#define expect_false(expr) expect ((expr) != 0, 0)
139#define expect_true(expr) expect ((expr) != 0, 1) 243#define expect_true(expr) expect ((expr) != 0, 1)
140 244
141#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 245#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
142#define ABSPRI(w) ((w)->priority - EV_MINPRI) 246#define ABSPRI(w) ((w)->priority - EV_MINPRI)
143 247
248#define EMPTY0 /* required for microsofts broken pseudo-c compiler */
249#define EMPTY2(a,b) /* used to suppress some warnings */
250
144typedef struct ev_watcher *W; 251typedef ev_watcher *W;
145typedef struct ev_watcher_list *WL; 252typedef ev_watcher_list *WL;
146typedef struct ev_watcher_time *WT; 253typedef ev_watcher_time *WT;
147 254
148static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */ 255static int have_monotonic; /* did clock_gettime (CLOCK_MONOTONIC) work? */
149 256
257#ifdef _WIN32
258# include "ev_win32.c"
259#endif
260
150/*****************************************************************************/ 261/*****************************************************************************/
151 262
263static void (*syserr_cb)(const char *msg);
264
265void
266ev_set_syserr_cb (void (*cb)(const char *msg))
267{
268 syserr_cb = cb;
269}
270
271static void noinline
272syserr (const char *msg)
273{
274 if (!msg)
275 msg = "(libev) system error";
276
277 if (syserr_cb)
278 syserr_cb (msg);
279 else
280 {
281 perror (msg);
282 abort ();
283 }
284}
285
286static void *(*alloc)(void *ptr, size_t size) = realloc;
287
288void
289ev_set_allocator (void *(*cb)(void *ptr, size_t size))
290{
291 alloc = cb;
292}
293
294inline_speed void *
295ev_realloc (void *ptr, size_t size)
296{
297 ptr = alloc (ptr, size);
298
299 if (!ptr && size)
300 {
301 fprintf (stderr, "libev: cannot allocate %ld bytes, aborting.", (long)size);
302 abort ();
303 }
304
305 return ptr;
306}
307
308#define ev_malloc(size) ev_realloc (0, (size))
309#define ev_free(ptr) ev_realloc ((ptr), 0)
310
311/*****************************************************************************/
312
152typedef struct 313typedef struct
153{ 314{
154 struct ev_watcher_list *head; 315 WL head;
155 unsigned char events; 316 unsigned char events;
156 unsigned char reify; 317 unsigned char reify;
318#if EV_SELECT_IS_WINSOCKET
319 SOCKET handle;
320#endif
157} ANFD; 321} ANFD;
158 322
159typedef struct 323typedef struct
160{ 324{
161 W w; 325 W w;
162 int events; 326 int events;
163} ANPENDING; 327} ANPENDING;
164 328
329typedef struct
330{
331#if EV_USE_INOTIFY
332 WL head;
333#endif
334} ANFS;
335
165#if EV_MULTIPLICITY 336#if EV_MULTIPLICITY
166 337
167struct ev_loop 338 struct ev_loop
168{ 339 {
340 ev_tstamp ev_rt_now;
341 #define ev_rt_now ((loop)->ev_rt_now)
169# define VAR(name,decl) decl; 342 #define VAR(name,decl) decl;
170# include "ev_vars.h" 343 #include "ev_vars.h"
171};
172# undef VAR 344 #undef VAR
345 };
173# include "ev_wrap.h" 346 #include "ev_wrap.h"
347
348 static struct ev_loop default_loop_struct;
349 struct ev_loop *ev_default_loop_ptr;
174 350
175#else 351#else
176 352
353 ev_tstamp ev_rt_now;
177# define VAR(name,decl) static decl; 354 #define VAR(name,decl) static decl;
178# include "ev_vars.h" 355 #include "ev_vars.h"
179# undef VAR 356 #undef VAR
357
358 static int ev_default_loop_ptr;
180 359
181#endif 360#endif
182 361
183/*****************************************************************************/ 362/*****************************************************************************/
184 363
185inline ev_tstamp 364ev_tstamp
186ev_time (void) 365ev_time (void)
187{ 366{
188#if EV_USE_REALTIME 367#if EV_USE_REALTIME
189 struct timespec ts; 368 struct timespec ts;
190 clock_gettime (CLOCK_REALTIME, &ts); 369 clock_gettime (CLOCK_REALTIME, &ts);
194 gettimeofday (&tv, 0); 373 gettimeofday (&tv, 0);
195 return tv.tv_sec + tv.tv_usec * 1e-6; 374 return tv.tv_sec + tv.tv_usec * 1e-6;
196#endif 375#endif
197} 376}
198 377
199inline ev_tstamp 378ev_tstamp inline_size
200get_clock (void) 379get_clock (void)
201{ 380{
202#if EV_USE_MONOTONIC 381#if EV_USE_MONOTONIC
203 if (expect_true (have_monotonic)) 382 if (expect_true (have_monotonic))
204 { 383 {
209#endif 388#endif
210 389
211 return ev_time (); 390 return ev_time ();
212} 391}
213 392
393#if EV_MULTIPLICITY
214ev_tstamp 394ev_tstamp
215ev_now (EV_P) 395ev_now (EV_P)
216{ 396{
217 return rt_now; 397 return ev_rt_now;
218} 398}
399#endif
219 400
220#define array_roundsize(base,n) ((n) | 4 & ~3) 401#define array_roundsize(type,n) (((n) | 4) & ~3)
221 402
222#define array_needsize(base,cur,cnt,init) \ 403#define array_needsize(type,base,cur,cnt,init) \
223 if (expect_false ((cnt) > cur)) \ 404 if (expect_false ((cnt) > cur)) \
224 { \ 405 { \
225 int newcnt = cur; \ 406 int newcnt = cur; \
226 do \ 407 do \
227 { \ 408 { \
228 newcnt = array_roundsize (base, newcnt << 1); \ 409 newcnt = array_roundsize (type, newcnt << 1); \
229 } \ 410 } \
230 while ((cnt) > newcnt); \ 411 while ((cnt) > newcnt); \
231 \ 412 \
232 base = realloc (base, sizeof (*base) * (newcnt)); \ 413 base = (type *)ev_realloc (base, sizeof (type) * (newcnt));\
233 init (base + cur, newcnt - cur); \ 414 init (base + cur, newcnt - cur); \
234 cur = newcnt; \ 415 cur = newcnt; \
235 } 416 }
417
418#define array_slim(type,stem) \
419 if (stem ## max < array_roundsize (stem ## cnt >> 2)) \
420 { \
421 stem ## max = array_roundsize (stem ## cnt >> 1); \
422 base = (type *)ev_realloc (base, sizeof (type) * (stem ## max));\
423 fprintf (stderr, "slimmed down " # stem " to %d\n", stem ## max);/*D*/\
424 }
425
426#define array_free(stem, idx) \
427 ev_free (stem ## s idx); stem ## cnt idx = stem ## max idx = 0;
236 428
237/*****************************************************************************/ 429/*****************************************************************************/
238 430
239static void 431void noinline
432ev_feed_event (EV_P_ void *w, int revents)
433{
434 W w_ = (W)w;
435
436 if (expect_false (w_->pending))
437 {
438 pendings [ABSPRI (w_)][w_->pending - 1].events |= revents;
439 return;
440 }
441
442 w_->pending = ++pendingcnt [ABSPRI (w_)];
443 array_needsize (ANPENDING, pendings [ABSPRI (w_)], pendingmax [ABSPRI (w_)], pendingcnt [ABSPRI (w_)], EMPTY2);
444 pendings [ABSPRI (w_)][w_->pending - 1].w = w_;
445 pendings [ABSPRI (w_)][w_->pending - 1].events = revents;
446}
447
448void inline_size
449queue_events (EV_P_ W *events, int eventcnt, int type)
450{
451 int i;
452
453 for (i = 0; i < eventcnt; ++i)
454 ev_feed_event (EV_A_ events [i], type);
455}
456
457/*****************************************************************************/
458
459void inline_size
240anfds_init (ANFD *base, int count) 460anfds_init (ANFD *base, int count)
241{ 461{
242 while (count--) 462 while (count--)
243 { 463 {
244 base->head = 0; 464 base->head = 0;
247 467
248 ++base; 468 ++base;
249 } 469 }
250} 470}
251 471
252static void 472void inline_speed
253event (EV_P_ W w, int events)
254{
255 if (w->pending)
256 {
257 pendings [ABSPRI (w)][w->pending - 1].events |= events;
258 return;
259 }
260
261 w->pending = ++pendingcnt [ABSPRI (w)];
262 array_needsize (pendings [ABSPRI (w)], pendingmax [ABSPRI (w)], pendingcnt [ABSPRI (w)], );
263 pendings [ABSPRI (w)][w->pending - 1].w = w;
264 pendings [ABSPRI (w)][w->pending - 1].events = events;
265}
266
267static void
268queue_events (EV_P_ W *events, int eventcnt, int type)
269{
270 int i;
271
272 for (i = 0; i < eventcnt; ++i)
273 event (EV_A_ events [i], type);
274}
275
276static void
277fd_event (EV_P_ int fd, int events) 473fd_event (EV_P_ int fd, int revents)
278{ 474{
279 ANFD *anfd = anfds + fd; 475 ANFD *anfd = anfds + fd;
280 struct ev_io *w; 476 ev_io *w;
281 477
282 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 478 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
283 { 479 {
284 int ev = w->events & events; 480 int ev = w->events & revents;
285 481
286 if (ev) 482 if (ev)
287 event (EV_A_ (W)w, ev); 483 ev_feed_event (EV_A_ (W)w, ev);
288 } 484 }
289} 485}
290 486
291/*****************************************************************************/ 487void
488ev_feed_fd_event (EV_P_ int fd, int revents)
489{
490 fd_event (EV_A_ fd, revents);
491}
292 492
293static void 493void inline_size
294fd_reify (EV_P) 494fd_reify (EV_P)
295{ 495{
296 int i; 496 int i;
297 497
298 for (i = 0; i < fdchangecnt; ++i) 498 for (i = 0; i < fdchangecnt; ++i)
299 { 499 {
300 int fd = fdchanges [i]; 500 int fd = fdchanges [i];
301 ANFD *anfd = anfds + fd; 501 ANFD *anfd = anfds + fd;
302 struct ev_io *w; 502 ev_io *w;
303 503
304 int events = 0; 504 int events = 0;
305 505
306 for (w = (struct ev_io *)anfd->head; w; w = (struct ev_io *)((WL)w)->next) 506 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
307 events |= w->events; 507 events |= w->events;
308 508
509#if EV_SELECT_IS_WINSOCKET
510 if (events)
511 {
512 unsigned long argp;
513 anfd->handle = _get_osfhandle (fd);
514 assert (("libev only supports socket fds in this configuration", ioctlsocket (anfd->handle, FIONREAD, &argp) == 0));
515 }
516#endif
517
309 anfd->reify = 0; 518 anfd->reify = 0;
310 519
311 method_modify (EV_A_ fd, anfd->events, events); 520 backend_modify (EV_A_ fd, anfd->events, events);
312 anfd->events = events; 521 anfd->events = events;
313 } 522 }
314 523
315 fdchangecnt = 0; 524 fdchangecnt = 0;
316} 525}
317 526
318static void 527void inline_size
319fd_change (EV_P_ int fd) 528fd_change (EV_P_ int fd)
320{ 529{
321 if (anfds [fd].reify || fdchangecnt < 0) 530 if (expect_false (anfds [fd].reify))
322 return; 531 return;
323 532
324 anfds [fd].reify = 1; 533 anfds [fd].reify = 1;
325 534
326 ++fdchangecnt; 535 ++fdchangecnt;
327 array_needsize (fdchanges, fdchangemax, fdchangecnt, ); 536 array_needsize (int, fdchanges, fdchangemax, fdchangecnt, EMPTY2);
328 fdchanges [fdchangecnt - 1] = fd; 537 fdchanges [fdchangecnt - 1] = fd;
329} 538}
330 539
331static void 540void inline_speed
332fd_kill (EV_P_ int fd) 541fd_kill (EV_P_ int fd)
333{ 542{
334 struct ev_io *w; 543 ev_io *w;
335 544
336 while ((w = (struct ev_io *)anfds [fd].head)) 545 while ((w = (ev_io *)anfds [fd].head))
337 { 546 {
338 ev_io_stop (EV_A_ w); 547 ev_io_stop (EV_A_ w);
339 event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 548 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
340 } 549 }
550}
551
552int inline_size
553fd_valid (int fd)
554{
555#ifdef _WIN32
556 return _get_osfhandle (fd) != -1;
557#else
558 return fcntl (fd, F_GETFD) != -1;
559#endif
341} 560}
342 561
343/* called on EBADF to verify fds */ 562/* called on EBADF to verify fds */
344static void 563static void noinline
345fd_ebadf (EV_P) 564fd_ebadf (EV_P)
346{ 565{
347 int fd; 566 int fd;
348 567
349 for (fd = 0; fd < anfdmax; ++fd) 568 for (fd = 0; fd < anfdmax; ++fd)
350 if (anfds [fd].events) 569 if (anfds [fd].events)
351 if (fcntl (fd, F_GETFD) == -1 && errno == EBADF) 570 if (!fd_valid (fd) == -1 && errno == EBADF)
352 fd_kill (EV_A_ fd); 571 fd_kill (EV_A_ fd);
353} 572}
354 573
355/* called on ENOMEM in select/poll to kill some fds and retry */ 574/* called on ENOMEM in select/poll to kill some fds and retry */
356static void 575static void noinline
357fd_enomem (EV_P) 576fd_enomem (EV_P)
358{ 577{
359 int fd; 578 int fd;
360 579
361 for (fd = anfdmax; fd--; ) 580 for (fd = anfdmax; fd--; )
362 if (anfds [fd].events) 581 if (anfds [fd].events)
363 { 582 {
364 close (fd);
365 fd_kill (EV_A_ fd); 583 fd_kill (EV_A_ fd);
366 return; 584 return;
367 } 585 }
368} 586}
369 587
370/* susually called after fork if method needs to re-arm all fds from scratch */ 588/* usually called after fork if backend needs to re-arm all fds from scratch */
371static void 589static void noinline
372fd_rearm_all (EV_P) 590fd_rearm_all (EV_P)
373{ 591{
374 int fd; 592 int fd;
375 593
376 /* this should be highly optimised to not do anything but set a flag */ 594 /* this should be highly optimised to not do anything but set a flag */
382 } 600 }
383} 601}
384 602
385/*****************************************************************************/ 603/*****************************************************************************/
386 604
387static void 605void inline_speed
388upheap (WT *heap, int k) 606upheap (WT *heap, int k)
389{ 607{
390 WT w = heap [k]; 608 WT w = heap [k];
391 609
392 while (k && heap [k >> 1]->at > w->at) 610 while (k && heap [k >> 1]->at > w->at)
399 heap [k] = w; 617 heap [k] = w;
400 ((W)heap [k])->active = k + 1; 618 ((W)heap [k])->active = k + 1;
401 619
402} 620}
403 621
404static void 622void inline_speed
405downheap (WT *heap, int N, int k) 623downheap (WT *heap, int N, int k)
406{ 624{
407 WT w = heap [k]; 625 WT w = heap [k];
408 626
409 while (k < (N >> 1)) 627 while (k < (N >> 1))
423 641
424 heap [k] = w; 642 heap [k] = w;
425 ((W)heap [k])->active = k + 1; 643 ((W)heap [k])->active = k + 1;
426} 644}
427 645
646void inline_size
647adjustheap (WT *heap, int N, int k)
648{
649 upheap (heap, k);
650 downheap (heap, N, k);
651}
652
428/*****************************************************************************/ 653/*****************************************************************************/
429 654
430typedef struct 655typedef struct
431{ 656{
432 struct ev_watcher_list *head; 657 WL head;
433 sig_atomic_t volatile gotsig; 658 sig_atomic_t volatile gotsig;
434} ANSIG; 659} ANSIG;
435 660
436static ANSIG *signals; 661static ANSIG *signals;
437static int signalmax; 662static int signalmax;
438 663
439static int sigpipe [2]; 664static int sigpipe [2];
440static sig_atomic_t volatile gotsig; 665static sig_atomic_t volatile gotsig;
441static struct ev_io sigev; 666static ev_io sigev;
442 667
443static void 668void inline_size
444signals_init (ANSIG *base, int count) 669signals_init (ANSIG *base, int count)
445{ 670{
446 while (count--) 671 while (count--)
447 { 672 {
448 base->head = 0; 673 base->head = 0;
453} 678}
454 679
455static void 680static void
456sighandler (int signum) 681sighandler (int signum)
457{ 682{
683#if _WIN32
684 signal (signum, sighandler);
685#endif
686
458 signals [signum - 1].gotsig = 1; 687 signals [signum - 1].gotsig = 1;
459 688
460 if (!gotsig) 689 if (!gotsig)
461 { 690 {
462 int old_errno = errno; 691 int old_errno = errno;
464 write (sigpipe [1], &signum, 1); 693 write (sigpipe [1], &signum, 1);
465 errno = old_errno; 694 errno = old_errno;
466 } 695 }
467} 696}
468 697
698void noinline
699ev_feed_signal_event (EV_P_ int signum)
700{
701 WL w;
702
703#if EV_MULTIPLICITY
704 assert (("feeding signal events is only supported in the default loop", loop == ev_default_loop_ptr));
705#endif
706
707 --signum;
708
709 if (signum < 0 || signum >= signalmax)
710 return;
711
712 signals [signum].gotsig = 0;
713
714 for (w = signals [signum].head; w; w = w->next)
715 ev_feed_event (EV_A_ (W)w, EV_SIGNAL);
716}
717
469static void 718static void
470sigcb (EV_P_ struct ev_io *iow, int revents) 719sigcb (EV_P_ ev_io *iow, int revents)
471{ 720{
472 struct ev_watcher_list *w;
473 int signum; 721 int signum;
474 722
475 read (sigpipe [0], &revents, 1); 723 read (sigpipe [0], &revents, 1);
476 gotsig = 0; 724 gotsig = 0;
477 725
478 for (signum = signalmax; signum--; ) 726 for (signum = signalmax; signum--; )
479 if (signals [signum].gotsig) 727 if (signals [signum].gotsig)
480 { 728 ev_feed_signal_event (EV_A_ signum + 1);
481 signals [signum].gotsig = 0;
482
483 for (w = signals [signum].head; w; w = w->next)
484 event (EV_A_ (W)w, EV_SIGNAL);
485 }
486} 729}
487 730
488static void 731void inline_size
732fd_intern (int fd)
733{
734#ifdef _WIN32
735 int arg = 1;
736 ioctlsocket (_get_osfhandle (fd), FIONBIO, &arg);
737#else
738 fcntl (fd, F_SETFD, FD_CLOEXEC);
739 fcntl (fd, F_SETFL, O_NONBLOCK);
740#endif
741}
742
743static void noinline
489siginit (EV_P) 744siginit (EV_P)
490{ 745{
491#ifndef WIN32 746 fd_intern (sigpipe [0]);
492 fcntl (sigpipe [0], F_SETFD, FD_CLOEXEC); 747 fd_intern (sigpipe [1]);
493 fcntl (sigpipe [1], F_SETFD, FD_CLOEXEC);
494
495 /* rather than sort out wether we really need nb, set it */
496 fcntl (sigpipe [0], F_SETFL, O_NONBLOCK);
497 fcntl (sigpipe [1], F_SETFL, O_NONBLOCK);
498#endif
499 748
500 ev_io_set (&sigev, sigpipe [0], EV_READ); 749 ev_io_set (&sigev, sigpipe [0], EV_READ);
501 ev_io_start (EV_A_ &sigev); 750 ev_io_start (EV_A_ &sigev);
502 ev_unref (EV_A); /* child watcher should not keep loop alive */ 751 ev_unref (EV_A); /* child watcher should not keep loop alive */
503} 752}
504 753
505/*****************************************************************************/ 754/*****************************************************************************/
506 755
756static ev_child *childs [EV_PID_HASHSIZE];
757
507#ifndef WIN32 758#ifndef _WIN32
508 759
509static struct ev_child *childs [PID_HASHSIZE];
510static struct ev_signal childev; 760static ev_signal childev;
511 761
512#ifndef WCONTINUED 762void inline_speed
513# define WCONTINUED 0
514#endif
515
516static void
517child_reap (EV_P_ struct ev_signal *sw, int chain, int pid, int status) 763child_reap (EV_P_ ev_signal *sw, int chain, int pid, int status)
518{ 764{
519 struct ev_child *w; 765 ev_child *w;
520 766
521 for (w = (struct ev_child *)childs [chain & (PID_HASHSIZE - 1)]; w; w = (struct ev_child *)((WL)w)->next) 767 for (w = (ev_child *)childs [chain & (EV_PID_HASHSIZE - 1)]; w; w = (ev_child *)((WL)w)->next)
522 if (w->pid == pid || !w->pid) 768 if (w->pid == pid || !w->pid)
523 { 769 {
524 ev_priority (w) = ev_priority (sw); /* need to do it *now* */ 770 ev_priority (w) = ev_priority (sw); /* need to do it *now* */
525 w->rpid = pid; 771 w->rpid = pid;
526 w->rstatus = status; 772 w->rstatus = status;
527 event (EV_A_ (W)w, EV_CHILD); 773 ev_feed_event (EV_A_ (W)w, EV_CHILD);
528 } 774 }
529} 775}
530 776
777#ifndef WCONTINUED
778# define WCONTINUED 0
779#endif
780
531static void 781static void
532childcb (EV_P_ struct ev_signal *sw, int revents) 782childcb (EV_P_ ev_signal *sw, int revents)
533{ 783{
534 int pid, status; 784 int pid, status;
535 785
786 /* some systems define WCONTINUED but then fail to support it (linux 2.4) */
536 if (0 < (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED))) 787 if (0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED | WCONTINUED)))
537 { 788 if (!WCONTINUED
789 || errno != EINVAL
790 || 0 >= (pid = waitpid (-1, &status, WNOHANG | WUNTRACED)))
791 return;
792
538 /* make sure we are called again until all childs have been reaped */ 793 /* make sure we are called again until all childs have been reaped */
794 /* we need to do it this way so that the callback gets called before we continue */
539 event (EV_A_ (W)sw, EV_SIGNAL); 795 ev_feed_event (EV_A_ (W)sw, EV_SIGNAL);
540 796
541 child_reap (EV_A_ sw, pid, pid, status); 797 child_reap (EV_A_ sw, pid, pid, status);
798 if (EV_PID_HASHSIZE > 1)
542 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but event catches that */ 799 child_reap (EV_A_ sw, 0, pid, status); /* this might trigger a watcher twice, but feed_event catches that */
543 }
544} 800}
545 801
546#endif 802#endif
547 803
548/*****************************************************************************/ 804/*****************************************************************************/
549 805
806#if EV_USE_PORT
807# include "ev_port.c"
808#endif
550#if EV_USE_KQUEUE 809#if EV_USE_KQUEUE
551# include "ev_kqueue.c" 810# include "ev_kqueue.c"
552#endif 811#endif
553#if EV_USE_EPOLL 812#if EV_USE_EPOLL
554# include "ev_epoll.c" 813# include "ev_epoll.c"
571{ 830{
572 return EV_VERSION_MINOR; 831 return EV_VERSION_MINOR;
573} 832}
574 833
575/* return true if we are running with elevated privileges and should ignore env variables */ 834/* return true if we are running with elevated privileges and should ignore env variables */
576static int 835int inline_size
577enable_secure (void) 836enable_secure (void)
578{ 837{
579#ifdef WIN32 838#ifdef _WIN32
580 return 0; 839 return 0;
581#else 840#else
582 return getuid () != geteuid () 841 return getuid () != geteuid ()
583 || getgid () != getegid (); 842 || getgid () != getegid ();
584#endif 843#endif
585} 844}
586 845
587int 846unsigned int
588ev_method (EV_P) 847ev_supported_backends (void)
589{ 848{
590 return method; 849 unsigned int flags = 0;
591}
592 850
593static void 851 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
594loop_init (EV_P_ int methods) 852 if (EV_USE_KQUEUE) flags |= EVBACKEND_KQUEUE;
853 if (EV_USE_EPOLL ) flags |= EVBACKEND_EPOLL;
854 if (EV_USE_POLL ) flags |= EVBACKEND_POLL;
855 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
856
857 return flags;
858}
859
860unsigned int
861ev_recommended_backends (void)
595{ 862{
596 if (!method) 863 unsigned int flags = ev_supported_backends ();
864
865#ifndef __NetBSD__
866 /* kqueue is borked on everything but netbsd apparently */
867 /* it usually doesn't work correctly on anything but sockets and pipes */
868 flags &= ~EVBACKEND_KQUEUE;
869#endif
870#ifdef __APPLE__
871 // flags &= ~EVBACKEND_KQUEUE; for documentation
872 flags &= ~EVBACKEND_POLL;
873#endif
874
875 return flags;
876}
877
878unsigned int
879ev_embeddable_backends (void)
880{
881 return EVBACKEND_EPOLL
882 | EVBACKEND_KQUEUE
883 | EVBACKEND_PORT;
884}
885
886unsigned int
887ev_backend (EV_P)
888{
889 return backend;
890}
891
892static void noinline
893loop_init (EV_P_ unsigned int flags)
894{
895 if (!backend)
597 { 896 {
598#if EV_USE_MONOTONIC 897#if EV_USE_MONOTONIC
599 { 898 {
600 struct timespec ts; 899 struct timespec ts;
601 if (!clock_gettime (CLOCK_MONOTONIC, &ts)) 900 if (!clock_gettime (CLOCK_MONOTONIC, &ts))
602 have_monotonic = 1; 901 have_monotonic = 1;
603 } 902 }
604#endif 903#endif
605 904
606 rt_now = ev_time (); 905 ev_rt_now = ev_time ();
607 mn_now = get_clock (); 906 mn_now = get_clock ();
608 now_floor = mn_now; 907 now_floor = mn_now;
609 rtmn_diff = rt_now - mn_now; 908 rtmn_diff = ev_rt_now - mn_now;
610 909
611 if (methods == EVMETHOD_AUTO) 910 if (!(flags & EVFLAG_NOENV)
612 if (!enable_secure () && getenv ("LIBEV_METHODS")) 911 && !enable_secure ()
912 && getenv ("LIBEV_FLAGS"))
613 methods = atoi (getenv ("LIBEV_METHODS")); 913 flags = atoi (getenv ("LIBEV_FLAGS"));
614 else
615 methods = EVMETHOD_ANY;
616 914
617 method = 0; 915 if (!(flags & 0x0000ffffUL))
916 flags |= ev_recommended_backends ();
917
918 backend = 0;
919 backend_fd = -1;
618#if EV_USE_WIN32 920#if EV_USE_INOTIFY
619 if (!method && (methods & EVMETHOD_WIN32 )) method = win32_init (EV_A_ methods); 921 fs_fd = -2;
922#endif
923
924#if EV_USE_PORT
925 if (!backend && (flags & EVBACKEND_PORT )) backend = port_init (EV_A_ flags);
620#endif 926#endif
621#if EV_USE_KQUEUE 927#if EV_USE_KQUEUE
622 if (!method && (methods & EVMETHOD_KQUEUE)) method = kqueue_init (EV_A_ methods); 928 if (!backend && (flags & EVBACKEND_KQUEUE)) backend = kqueue_init (EV_A_ flags);
623#endif 929#endif
624#if EV_USE_EPOLL 930#if EV_USE_EPOLL
625 if (!method && (methods & EVMETHOD_EPOLL )) method = epoll_init (EV_A_ methods); 931 if (!backend && (flags & EVBACKEND_EPOLL )) backend = epoll_init (EV_A_ flags);
626#endif 932#endif
627#if EV_USE_POLL 933#if EV_USE_POLL
628 if (!method && (methods & EVMETHOD_POLL )) method = poll_init (EV_A_ methods); 934 if (!backend && (flags & EVBACKEND_POLL )) backend = poll_init (EV_A_ flags);
629#endif 935#endif
630#if EV_USE_SELECT 936#if EV_USE_SELECT
631 if (!method && (methods & EVMETHOD_SELECT)) method = select_init (EV_A_ methods); 937 if (!backend && (flags & EVBACKEND_SELECT)) backend = select_init (EV_A_ flags);
632#endif 938#endif
633 }
634}
635 939
636void 940 ev_init (&sigev, sigcb);
941 ev_set_priority (&sigev, EV_MAXPRI);
942 }
943}
944
945static void noinline
637loop_destroy (EV_P) 946loop_destroy (EV_P)
638{ 947{
948 int i;
949
639#if EV_USE_WIN32 950#if EV_USE_INOTIFY
640 if (method == EVMETHOD_WIN32 ) win32_destroy (EV_A); 951 if (fs_fd >= 0)
952 close (fs_fd);
953#endif
954
955 if (backend_fd >= 0)
956 close (backend_fd);
957
958#if EV_USE_PORT
959 if (backend == EVBACKEND_PORT ) port_destroy (EV_A);
641#endif 960#endif
642#if EV_USE_KQUEUE 961#if EV_USE_KQUEUE
643 if (method == EVMETHOD_KQUEUE) kqueue_destroy (EV_A); 962 if (backend == EVBACKEND_KQUEUE) kqueue_destroy (EV_A);
644#endif 963#endif
645#if EV_USE_EPOLL 964#if EV_USE_EPOLL
646 if (method == EVMETHOD_EPOLL ) epoll_destroy (EV_A); 965 if (backend == EVBACKEND_EPOLL ) epoll_destroy (EV_A);
647#endif 966#endif
648#if EV_USE_POLL 967#if EV_USE_POLL
649 if (method == EVMETHOD_POLL ) poll_destroy (EV_A); 968 if (backend == EVBACKEND_POLL ) poll_destroy (EV_A);
650#endif 969#endif
651#if EV_USE_SELECT 970#if EV_USE_SELECT
652 if (method == EVMETHOD_SELECT) select_destroy (EV_A); 971 if (backend == EVBACKEND_SELECT) select_destroy (EV_A);
653#endif 972#endif
654 973
655 method = 0; 974 for (i = NUMPRI; i--; )
656 /*TODO*/ 975 array_free (pending, [i]);
657}
658 976
659void 977 /* have to use the microsoft-never-gets-it-right macro */
978 array_free (fdchange, EMPTY0);
979 array_free (timer, EMPTY0);
980#if EV_PERIODIC_ENABLE
981 array_free (periodic, EMPTY0);
982#endif
983 array_free (idle, EMPTY0);
984 array_free (prepare, EMPTY0);
985 array_free (check, EMPTY0);
986
987 backend = 0;
988}
989
990void inline_size
660loop_fork (EV_P) 991loop_fork (EV_P)
661{ 992{
662 /*TODO*/ 993#if EV_USE_PORT
994 if (backend == EVBACKEND_PORT ) port_fork (EV_A);
995#endif
996#if EV_USE_KQUEUE
997 if (backend == EVBACKEND_KQUEUE) kqueue_fork (EV_A);
998#endif
663#if EV_USE_EPOLL 999#if EV_USE_EPOLL
664 if (method == EVMETHOD_EPOLL ) epoll_fork (EV_A); 1000 if (backend == EVBACKEND_EPOLL ) epoll_fork (EV_A);
665#endif 1001#endif
666#if EV_USE_KQUEUE 1002
667 if (method == EVMETHOD_KQUEUE) kqueue_fork (EV_A); 1003 if (ev_is_active (&sigev))
668#endif 1004 {
1005 /* default loop */
1006
1007 ev_ref (EV_A);
1008 ev_io_stop (EV_A_ &sigev);
1009 close (sigpipe [0]);
1010 close (sigpipe [1]);
1011
1012 while (pipe (sigpipe))
1013 syserr ("(libev) error creating pipe");
1014
1015 siginit (EV_A);
1016 }
1017
1018 postfork = 0;
669} 1019}
670 1020
671#if EV_MULTIPLICITY 1021#if EV_MULTIPLICITY
672struct ev_loop * 1022struct ev_loop *
673ev_loop_new (int methods) 1023ev_loop_new (unsigned int flags)
674{ 1024{
675 struct ev_loop *loop = (struct ev_loop *)calloc (1, sizeof (struct ev_loop)); 1025 struct ev_loop *loop = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
676 1026
1027 memset (loop, 0, sizeof (struct ev_loop));
1028
677 loop_init (EV_A_ methods); 1029 loop_init (EV_A_ flags);
678 1030
679 if (ev_method (EV_A)) 1031 if (ev_backend (EV_A))
680 return loop; 1032 return loop;
681 1033
682 return 0; 1034 return 0;
683} 1035}
684 1036
685void 1037void
686ev_loop_destroy (EV_P) 1038ev_loop_destroy (EV_P)
687{ 1039{
688 loop_destroy (EV_A); 1040 loop_destroy (EV_A);
689 free (loop); 1041 ev_free (loop);
690} 1042}
691 1043
692void 1044void
693ev_loop_fork (EV_P) 1045ev_loop_fork (EV_P)
694{ 1046{
695 loop_fork (EV_A); 1047 postfork = 1;
696} 1048}
697 1049
698#endif 1050#endif
699 1051
700#if EV_MULTIPLICITY 1052#if EV_MULTIPLICITY
701struct ev_loop default_loop_struct;
702static struct ev_loop *default_loop;
703
704struct ev_loop * 1053struct ev_loop *
1054ev_default_loop_init (unsigned int flags)
705#else 1055#else
706static int default_loop;
707
708int 1056int
1057ev_default_loop (unsigned int flags)
709#endif 1058#endif
710ev_default_loop (int methods)
711{ 1059{
712 if (sigpipe [0] == sigpipe [1]) 1060 if (sigpipe [0] == sigpipe [1])
713 if (pipe (sigpipe)) 1061 if (pipe (sigpipe))
714 return 0; 1062 return 0;
715 1063
716 if (!default_loop) 1064 if (!ev_default_loop_ptr)
717 { 1065 {
718#if EV_MULTIPLICITY 1066#if EV_MULTIPLICITY
719 struct ev_loop *loop = default_loop = &default_loop_struct; 1067 struct ev_loop *loop = ev_default_loop_ptr = &default_loop_struct;
720#else 1068#else
721 default_loop = 1; 1069 ev_default_loop_ptr = 1;
722#endif 1070#endif
723 1071
724 loop_init (EV_A_ methods); 1072 loop_init (EV_A_ flags);
725 1073
726 if (ev_method (EV_A)) 1074 if (ev_backend (EV_A))
727 { 1075 {
728 ev_watcher_init (&sigev, sigcb);
729 ev_set_priority (&sigev, EV_MAXPRI);
730 siginit (EV_A); 1076 siginit (EV_A);
731 1077
732#ifndef WIN32 1078#ifndef _WIN32
733 ev_signal_init (&childev, childcb, SIGCHLD); 1079 ev_signal_init (&childev, childcb, SIGCHLD);
734 ev_set_priority (&childev, EV_MAXPRI); 1080 ev_set_priority (&childev, EV_MAXPRI);
735 ev_signal_start (EV_A_ &childev); 1081 ev_signal_start (EV_A_ &childev);
736 ev_unref (EV_A); /* child watcher should not keep loop alive */ 1082 ev_unref (EV_A); /* child watcher should not keep loop alive */
737#endif 1083#endif
738 } 1084 }
739 else 1085 else
740 default_loop = 0; 1086 ev_default_loop_ptr = 0;
741 } 1087 }
742 1088
743 return default_loop; 1089 return ev_default_loop_ptr;
744} 1090}
745 1091
746void 1092void
747ev_default_destroy (void) 1093ev_default_destroy (void)
748{ 1094{
749#if EV_MULTIPLICITY 1095#if EV_MULTIPLICITY
750 struct ev_loop *loop = default_loop; 1096 struct ev_loop *loop = ev_default_loop_ptr;
751#endif 1097#endif
752 1098
1099#ifndef _WIN32
753 ev_ref (EV_A); /* child watcher */ 1100 ev_ref (EV_A); /* child watcher */
754 ev_signal_stop (EV_A_ &childev); 1101 ev_signal_stop (EV_A_ &childev);
1102#endif
755 1103
756 ev_ref (EV_A); /* signal watcher */ 1104 ev_ref (EV_A); /* signal watcher */
757 ev_io_stop (EV_A_ &sigev); 1105 ev_io_stop (EV_A_ &sigev);
758 1106
759 close (sigpipe [0]); sigpipe [0] = 0; 1107 close (sigpipe [0]); sigpipe [0] = 0;
764 1112
765void 1113void
766ev_default_fork (void) 1114ev_default_fork (void)
767{ 1115{
768#if EV_MULTIPLICITY 1116#if EV_MULTIPLICITY
769 struct ev_loop *loop = default_loop; 1117 struct ev_loop *loop = ev_default_loop_ptr;
770#endif 1118#endif
771 1119
772 loop_fork (EV_A); 1120 if (backend)
773 1121 postfork = 1;
774 ev_io_stop (EV_A_ &sigev);
775 close (sigpipe [0]);
776 close (sigpipe [1]);
777 pipe (sigpipe);
778
779 ev_ref (EV_A); /* signal watcher */
780 siginit (EV_A);
781} 1122}
782 1123
783/*****************************************************************************/ 1124/*****************************************************************************/
784 1125
785static void 1126int inline_size
1127any_pending (EV_P)
1128{
1129 int pri;
1130
1131 for (pri = NUMPRI; pri--; )
1132 if (pendingcnt [pri])
1133 return 1;
1134
1135 return 0;
1136}
1137
1138void inline_speed
786call_pending (EV_P) 1139call_pending (EV_P)
787{ 1140{
788 int pri; 1141 int pri;
789 1142
790 for (pri = NUMPRI; pri--; ) 1143 for (pri = NUMPRI; pri--; )
791 while (pendingcnt [pri]) 1144 while (pendingcnt [pri])
792 { 1145 {
793 ANPENDING *p = pendings [pri] + --pendingcnt [pri]; 1146 ANPENDING *p = pendings [pri] + --pendingcnt [pri];
794 1147
795 if (p->w) 1148 if (expect_true (p->w))
796 { 1149 {
1150 /*assert (("non-pending watcher on pending list", p->w->pending));*/
1151
797 p->w->pending = 0; 1152 p->w->pending = 0;
798 1153 EV_CB_INVOKE (p->w, p->events);
799 (*(void (**)(EV_P_ W, int))&p->w->cb) (EV_A_ p->w, p->events);
800 } 1154 }
801 } 1155 }
802} 1156}
803 1157
804static void 1158void inline_size
805timers_reify (EV_P) 1159timers_reify (EV_P)
806{ 1160{
807 while (timercnt && ((WT)timers [0])->at <= mn_now) 1161 while (timercnt && ((WT)timers [0])->at <= mn_now)
808 { 1162 {
809 struct ev_timer *w = timers [0]; 1163 ev_timer *w = timers [0];
810 1164
811 assert (("inactive timer on timer heap detected", ev_is_active (w))); 1165 /*assert (("inactive timer on timer heap detected", ev_is_active (w)));*/
812 1166
813 /* first reschedule or stop timer */ 1167 /* first reschedule or stop timer */
814 if (w->repeat) 1168 if (w->repeat)
815 { 1169 {
816 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.)); 1170 assert (("negative ev_timer repeat value found while processing timers", w->repeat > 0.));
1171
817 ((WT)w)->at = mn_now + w->repeat; 1172 ((WT)w)->at += w->repeat;
1173 if (((WT)w)->at < mn_now)
1174 ((WT)w)->at = mn_now;
1175
818 downheap ((WT *)timers, timercnt, 0); 1176 downheap ((WT *)timers, timercnt, 0);
819 } 1177 }
820 else 1178 else
821 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */ 1179 ev_timer_stop (EV_A_ w); /* nonrepeating: stop timer */
822 1180
823 event (EV_A_ (W)w, EV_TIMEOUT); 1181 ev_feed_event (EV_A_ (W)w, EV_TIMEOUT);
824 } 1182 }
825} 1183}
826 1184
827static void 1185#if EV_PERIODIC_ENABLE
1186void inline_size
828periodics_reify (EV_P) 1187periodics_reify (EV_P)
829{ 1188{
830 while (periodiccnt && ((WT)periodics [0])->at <= rt_now) 1189 while (periodiccnt && ((WT)periodics [0])->at <= ev_rt_now)
831 { 1190 {
832 struct ev_periodic *w = periodics [0]; 1191 ev_periodic *w = periodics [0];
833 1192
834 assert (("inactive timer on periodic heap detected", ev_is_active (w))); 1193 /*assert (("inactive timer on periodic heap detected", ev_is_active (w)));*/
835 1194
836 /* first reschedule or stop timer */ 1195 /* first reschedule or stop timer */
837 if (w->interval) 1196 if (w->reschedule_cb)
838 { 1197 {
1198 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now + 0.0001);
1199 assert (("ev_periodic reschedule callback returned time in the past", ((WT)w)->at > ev_rt_now));
1200 downheap ((WT *)periodics, periodiccnt, 0);
1201 }
1202 else if (w->interval)
1203 {
839 ((WT)w)->at += floor ((rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval; 1204 ((WT)w)->at += floor ((ev_rt_now - ((WT)w)->at) / w->interval + 1.) * w->interval;
840 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > rt_now)); 1205 assert (("ev_periodic timeout in the past detected while processing timers, negative interval?", ((WT)w)->at > ev_rt_now));
841 downheap ((WT *)periodics, periodiccnt, 0); 1206 downheap ((WT *)periodics, periodiccnt, 0);
842 } 1207 }
843 else 1208 else
844 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 1209 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
845 1210
846 event (EV_A_ (W)w, EV_PERIODIC); 1211 ev_feed_event (EV_A_ (W)w, EV_PERIODIC);
847 } 1212 }
848} 1213}
849 1214
850static void 1215static void noinline
851periodics_reschedule (EV_P) 1216periodics_reschedule (EV_P)
852{ 1217{
853 int i; 1218 int i;
854 1219
855 /* adjust periodics after time jump */ 1220 /* adjust periodics after time jump */
856 for (i = 0; i < periodiccnt; ++i) 1221 for (i = 0; i < periodiccnt; ++i)
857 { 1222 {
858 struct ev_periodic *w = periodics [i]; 1223 ev_periodic *w = periodics [i];
859 1224
1225 if (w->reschedule_cb)
1226 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
860 if (w->interval) 1227 else if (w->interval)
861 {
862 ev_tstamp diff = ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1228 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
863
864 if (fabs (diff) >= 1e-4)
865 {
866 ev_periodic_stop (EV_A_ w);
867 ev_periodic_start (EV_A_ w);
868
869 i = 0; /* restart loop, inefficient, but time jumps should be rare */
870 }
871 }
872 } 1229 }
873}
874 1230
875inline int 1231 /* now rebuild the heap */
1232 for (i = periodiccnt >> 1; i--; )
1233 downheap ((WT *)periodics, periodiccnt, i);
1234}
1235#endif
1236
1237int inline_size
876time_update_monotonic (EV_P) 1238time_update_monotonic (EV_P)
877{ 1239{
878 mn_now = get_clock (); 1240 mn_now = get_clock ();
879 1241
880 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5)) 1242 if (expect_true (mn_now - now_floor < MIN_TIMEJUMP * .5))
881 { 1243 {
882 rt_now = rtmn_diff + mn_now; 1244 ev_rt_now = rtmn_diff + mn_now;
883 return 0; 1245 return 0;
884 } 1246 }
885 else 1247 else
886 { 1248 {
887 now_floor = mn_now; 1249 now_floor = mn_now;
888 rt_now = ev_time (); 1250 ev_rt_now = ev_time ();
889 return 1; 1251 return 1;
890 } 1252 }
891} 1253}
892 1254
893static void 1255void inline_size
894time_update (EV_P) 1256time_update (EV_P)
895{ 1257{
896 int i; 1258 int i;
897 1259
898#if EV_USE_MONOTONIC 1260#if EV_USE_MONOTONIC
900 { 1262 {
901 if (time_update_monotonic (EV_A)) 1263 if (time_update_monotonic (EV_A))
902 { 1264 {
903 ev_tstamp odiff = rtmn_diff; 1265 ev_tstamp odiff = rtmn_diff;
904 1266
905 for (i = 4; --i; ) /* loop a few times, before making important decisions */ 1267 /* loop a few times, before making important decisions.
1268 * on the choice of "4": one iteration isn't enough,
1269 * in case we get preempted during the calls to
1270 * ev_time and get_clock. a second call is almost guarenteed
1271 * to succeed in that case, though. and looping a few more times
1272 * doesn't hurt either as we only do this on time-jumps or
1273 * in the unlikely event of getting preempted here.
1274 */
1275 for (i = 4; --i; )
906 { 1276 {
907 rtmn_diff = rt_now - mn_now; 1277 rtmn_diff = ev_rt_now - mn_now;
908 1278
909 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP) 1279 if (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)
910 return; /* all is well */ 1280 return; /* all is well */
911 1281
912 rt_now = ev_time (); 1282 ev_rt_now = ev_time ();
913 mn_now = get_clock (); 1283 mn_now = get_clock ();
914 now_floor = mn_now; 1284 now_floor = mn_now;
915 } 1285 }
916 1286
1287# if EV_PERIODIC_ENABLE
917 periodics_reschedule (EV_A); 1288 periodics_reschedule (EV_A);
1289# endif
918 /* no timer adjustment, as the monotonic clock doesn't jump */ 1290 /* no timer adjustment, as the monotonic clock doesn't jump */
919 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */ 1291 /* timers_reschedule (EV_A_ rtmn_diff - odiff) */
920 } 1292 }
921 } 1293 }
922 else 1294 else
923#endif 1295#endif
924 { 1296 {
925 rt_now = ev_time (); 1297 ev_rt_now = ev_time ();
926 1298
927 if (expect_false (mn_now > rt_now || mn_now < rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP)) 1299 if (expect_false (mn_now > ev_rt_now || mn_now < ev_rt_now - MAX_BLOCKTIME - MIN_TIMEJUMP))
928 { 1300 {
1301#if EV_PERIODIC_ENABLE
929 periodics_reschedule (EV_A); 1302 periodics_reschedule (EV_A);
1303#endif
930 1304
931 /* adjust timers. this is easy, as the offset is the same for all */ 1305 /* adjust timers. this is easy, as the offset is the same for all */
932 for (i = 0; i < timercnt; ++i) 1306 for (i = 0; i < timercnt; ++i)
933 ((WT)timers [i])->at += rt_now - mn_now; 1307 ((WT)timers [i])->at += ev_rt_now - mn_now;
934 } 1308 }
935 1309
936 mn_now = rt_now; 1310 mn_now = ev_rt_now;
937 } 1311 }
938} 1312}
939 1313
940void 1314void
941ev_ref (EV_P) 1315ev_ref (EV_P)
952static int loop_done; 1326static int loop_done;
953 1327
954void 1328void
955ev_loop (EV_P_ int flags) 1329ev_loop (EV_P_ int flags)
956{ 1330{
957 double block;
958 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK) ? 1 : 0; 1331 loop_done = flags & (EVLOOP_ONESHOT | EVLOOP_NONBLOCK)
1332 ? EVUNLOOP_ONE
1333 : EVUNLOOP_CANCEL;
959 1334
960 do 1335 while (activecnt)
961 { 1336 {
1337 /* we might have forked, so reify kernel state if necessary */
1338 #if EV_FORK_ENABLE
1339 if (expect_false (postfork))
1340 if (forkcnt)
1341 {
1342 queue_events (EV_A_ (W *)forks, forkcnt, EV_FORK);
1343 call_pending (EV_A);
1344 }
1345 #endif
1346
962 /* queue check watchers (and execute them) */ 1347 /* queue check watchers (and execute them) */
963 if (expect_false (preparecnt)) 1348 if (expect_false (preparecnt))
964 { 1349 {
965 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE); 1350 queue_events (EV_A_ (W *)prepares, preparecnt, EV_PREPARE);
966 call_pending (EV_A); 1351 call_pending (EV_A);
967 } 1352 }
968 1353
1354 /* we might have forked, so reify kernel state if necessary */
1355 if (expect_false (postfork))
1356 loop_fork (EV_A);
1357
969 /* update fd-related kernel structures */ 1358 /* update fd-related kernel structures */
970 fd_reify (EV_A); 1359 fd_reify (EV_A);
971 1360
972 /* calculate blocking time */ 1361 /* calculate blocking time */
1362 {
1363 double block;
973 1364
974 /* we only need this for !monotonic clockor timers, but as we basically 1365 if (flags & EVLOOP_NONBLOCK || idlecnt)
975 always have timers, we just calculate it always */ 1366 block = 0.; /* do not block at all */
1367 else
1368 {
1369 /* update time to cancel out callback processing overhead */
976#if EV_USE_MONOTONIC 1370#if EV_USE_MONOTONIC
977 if (expect_true (have_monotonic)) 1371 if (expect_true (have_monotonic))
978 time_update_monotonic (EV_A); 1372 time_update_monotonic (EV_A);
979 else 1373 else
980#endif 1374#endif
981 { 1375 {
982 rt_now = ev_time (); 1376 ev_rt_now = ev_time ();
983 mn_now = rt_now; 1377 mn_now = ev_rt_now;
984 } 1378 }
985 1379
986 if (flags & EVLOOP_NONBLOCK || idlecnt)
987 block = 0.;
988 else
989 {
990 block = MAX_BLOCKTIME; 1380 block = MAX_BLOCKTIME;
991 1381
992 if (timercnt) 1382 if (timercnt)
993 { 1383 {
994 ev_tstamp to = ((WT)timers [0])->at - mn_now + method_fudge; 1384 ev_tstamp to = ((WT)timers [0])->at - mn_now + backend_fudge;
995 if (block > to) block = to; 1385 if (block > to) block = to;
996 } 1386 }
997 1387
1388#if EV_PERIODIC_ENABLE
998 if (periodiccnt) 1389 if (periodiccnt)
999 { 1390 {
1000 ev_tstamp to = ((WT)periodics [0])->at - rt_now + method_fudge; 1391 ev_tstamp to = ((WT)periodics [0])->at - ev_rt_now + backend_fudge;
1001 if (block > to) block = to; 1392 if (block > to) block = to;
1002 } 1393 }
1394#endif
1003 1395
1004 if (block < 0.) block = 0.; 1396 if (expect_false (block < 0.)) block = 0.;
1005 } 1397 }
1006 1398
1007 method_poll (EV_A_ block); 1399 backend_poll (EV_A_ block);
1400 }
1008 1401
1009 /* update rt_now, do magic */ 1402 /* update ev_rt_now, do magic */
1010 time_update (EV_A); 1403 time_update (EV_A);
1011 1404
1012 /* queue pending timers and reschedule them */ 1405 /* queue pending timers and reschedule them */
1013 timers_reify (EV_A); /* relative timers called last */ 1406 timers_reify (EV_A); /* relative timers called last */
1407#if EV_PERIODIC_ENABLE
1014 periodics_reify (EV_A); /* absolute timers called first */ 1408 periodics_reify (EV_A); /* absolute timers called first */
1409#endif
1015 1410
1016 /* queue idle watchers unless io or timers are pending */ 1411 /* queue idle watchers unless other events are pending */
1017 if (!pendingcnt) 1412 if (idlecnt && !any_pending (EV_A))
1018 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE); 1413 queue_events (EV_A_ (W *)idles, idlecnt, EV_IDLE);
1019 1414
1020 /* queue check watchers, to be executed first */ 1415 /* queue check watchers, to be executed first */
1021 if (checkcnt) 1416 if (expect_false (checkcnt))
1022 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK); 1417 queue_events (EV_A_ (W *)checks, checkcnt, EV_CHECK);
1023 1418
1024 call_pending (EV_A); 1419 call_pending (EV_A);
1025 }
1026 while (activecnt && !loop_done);
1027 1420
1028 if (loop_done != 2) 1421 if (expect_false (loop_done))
1029 loop_done = 0; 1422 break;
1423 }
1424
1425 if (loop_done == EVUNLOOP_ONE)
1426 loop_done = EVUNLOOP_CANCEL;
1030} 1427}
1031 1428
1032void 1429void
1033ev_unloop (EV_P_ int how) 1430ev_unloop (EV_P_ int how)
1034{ 1431{
1035 loop_done = how; 1432 loop_done = how;
1036} 1433}
1037 1434
1038/*****************************************************************************/ 1435/*****************************************************************************/
1039 1436
1040inline void 1437void inline_size
1041wlist_add (WL *head, WL elem) 1438wlist_add (WL *head, WL elem)
1042{ 1439{
1043 elem->next = *head; 1440 elem->next = *head;
1044 *head = elem; 1441 *head = elem;
1045} 1442}
1046 1443
1047inline void 1444void inline_size
1048wlist_del (WL *head, WL elem) 1445wlist_del (WL *head, WL elem)
1049{ 1446{
1050 while (*head) 1447 while (*head)
1051 { 1448 {
1052 if (*head == elem) 1449 if (*head == elem)
1057 1454
1058 head = &(*head)->next; 1455 head = &(*head)->next;
1059 } 1456 }
1060} 1457}
1061 1458
1062inline void 1459void inline_speed
1063ev_clear_pending (EV_P_ W w) 1460ev_clear_pending (EV_P_ W w)
1064{ 1461{
1065 if (w->pending) 1462 if (w->pending)
1066 { 1463 {
1067 pendings [ABSPRI (w)][w->pending - 1].w = 0; 1464 pendings [ABSPRI (w)][w->pending - 1].w = 0;
1068 w->pending = 0; 1465 w->pending = 0;
1069 } 1466 }
1070} 1467}
1071 1468
1072inline void 1469void inline_speed
1073ev_start (EV_P_ W w, int active) 1470ev_start (EV_P_ W w, int active)
1074{ 1471{
1075 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI; 1472 if (w->priority < EV_MINPRI) w->priority = EV_MINPRI;
1076 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI; 1473 if (w->priority > EV_MAXPRI) w->priority = EV_MAXPRI;
1077 1474
1078 w->active = active; 1475 w->active = active;
1079 ev_ref (EV_A); 1476 ev_ref (EV_A);
1080} 1477}
1081 1478
1082inline void 1479void inline_size
1083ev_stop (EV_P_ W w) 1480ev_stop (EV_P_ W w)
1084{ 1481{
1085 ev_unref (EV_A); 1482 ev_unref (EV_A);
1086 w->active = 0; 1483 w->active = 0;
1087} 1484}
1088 1485
1089/*****************************************************************************/ 1486/*****************************************************************************/
1090 1487
1091void 1488void
1092ev_io_start (EV_P_ struct ev_io *w) 1489ev_io_start (EV_P_ ev_io *w)
1093{ 1490{
1094 int fd = w->fd; 1491 int fd = w->fd;
1095 1492
1096 if (ev_is_active (w)) 1493 if (expect_false (ev_is_active (w)))
1097 return; 1494 return;
1098 1495
1099 assert (("ev_io_start called with negative fd", fd >= 0)); 1496 assert (("ev_io_start called with negative fd", fd >= 0));
1100 1497
1101 ev_start (EV_A_ (W)w, 1); 1498 ev_start (EV_A_ (W)w, 1);
1102 array_needsize (anfds, anfdmax, fd + 1, anfds_init); 1499 array_needsize (ANFD, anfds, anfdmax, fd + 1, anfds_init);
1103 wlist_add ((WL *)&anfds[fd].head, (WL)w); 1500 wlist_add ((WL *)&anfds[fd].head, (WL)w);
1104 1501
1105 fd_change (EV_A_ fd); 1502 fd_change (EV_A_ fd);
1106} 1503}
1107 1504
1108void 1505void
1109ev_io_stop (EV_P_ struct ev_io *w) 1506ev_io_stop (EV_P_ ev_io *w)
1110{ 1507{
1111 ev_clear_pending (EV_A_ (W)w); 1508 ev_clear_pending (EV_A_ (W)w);
1112 if (!ev_is_active (w)) 1509 if (expect_false (!ev_is_active (w)))
1113 return; 1510 return;
1511
1512 assert (("ev_io_start called with illegal fd (must stay constant after start!)", w->fd >= 0 && w->fd < anfdmax));
1114 1513
1115 wlist_del ((WL *)&anfds[w->fd].head, (WL)w); 1514 wlist_del ((WL *)&anfds[w->fd].head, (WL)w);
1116 ev_stop (EV_A_ (W)w); 1515 ev_stop (EV_A_ (W)w);
1117 1516
1118 fd_change (EV_A_ w->fd); 1517 fd_change (EV_A_ w->fd);
1119} 1518}
1120 1519
1121void 1520void
1122ev_timer_start (EV_P_ struct ev_timer *w) 1521ev_timer_start (EV_P_ ev_timer *w)
1123{ 1522{
1124 if (ev_is_active (w)) 1523 if (expect_false (ev_is_active (w)))
1125 return; 1524 return;
1126 1525
1127 ((WT)w)->at += mn_now; 1526 ((WT)w)->at += mn_now;
1128 1527
1129 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.)); 1528 assert (("ev_timer_start called with negative timer repeat value", w->repeat >= 0.));
1130 1529
1131 ev_start (EV_A_ (W)w, ++timercnt); 1530 ev_start (EV_A_ (W)w, ++timercnt);
1132 array_needsize (timers, timermax, timercnt, ); 1531 array_needsize (ev_timer *, timers, timermax, timercnt, EMPTY2);
1133 timers [timercnt - 1] = w; 1532 timers [timercnt - 1] = w;
1134 upheap ((WT *)timers, timercnt - 1); 1533 upheap ((WT *)timers, timercnt - 1);
1135 1534
1535 /*assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));*/
1536}
1537
1538void
1539ev_timer_stop (EV_P_ ev_timer *w)
1540{
1541 ev_clear_pending (EV_A_ (W)w);
1542 if (expect_false (!ev_is_active (w)))
1543 return;
1544
1136 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1545 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w));
1137}
1138 1546
1139void 1547 {
1140ev_timer_stop (EV_P_ struct ev_timer *w) 1548 int active = ((W)w)->active;
1141{
1142 ev_clear_pending (EV_A_ (W)w);
1143 if (!ev_is_active (w))
1144 return;
1145 1549
1146 assert (("internal timer heap corruption", timers [((W)w)->active - 1] == w)); 1550 if (expect_true (--active < --timercnt))
1147
1148 if (((W)w)->active < timercnt--)
1149 { 1551 {
1150 timers [((W)w)->active - 1] = timers [timercnt]; 1552 timers [active] = timers [timercnt];
1151 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1553 adjustheap ((WT *)timers, timercnt, active);
1152 } 1554 }
1555 }
1153 1556
1154 ((WT)w)->at = w->repeat; 1557 ((WT)w)->at -= mn_now;
1155 1558
1156 ev_stop (EV_A_ (W)w); 1559 ev_stop (EV_A_ (W)w);
1157} 1560}
1158 1561
1159void 1562void
1160ev_timer_again (EV_P_ struct ev_timer *w) 1563ev_timer_again (EV_P_ ev_timer *w)
1161{ 1564{
1162 if (ev_is_active (w)) 1565 if (ev_is_active (w))
1163 { 1566 {
1164 if (w->repeat) 1567 if (w->repeat)
1165 { 1568 {
1166 ((WT)w)->at = mn_now + w->repeat; 1569 ((WT)w)->at = mn_now + w->repeat;
1167 downheap ((WT *)timers, timercnt, ((W)w)->active - 1); 1570 adjustheap ((WT *)timers, timercnt, ((W)w)->active - 1);
1168 } 1571 }
1169 else 1572 else
1170 ev_timer_stop (EV_A_ w); 1573 ev_timer_stop (EV_A_ w);
1171 } 1574 }
1172 else if (w->repeat) 1575 else if (w->repeat)
1576 {
1577 w->at = w->repeat;
1173 ev_timer_start (EV_A_ w); 1578 ev_timer_start (EV_A_ w);
1579 }
1174} 1580}
1175 1581
1582#if EV_PERIODIC_ENABLE
1176void 1583void
1177ev_periodic_start (EV_P_ struct ev_periodic *w) 1584ev_periodic_start (EV_P_ ev_periodic *w)
1178{ 1585{
1179 if (ev_is_active (w)) 1586 if (expect_false (ev_is_active (w)))
1180 return; 1587 return;
1181 1588
1589 if (w->reschedule_cb)
1590 ((WT)w)->at = w->reschedule_cb (w, ev_rt_now);
1591 else if (w->interval)
1592 {
1182 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.)); 1593 assert (("ev_periodic_start called with negative interval value", w->interval >= 0.));
1183
1184 /* this formula differs from the one in periodic_reify because we do not always round up */ 1594 /* this formula differs from the one in periodic_reify because we do not always round up */
1185 if (w->interval)
1186 ((WT)w)->at += ceil ((rt_now - ((WT)w)->at) / w->interval) * w->interval; 1595 ((WT)w)->at += ceil ((ev_rt_now - ((WT)w)->at) / w->interval) * w->interval;
1596 }
1187 1597
1188 ev_start (EV_A_ (W)w, ++periodiccnt); 1598 ev_start (EV_A_ (W)w, ++periodiccnt);
1189 array_needsize (periodics, periodicmax, periodiccnt, ); 1599 array_needsize (ev_periodic *, periodics, periodicmax, periodiccnt, EMPTY2);
1190 periodics [periodiccnt - 1] = w; 1600 periodics [periodiccnt - 1] = w;
1191 upheap ((WT *)periodics, periodiccnt - 1); 1601 upheap ((WT *)periodics, periodiccnt - 1);
1192 1602
1603 /*assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));*/
1604}
1605
1606void
1607ev_periodic_stop (EV_P_ ev_periodic *w)
1608{
1609 ev_clear_pending (EV_A_ (W)w);
1610 if (expect_false (!ev_is_active (w)))
1611 return;
1612
1193 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1613 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w));
1194}
1195 1614
1196void 1615 {
1197ev_periodic_stop (EV_P_ struct ev_periodic *w) 1616 int active = ((W)w)->active;
1198{
1199 ev_clear_pending (EV_A_ (W)w);
1200 if (!ev_is_active (w))
1201 return;
1202 1617
1203 assert (("internal periodic heap corruption", periodics [((W)w)->active - 1] == w)); 1618 if (expect_true (--active < --periodiccnt))
1204
1205 if (((W)w)->active < periodiccnt--)
1206 { 1619 {
1207 periodics [((W)w)->active - 1] = periodics [periodiccnt]; 1620 periodics [active] = periodics [periodiccnt];
1208 downheap ((WT *)periodics, periodiccnt, ((W)w)->active - 1); 1621 adjustheap ((WT *)periodics, periodiccnt, active);
1209 } 1622 }
1623 }
1210 1624
1211 ev_stop (EV_A_ (W)w); 1625 ev_stop (EV_A_ (W)w);
1212} 1626}
1213 1627
1214void 1628void
1215ev_idle_start (EV_P_ struct ev_idle *w) 1629ev_periodic_again (EV_P_ ev_periodic *w)
1216{ 1630{
1217 if (ev_is_active (w)) 1631 /* TODO: use adjustheap and recalculation */
1218 return;
1219
1220 ev_start (EV_A_ (W)w, ++idlecnt);
1221 array_needsize (idles, idlemax, idlecnt, );
1222 idles [idlecnt - 1] = w;
1223}
1224
1225void
1226ev_idle_stop (EV_P_ struct ev_idle *w)
1227{
1228 ev_clear_pending (EV_A_ (W)w);
1229 if (ev_is_active (w))
1230 return;
1231
1232 idles [((W)w)->active - 1] = idles [--idlecnt];
1233 ev_stop (EV_A_ (W)w); 1632 ev_periodic_stop (EV_A_ w);
1633 ev_periodic_start (EV_A_ w);
1234} 1634}
1235 1635#endif
1236void
1237ev_prepare_start (EV_P_ struct ev_prepare *w)
1238{
1239 if (ev_is_active (w))
1240 return;
1241
1242 ev_start (EV_A_ (W)w, ++preparecnt);
1243 array_needsize (prepares, preparemax, preparecnt, );
1244 prepares [preparecnt - 1] = w;
1245}
1246
1247void
1248ev_prepare_stop (EV_P_ struct ev_prepare *w)
1249{
1250 ev_clear_pending (EV_A_ (W)w);
1251 if (ev_is_active (w))
1252 return;
1253
1254 prepares [((W)w)->active - 1] = prepares [--preparecnt];
1255 ev_stop (EV_A_ (W)w);
1256}
1257
1258void
1259ev_check_start (EV_P_ struct ev_check *w)
1260{
1261 if (ev_is_active (w))
1262 return;
1263
1264 ev_start (EV_A_ (W)w, ++checkcnt);
1265 array_needsize (checks, checkmax, checkcnt, );
1266 checks [checkcnt - 1] = w;
1267}
1268
1269void
1270ev_check_stop (EV_P_ struct ev_check *w)
1271{
1272 ev_clear_pending (EV_A_ (W)w);
1273 if (ev_is_active (w))
1274 return;
1275
1276 checks [((W)w)->active - 1] = checks [--checkcnt];
1277 ev_stop (EV_A_ (W)w);
1278}
1279 1636
1280#ifndef SA_RESTART 1637#ifndef SA_RESTART
1281# define SA_RESTART 0 1638# define SA_RESTART 0
1282#endif 1639#endif
1283 1640
1284void 1641void
1285ev_signal_start (EV_P_ struct ev_signal *w) 1642ev_signal_start (EV_P_ ev_signal *w)
1286{ 1643{
1287#if EV_MULTIPLICITY 1644#if EV_MULTIPLICITY
1288 assert (("signal watchers are only supported in the default loop", loop == default_loop)); 1645 assert (("signal watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1289#endif 1646#endif
1290 if (ev_is_active (w)) 1647 if (expect_false (ev_is_active (w)))
1291 return; 1648 return;
1292 1649
1293 assert (("ev_signal_start called with illegal signal number", w->signum > 0)); 1650 assert (("ev_signal_start called with illegal signal number", w->signum > 0));
1294 1651
1295 ev_start (EV_A_ (W)w, 1); 1652 ev_start (EV_A_ (W)w, 1);
1296 array_needsize (signals, signalmax, w->signum, signals_init); 1653 array_needsize (ANSIG, signals, signalmax, w->signum, signals_init);
1297 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w); 1654 wlist_add ((WL *)&signals [w->signum - 1].head, (WL)w);
1298 1655
1299 if (!((WL)w)->next) 1656 if (!((WL)w)->next)
1300 { 1657 {
1658#if _WIN32
1659 signal (w->signum, sighandler);
1660#else
1301 struct sigaction sa; 1661 struct sigaction sa;
1302 sa.sa_handler = sighandler; 1662 sa.sa_handler = sighandler;
1303 sigfillset (&sa.sa_mask); 1663 sigfillset (&sa.sa_mask);
1304 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */ 1664 sa.sa_flags = SA_RESTART; /* if restarting works we save one iteration */
1305 sigaction (w->signum, &sa, 0); 1665 sigaction (w->signum, &sa, 0);
1666#endif
1306 } 1667 }
1307} 1668}
1308 1669
1309void 1670void
1310ev_signal_stop (EV_P_ struct ev_signal *w) 1671ev_signal_stop (EV_P_ ev_signal *w)
1311{ 1672{
1312 ev_clear_pending (EV_A_ (W)w); 1673 ev_clear_pending (EV_A_ (W)w);
1313 if (!ev_is_active (w)) 1674 if (expect_false (!ev_is_active (w)))
1314 return; 1675 return;
1315 1676
1316 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w); 1677 wlist_del ((WL *)&signals [w->signum - 1].head, (WL)w);
1317 ev_stop (EV_A_ (W)w); 1678 ev_stop (EV_A_ (W)w);
1318 1679
1319 if (!signals [w->signum - 1].head) 1680 if (!signals [w->signum - 1].head)
1320 signal (w->signum, SIG_DFL); 1681 signal (w->signum, SIG_DFL);
1321} 1682}
1322 1683
1323void 1684void
1324ev_child_start (EV_P_ struct ev_child *w) 1685ev_child_start (EV_P_ ev_child *w)
1325{ 1686{
1326#if EV_MULTIPLICITY 1687#if EV_MULTIPLICITY
1327 assert (("child watchers are only supported in the default loop", loop == default_loop)); 1688 assert (("child watchers are only supported in the default loop", loop == ev_default_loop_ptr));
1328#endif 1689#endif
1329 if (ev_is_active (w)) 1690 if (expect_false (ev_is_active (w)))
1330 return; 1691 return;
1331 1692
1332 ev_start (EV_A_ (W)w, 1); 1693 ev_start (EV_A_ (W)w, 1);
1333 wlist_add ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1694 wlist_add ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1334} 1695}
1335 1696
1336void 1697void
1337ev_child_stop (EV_P_ struct ev_child *w) 1698ev_child_stop (EV_P_ ev_child *w)
1338{ 1699{
1339 ev_clear_pending (EV_A_ (W)w); 1700 ev_clear_pending (EV_A_ (W)w);
1340 if (ev_is_active (w)) 1701 if (expect_false (!ev_is_active (w)))
1341 return; 1702 return;
1342 1703
1343 wlist_del ((WL *)&childs [w->pid & (PID_HASHSIZE - 1)], (WL)w); 1704 wlist_del ((WL *)&childs [w->pid & (EV_PID_HASHSIZE - 1)], (WL)w);
1344 ev_stop (EV_A_ (W)w); 1705 ev_stop (EV_A_ (W)w);
1345} 1706}
1346 1707
1708#if EV_STAT_ENABLE
1709
1710# ifdef _WIN32
1711# undef lstat
1712# define lstat(a,b) _stati64 (a,b)
1713# endif
1714
1715#define DEF_STAT_INTERVAL 5.0074891
1716#define MIN_STAT_INTERVAL 0.1074891
1717
1718void noinline stat_timer_cb (EV_P_ ev_timer *w_, int revents);
1719
1720#if EV_USE_INOTIFY
1721# define EV_INOTIFY_BUFSIZE 8192
1722
1723static void noinline
1724infy_add (EV_P_ ev_stat *w)
1725{
1726 w->wd = inotify_add_watch (fs_fd, w->path, IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY | IN_DONT_FOLLOW | IN_MASK_ADD);
1727
1728 if (w->wd < 0)
1729 {
1730 ev_timer_start (EV_A_ &w->timer); /* this is not race-free, so we still need to recheck periodically */
1731
1732 /* monitor some parent directory for speedup hints */
1733 if ((errno == ENOENT || errno == EACCES) && strlen (w->path) < 4096)
1734 {
1735 char path [4096];
1736 strcpy (path, w->path);
1737
1738 do
1739 {
1740 int mask = IN_MASK_ADD | IN_DELETE_SELF | IN_MOVE_SELF
1741 | (errno == EACCES ? IN_ATTRIB : IN_CREATE | IN_MOVED_TO);
1742
1743 char *pend = strrchr (path, '/');
1744
1745 if (!pend)
1746 break; /* whoops, no '/', complain to your admin */
1747
1748 *pend = 0;
1749 w->wd = inotify_add_watch (fs_fd, path, mask);
1750 }
1751 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
1752 }
1753 }
1754 else
1755 ev_timer_stop (EV_A_ &w->timer); /* we can watch this in a race-free way */
1756
1757 if (w->wd >= 0)
1758 wlist_add (&fs_hash [w->wd & (EV_INOTIFY_HASHSIZE - 1)].head, (WL)w);
1759}
1760
1761static void noinline
1762infy_del (EV_P_ ev_stat *w)
1763{
1764 int slot;
1765 int wd = w->wd;
1766
1767 if (wd < 0)
1768 return;
1769
1770 w->wd = -2;
1771 slot = wd & (EV_INOTIFY_HASHSIZE - 1);
1772 wlist_del (&fs_hash [slot].head, (WL)w);
1773
1774 /* remove this watcher, if others are watching it, they will rearm */
1775 inotify_rm_watch (fs_fd, wd);
1776}
1777
1778static void noinline
1779infy_wd (EV_P_ int slot, int wd, struct inotify_event *ev)
1780{
1781 if (slot < 0)
1782 /* overflow, need to check for all hahs slots */
1783 for (slot = 0; slot < EV_INOTIFY_HASHSIZE; ++slot)
1784 infy_wd (EV_A_ slot, wd, ev);
1785 else
1786 {
1787 WL w_;
1788
1789 for (w_ = fs_hash [slot & (EV_INOTIFY_HASHSIZE - 1)].head; w_; )
1790 {
1791 ev_stat *w = (ev_stat *)w_;
1792 w_ = w_->next; /* lets us remove this watcher and all before it */
1793
1794 if (w->wd == wd || wd == -1)
1795 {
1796 if (ev->mask & (IN_IGNORED | IN_UNMOUNT | IN_DELETE_SELF))
1797 {
1798 w->wd = -1;
1799 infy_add (EV_A_ w); /* re-add, no matter what */
1800 }
1801
1802 stat_timer_cb (EV_A_ &w->timer, 0);
1803 }
1804 }
1805 }
1806}
1807
1808static void
1809infy_cb (EV_P_ ev_io *w, int revents)
1810{
1811 char buf [EV_INOTIFY_BUFSIZE];
1812 struct inotify_event *ev = (struct inotify_event *)buf;
1813 int ofs;
1814 int len = read (fs_fd, buf, sizeof (buf));
1815
1816 for (ofs = 0; ofs < len; ofs += sizeof (struct inotify_event) + ev->len)
1817 infy_wd (EV_A_ ev->wd, ev->wd, ev);
1818}
1819
1820void inline_size
1821infy_init (EV_P)
1822{
1823 if (fs_fd != -2)
1824 return;
1825
1826 fs_fd = inotify_init ();
1827
1828 if (fs_fd >= 0)
1829 {
1830 ev_io_init (&fs_w, infy_cb, fs_fd, EV_READ);
1831 ev_set_priority (&fs_w, EV_MAXPRI);
1832 ev_io_start (EV_A_ &fs_w);
1833 }
1834}
1835
1836#endif
1837
1838void
1839ev_stat_stat (EV_P_ ev_stat *w)
1840{
1841 if (lstat (w->path, &w->attr) < 0)
1842 w->attr.st_nlink = 0;
1843 else if (!w->attr.st_nlink)
1844 w->attr.st_nlink = 1;
1845}
1846
1847void noinline
1848stat_timer_cb (EV_P_ ev_timer *w_, int revents)
1849{
1850 ev_stat *w = (ev_stat *)(((char *)w_) - offsetof (ev_stat, timer));
1851
1852 /* we copy this here each the time so that */
1853 /* prev has the old value when the callback gets invoked */
1854 w->prev = w->attr;
1855 ev_stat_stat (EV_A_ w);
1856
1857 if (memcmp (&w->prev, &w->attr, sizeof (ev_statdata)))
1858 {
1859 #if EV_USE_INOTIFY
1860 infy_del (EV_A_ w);
1861 infy_add (EV_A_ w);
1862 ev_stat_stat (EV_A_ w); /* avoid race... */
1863 #endif
1864
1865 ev_feed_event (EV_A_ w, EV_STAT);
1866 }
1867}
1868
1869void
1870ev_stat_start (EV_P_ ev_stat *w)
1871{
1872 if (expect_false (ev_is_active (w)))
1873 return;
1874
1875 /* since we use memcmp, we need to clear any padding data etc. */
1876 memset (&w->prev, 0, sizeof (ev_statdata));
1877 memset (&w->attr, 0, sizeof (ev_statdata));
1878
1879 ev_stat_stat (EV_A_ w);
1880
1881 if (w->interval < MIN_STAT_INTERVAL)
1882 w->interval = w->interval ? MIN_STAT_INTERVAL : DEF_STAT_INTERVAL;
1883
1884 ev_timer_init (&w->timer, stat_timer_cb, w->interval, w->interval);
1885 ev_set_priority (&w->timer, ev_priority (w));
1886
1887#if EV_USE_INOTIFY
1888 infy_init (EV_A);
1889
1890 if (fs_fd >= 0)
1891 infy_add (EV_A_ w);
1892 else
1893#endif
1894 ev_timer_start (EV_A_ &w->timer);
1895
1896 ev_start (EV_A_ (W)w, 1);
1897}
1898
1899void
1900ev_stat_stop (EV_P_ ev_stat *w)
1901{
1902 ev_clear_pending (EV_A_ (W)w);
1903 if (expect_false (!ev_is_active (w)))
1904 return;
1905
1906#if EV_USE_INOTIFY
1907 infy_del (EV_A_ w);
1908#endif
1909 ev_timer_stop (EV_A_ &w->timer);
1910
1911 ev_stop (EV_A_ (W)w);
1912}
1913#endif
1914
1915void
1916ev_idle_start (EV_P_ ev_idle *w)
1917{
1918 if (expect_false (ev_is_active (w)))
1919 return;
1920
1921 ev_start (EV_A_ (W)w, ++idlecnt);
1922 array_needsize (ev_idle *, idles, idlemax, idlecnt, EMPTY2);
1923 idles [idlecnt - 1] = w;
1924}
1925
1926void
1927ev_idle_stop (EV_P_ ev_idle *w)
1928{
1929 ev_clear_pending (EV_A_ (W)w);
1930 if (expect_false (!ev_is_active (w)))
1931 return;
1932
1933 {
1934 int active = ((W)w)->active;
1935 idles [active - 1] = idles [--idlecnt];
1936 ((W)idles [active - 1])->active = active;
1937 }
1938
1939 ev_stop (EV_A_ (W)w);
1940}
1941
1942void
1943ev_prepare_start (EV_P_ ev_prepare *w)
1944{
1945 if (expect_false (ev_is_active (w)))
1946 return;
1947
1948 ev_start (EV_A_ (W)w, ++preparecnt);
1949 array_needsize (ev_prepare *, prepares, preparemax, preparecnt, EMPTY2);
1950 prepares [preparecnt - 1] = w;
1951}
1952
1953void
1954ev_prepare_stop (EV_P_ ev_prepare *w)
1955{
1956 ev_clear_pending (EV_A_ (W)w);
1957 if (expect_false (!ev_is_active (w)))
1958 return;
1959
1960 {
1961 int active = ((W)w)->active;
1962 prepares [active - 1] = prepares [--preparecnt];
1963 ((W)prepares [active - 1])->active = active;
1964 }
1965
1966 ev_stop (EV_A_ (W)w);
1967}
1968
1969void
1970ev_check_start (EV_P_ ev_check *w)
1971{
1972 if (expect_false (ev_is_active (w)))
1973 return;
1974
1975 ev_start (EV_A_ (W)w, ++checkcnt);
1976 array_needsize (ev_check *, checks, checkmax, checkcnt, EMPTY2);
1977 checks [checkcnt - 1] = w;
1978}
1979
1980void
1981ev_check_stop (EV_P_ ev_check *w)
1982{
1983 ev_clear_pending (EV_A_ (W)w);
1984 if (expect_false (!ev_is_active (w)))
1985 return;
1986
1987 {
1988 int active = ((W)w)->active;
1989 checks [active - 1] = checks [--checkcnt];
1990 ((W)checks [active - 1])->active = active;
1991 }
1992
1993 ev_stop (EV_A_ (W)w);
1994}
1995
1996#if EV_EMBED_ENABLE
1997void noinline
1998ev_embed_sweep (EV_P_ ev_embed *w)
1999{
2000 ev_loop (w->loop, EVLOOP_NONBLOCK);
2001}
2002
2003static void
2004embed_cb (EV_P_ ev_io *io, int revents)
2005{
2006 ev_embed *w = (ev_embed *)(((char *)io) - offsetof (ev_embed, io));
2007
2008 if (ev_cb (w))
2009 ev_feed_event (EV_A_ (W)w, EV_EMBED);
2010 else
2011 ev_embed_sweep (loop, w);
2012}
2013
2014void
2015ev_embed_start (EV_P_ ev_embed *w)
2016{
2017 if (expect_false (ev_is_active (w)))
2018 return;
2019
2020 {
2021 struct ev_loop *loop = w->loop;
2022 assert (("loop to be embedded is not embeddable", backend & ev_embeddable_backends ()));
2023 ev_io_init (&w->io, embed_cb, backend_fd, EV_READ);
2024 }
2025
2026 ev_set_priority (&w->io, ev_priority (w));
2027 ev_io_start (EV_A_ &w->io);
2028
2029 ev_start (EV_A_ (W)w, 1);
2030}
2031
2032void
2033ev_embed_stop (EV_P_ ev_embed *w)
2034{
2035 ev_clear_pending (EV_A_ (W)w);
2036 if (expect_false (!ev_is_active (w)))
2037 return;
2038
2039 ev_io_stop (EV_A_ &w->io);
2040
2041 ev_stop (EV_A_ (W)w);
2042}
2043#endif
2044
2045#if EV_FORK_ENABLE
2046void
2047ev_fork_start (EV_P_ ev_fork *w)
2048{
2049 if (expect_false (ev_is_active (w)))
2050 return;
2051
2052 ev_start (EV_A_ (W)w, ++forkcnt);
2053 array_needsize (ev_fork *, forks, forkmax, forkcnt, EMPTY2);
2054 forks [forkcnt - 1] = w;
2055}
2056
2057void
2058ev_fork_stop (EV_P_ ev_fork *w)
2059{
2060 ev_clear_pending (EV_A_ (W)w);
2061 if (expect_false (!ev_is_active (w)))
2062 return;
2063
2064 {
2065 int active = ((W)w)->active;
2066 forks [active - 1] = forks [--forkcnt];
2067 ((W)forks [active - 1])->active = active;
2068 }
2069
2070 ev_stop (EV_A_ (W)w);
2071}
2072#endif
2073
1347/*****************************************************************************/ 2074/*****************************************************************************/
1348 2075
1349struct ev_once 2076struct ev_once
1350{ 2077{
1351 struct ev_io io; 2078 ev_io io;
1352 struct ev_timer to; 2079 ev_timer to;
1353 void (*cb)(int revents, void *arg); 2080 void (*cb)(int revents, void *arg);
1354 void *arg; 2081 void *arg;
1355}; 2082};
1356 2083
1357static void 2084static void
1360 void (*cb)(int revents, void *arg) = once->cb; 2087 void (*cb)(int revents, void *arg) = once->cb;
1361 void *arg = once->arg; 2088 void *arg = once->arg;
1362 2089
1363 ev_io_stop (EV_A_ &once->io); 2090 ev_io_stop (EV_A_ &once->io);
1364 ev_timer_stop (EV_A_ &once->to); 2091 ev_timer_stop (EV_A_ &once->to);
1365 free (once); 2092 ev_free (once);
1366 2093
1367 cb (revents, arg); 2094 cb (revents, arg);
1368} 2095}
1369 2096
1370static void 2097static void
1371once_cb_io (EV_P_ struct ev_io *w, int revents) 2098once_cb_io (EV_P_ ev_io *w, int revents)
1372{ 2099{
1373 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents); 2100 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, io)), revents);
1374} 2101}
1375 2102
1376static void 2103static void
1377once_cb_to (EV_P_ struct ev_timer *w, int revents) 2104once_cb_to (EV_P_ ev_timer *w, int revents)
1378{ 2105{
1379 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents); 2106 once_cb (EV_A_ (struct ev_once *)(((char *)w) - offsetof (struct ev_once, to)), revents);
1380} 2107}
1381 2108
1382void 2109void
1383ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg) 2110ev_once (EV_P_ int fd, int events, ev_tstamp timeout, void (*cb)(int revents, void *arg), void *arg)
1384{ 2111{
1385 struct ev_once *once = malloc (sizeof (struct ev_once)); 2112 struct ev_once *once = (struct ev_once *)ev_malloc (sizeof (struct ev_once));
1386 2113
1387 if (!once) 2114 if (expect_false (!once))
2115 {
1388 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg); 2116 cb (EV_ERROR | EV_READ | EV_WRITE | EV_TIMEOUT, arg);
1389 else 2117 return;
1390 { 2118 }
2119
1391 once->cb = cb; 2120 once->cb = cb;
1392 once->arg = arg; 2121 once->arg = arg;
1393 2122
1394 ev_watcher_init (&once->io, once_cb_io); 2123 ev_init (&once->io, once_cb_io);
1395 if (fd >= 0) 2124 if (fd >= 0)
1396 { 2125 {
1397 ev_io_set (&once->io, fd, events); 2126 ev_io_set (&once->io, fd, events);
1398 ev_io_start (EV_A_ &once->io); 2127 ev_io_start (EV_A_ &once->io);
1399 } 2128 }
1400 2129
1401 ev_watcher_init (&once->to, once_cb_to); 2130 ev_init (&once->to, once_cb_to);
1402 if (timeout >= 0.) 2131 if (timeout >= 0.)
1403 { 2132 {
1404 ev_timer_set (&once->to, timeout, 0.); 2133 ev_timer_set (&once->to, timeout, 0.);
1405 ev_timer_start (EV_A_ &once->to); 2134 ev_timer_start (EV_A_ &once->to);
1406 }
1407 } 2135 }
1408} 2136}
1409 2137
2138#ifdef __cplusplus
2139}
2140#endif
2141

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines