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

Comparing libev/ev.c (file contents):
Revision 1.370 by root, Sun Jan 30 19:05:41 2011 UTC vs.
Revision 1.380 by root, Mon Jun 27 19:20:01 2011 UTC

4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de> 4 * Copyright (c) 2007,2008,2009,2010,2011 Marc Alexander Lehmann <libev@schmorp.de>
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without modifica- 7 * Redistribution and use in source and binary forms, with or without modifica-
8 * tion, are permitted provided that the following conditions are met: 8 * tion, are permitted provided that the following conditions are met:
9 * 9 *
10 * 1. Redistributions of source code must retain the above copyright notice, 10 * 1. Redistributions of source code must retain the above copyright notice,
11 * this list of conditions and the following disclaimer. 11 * this list of conditions and the following disclaimer.
12 * 12 *
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution. 15 * documentation and/or other materials provided with the distribution.
16 * 16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED 17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER- 18 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MER-
19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 19 * CHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE- 20 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPE-
21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 21 * CIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
42# ifdef EV_CONFIG_H 42# ifdef EV_CONFIG_H
43# include EV_CONFIG_H 43# include EV_CONFIG_H
44# else 44# else
45# include "config.h" 45# include "config.h"
46# endif 46# endif
47
48#if HAVE_FLOOR
49# ifndef EV_USE_FLOOR
50# define EV_USE_FLOOR 1
51# endif
52#endif
47 53
48# if HAVE_CLOCK_SYSCALL 54# if HAVE_CLOCK_SYSCALL
49# ifndef EV_USE_CLOCK_SYSCALL 55# ifndef EV_USE_CLOCK_SYSCALL
50# define EV_USE_CLOCK_SYSCALL 1 56# define EV_USE_CLOCK_SYSCALL 1
51# ifndef EV_USE_REALTIME 57# ifndef EV_USE_REALTIME
156# define EV_USE_EVENTFD 0 162# define EV_USE_EVENTFD 0
157# endif 163# endif
158 164
159#endif 165#endif
160 166
161#include <math.h>
162#include <stdlib.h> 167#include <stdlib.h>
163#include <string.h> 168#include <string.h>
164#include <fcntl.h> 169#include <fcntl.h>
165#include <stddef.h> 170#include <stddef.h>
166 171
232/* to make it compile regardless, just remove the above line, */ 237/* to make it compile regardless, just remove the above line, */
233/* but consider reporting it, too! :) */ 238/* but consider reporting it, too! :) */
234# define EV_NSIG 65 239# define EV_NSIG 65
235#endif 240#endif
236 241
242#ifndef EV_USE_FLOOR
243# define EV_USE_FLOOR 0
244#endif
245
237#ifndef EV_USE_CLOCK_SYSCALL 246#ifndef EV_USE_CLOCK_SYSCALL
238# if __linux && __GLIBC__ >= 2 247# if __linux && __GLIBC__ >= 2
239# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 248# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
240# else 249# else
241# define EV_USE_CLOCK_SYSCALL 0 250# define EV_USE_CLOCK_SYSCALL 0
443#else 452#else
444# define EV_FREQUENT_CHECK do { } while (0) 453# define EV_FREQUENT_CHECK do { } while (0)
445#endif 454#endif
446 455
447/* 456/*
448 * This is used to avoid floating point rounding problems. 457 * This is used to work around floating point rounding problems.
449 * It is added to ev_rt_now when scheduling periodics
450 * to ensure progress, time-wise, even when rounding
451 * errors are against us.
452 * This value is good at least till the year 4000. 458 * This value is good at least till the year 4000.
453 * Better solutions welcome.
454 */ 459 */
455#define TIME_EPSILON 0.0001220703125 /* 1/8192 */ 460#define MIN_INTERVAL 0.0001220703125 /* 1/2**13, good till 4000 */
461/*#define MIN_INTERVAL 0.00000095367431640625 /* 1/2**20, good till 2200 */
456 462
457#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */ 463#define MIN_TIMEJUMP 1. /* minimum timejump that gets detected (if monotonic clock available) */
458#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */ 464#define MAX_BLOCKTIME 59.743 /* never wait longer than this time (to detect time jumps) */
459 465
460#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0) 466#define EV_TV_SET(tv,t) do { tv.tv_sec = (long)t; tv.tv_usec = (long)((t - tv.tv_sec) * 1e6); } while (0)
461#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0) 467#define EV_TS_SET(ts,t) do { ts.tv_sec = (long)t; ts.tv_nsec = (long)((t - ts.tv_sec) * 1e9); } while (0)
462 468
463#if __GNUC__ >= 4 469/* the following are taken from libecb */
464# define expect(expr,value) __builtin_expect ((expr),(value)) 470/* ecb.h start */
465# define noinline __attribute__ ((noinline)) 471
472/* many compilers define _GNUC_ to some versions but then only implement
473 * what their idiot authors think are the "more important" extensions,
474 * causing enourmous grief in return for some better fake benchmark numbers.
475 * or so.
476 * we try to detect these and simply assume they are not gcc - if they have
477 * an issue with that they should have done it right in the first place.
478 */
479#ifndef ECB_GCC_VERSION
480 #if !defined(__GNUC_MINOR__) || defined(__INTEL_COMPILER) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__llvm__) || defined(__clang__)
481 #define ECB_GCC_VERSION(major,minor) 0
482 #else
483 #define ECB_GCC_VERSION(major,minor) (__GNUC__ > (major) || (__GNUC__ == (major) && __GNUC_MINOR__ >= (minor)))
484 #endif
485#endif
486
487#if __cplusplus
488 #define ecb_inline static inline
489#elif ECB_GCC_VERSION(2,5)
490 #define ecb_inline static __inline__
491#elif ECB_C99
492 #define ecb_inline static inline
466#else 493#else
467# define expect(expr,value) (expr) 494 #define ecb_inline static
468# define noinline
469# if __STDC_VERSION__ < 199901L && __GNUC__ < 2
470# define inline
471# endif 495#endif
472#endif
473 496
497#if ECB_GCC_VERSION(3,1)
498 #define ecb_attribute(attrlist) __attribute__(attrlist)
499 #define ecb_is_constant(expr) __builtin_constant_p (expr)
500 #define ecb_expect(expr,value) __builtin_expect ((expr),(value))
501 #define ecb_prefetch(addr,rw,locality) __builtin_prefetch (addr, rw, locality)
502#else
503 #define ecb_attribute(attrlist)
504 #define ecb_is_constant(expr) 0
505 #define ecb_expect(expr,value) (expr)
506 #define ecb_prefetch(addr,rw,locality)
507#endif
508
509#define ecb_noinline ecb_attribute ((__noinline__))
510#define ecb_noreturn ecb_attribute ((__noreturn__))
511#define ecb_unused ecb_attribute ((__unused__))
512#define ecb_const ecb_attribute ((__const__))
513#define ecb_pure ecb_attribute ((__pure__))
514
515#if ECB_GCC_VERSION(4,3)
516 #define ecb_artificial ecb_attribute ((__artificial__))
517 #define ecb_hot ecb_attribute ((__hot__))
518 #define ecb_cold ecb_attribute ((__cold__))
519#else
520 #define ecb_artificial
521 #define ecb_hot
522 #define ecb_cold
523#endif
524
525/* put around conditional expressions if you are very sure that the */
526/* expression is mostly true or mostly false. note that these return */
527/* booleans, not the expression. */
474#define expect_false(expr) expect ((expr) != 0, 0) 528#define ecb_expect_false(expr) ecb_expect (!!(expr), 0)
475#define expect_true(expr) expect ((expr) != 0, 1) 529#define ecb_expect_true(expr) ecb_expect (!!(expr), 1)
530/* ecb.h end */
531
532#define expect_false(cond) ecb_expect_false (cond)
533#define expect_true(cond) ecb_expect_true (cond)
534#define noinline ecb_noinline
535
476#define inline_size static inline 536#define inline_size ecb_inline
477 537
478#if EV_FEATURE_CODE 538#if EV_FEATURE_CODE
479# define inline_speed static inline 539# define inline_speed ecb_inline
480#else 540#else
481# define inline_speed static noinline 541# define inline_speed static noinline
482#endif 542#endif
483 543
484#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1) 544#define NUMPRI (EV_MAXPRI - EV_MINPRI + 1)
523# include "ev_win32.c" 583# include "ev_win32.c"
524#endif 584#endif
525 585
526/*****************************************************************************/ 586/*****************************************************************************/
527 587
588/* define a suitable floor function (only used by periodics atm) */
589
590#if EV_USE_FLOOR
591# include <math.h>
592# define ev_floor(v) floor (v)
593#else
594
595#include <float.h>
596
597/* a floor() replacement function, should be independent of ev_tstamp type */
598static ev_tstamp noinline
599ev_floor (ev_tstamp v)
600{
601 /* the choice of shift factor is not terribly important */
602#if FLT_RADIX != 2 /* assume FLT_RADIX == 10 */
603 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 10000000000000000000. : 1000000000.;
604#else
605 const ev_tstamp shift = sizeof (unsigned long) >= 8 ? 18446744073709551616. : 4294967296.;
606#endif
607
608 /* argument too large for an unsigned long? */
609 if (expect_false (v >= shift))
610 {
611 ev_tstamp f;
612
613 if (v == v - 1.)
614 return v; /* very large number */
615
616 f = shift * ev_floor (v * (1. / shift));
617 return f + ev_floor (v - f);
618 }
619
620 /* special treatment for negative args? */
621 if (expect_false (v < 0.))
622 {
623 ev_tstamp f = -ev_floor (-v);
624
625 return f - (f == v ? 0 : 1);
626 }
627
628 /* fits into an unsigned long */
629 return (unsigned long)v;
630}
631
632#endif
633
634/*****************************************************************************/
635
528#ifdef __linux 636#ifdef __linux
529# include <sys/utsname.h> 637# include <sys/utsname.h>
530#endif 638#endif
531 639
532static unsigned int noinline 640static unsigned int noinline ecb_cold
533ev_linux_version (void) 641ev_linux_version (void)
534{ 642{
535#ifdef __linux 643#ifdef __linux
536 unsigned int v = 0; 644 unsigned int v = 0;
537 struct utsname buf; 645 struct utsname buf;
566} 674}
567 675
568/*****************************************************************************/ 676/*****************************************************************************/
569 677
570#if EV_AVOID_STDIO 678#if EV_AVOID_STDIO
571static void noinline 679static void noinline ecb_cold
572ev_printerr (const char *msg) 680ev_printerr (const char *msg)
573{ 681{
574 write (STDERR_FILENO, msg, strlen (msg)); 682 write (STDERR_FILENO, msg, strlen (msg));
575} 683}
576#endif 684#endif
577 685
578static void (*syserr_cb)(const char *msg); 686static void (*syserr_cb)(const char *msg);
579 687
580void 688void ecb_cold
581ev_set_syserr_cb (void (*cb)(const char *msg)) 689ev_set_syserr_cb (void (*cb)(const char *msg))
582{ 690{
583 syserr_cb = cb; 691 syserr_cb = cb;
584} 692}
585 693
586static void noinline 694static void noinline ecb_cold
587ev_syserr (const char *msg) 695ev_syserr (const char *msg)
588{ 696{
589 if (!msg) 697 if (!msg)
590 msg = "(libev) system error"; 698 msg = "(libev) system error";
591 699
624#endif 732#endif
625} 733}
626 734
627static void *(*alloc)(void *ptr, long size) = ev_realloc_emul; 735static void *(*alloc)(void *ptr, long size) = ev_realloc_emul;
628 736
629void 737void ecb_cold
630ev_set_allocator (void *(*cb)(void *ptr, long size)) 738ev_set_allocator (void *(*cb)(void *ptr, long size))
631{ 739{
632 alloc = cb; 740 alloc = cb;
633} 741}
634 742
816 select (0, 0, 0, 0, &tv); 924 select (0, 0, 0, 0, &tv);
817#endif 925#endif
818 } 926 }
819} 927}
820 928
821inline_speed int
822ev_timeout_to_ms (ev_tstamp timeout)
823{
824 int ms = timeout * 1000. + .999999;
825
826 return expect_true (ms) ? ms : timeout < 1e-6 ? 0 : 1;
827}
828
829/*****************************************************************************/ 929/*****************************************************************************/
830 930
831#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */ 931#define MALLOC_ROUND 4096 /* prefer to allocate in chunks of this size, must be 2**n and >> 4 longs */
832 932
833/* find a suitable new size for the given array, */ 933/* find a suitable new size for the given array, */
851 } 951 }
852 952
853 return ncur; 953 return ncur;
854} 954}
855 955
856static noinline void * 956static void * noinline ecb_cold
857array_realloc (int elem, void *base, int *cur, int cnt) 957array_realloc (int elem, void *base, int *cur, int cnt)
858{ 958{
859 *cur = array_nextsize (elem, *cur, cnt); 959 *cur = array_nextsize (elem, *cur, cnt);
860 return ev_realloc (base, elem * *cur); 960 return ev_realloc (base, elem * *cur);
861} 961}
974inline_size void 1074inline_size void
975fd_reify (EV_P) 1075fd_reify (EV_P)
976{ 1076{
977 int i; 1077 int i;
978 1078
1079#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
1080 for (i = 0; i < fdchangecnt; ++i)
1081 {
1082 int fd = fdchanges [i];
1083 ANFD *anfd = anfds + fd;
1084
1085 if (anfd->reify & EV__IOFDSET && anfd->head)
1086 {
1087 SOCKET handle = EV_FD_TO_WIN32_HANDLE (fd);
1088
1089 if (handle != anfd->handle)
1090 {
1091 unsigned long arg;
1092
1093 assert (("libev: only socket fds supported in this configuration", ioctlsocket (handle, FIONREAD, &arg) == 0));
1094
1095 /* handle changed, but fd didn't - we need to do it in two steps */
1096 backend_modify (EV_A_ fd, anfd->events, 0);
1097 anfd->events = 0;
1098 anfd->handle = handle;
1099 }
1100 }
1101 }
1102#endif
1103
979 for (i = 0; i < fdchangecnt; ++i) 1104 for (i = 0; i < fdchangecnt; ++i)
980 { 1105 {
981 int fd = fdchanges [i]; 1106 int fd = fdchanges [i];
982 ANFD *anfd = anfds + fd; 1107 ANFD *anfd = anfds + fd;
983 ev_io *w; 1108 ev_io *w;
985 unsigned char o_events = anfd->events; 1110 unsigned char o_events = anfd->events;
986 unsigned char o_reify = anfd->reify; 1111 unsigned char o_reify = anfd->reify;
987 1112
988 anfd->reify = 0; 1113 anfd->reify = 0;
989 1114
990#if EV_SELECT_IS_WINSOCKET || EV_USE_IOCP
991 if (o_reify & EV__IOFDSET)
992 {
993 unsigned long arg;
994 anfd->handle = EV_FD_TO_WIN32_HANDLE (fd);
995 assert (("libev: only socket fds supported in this configuration", ioctlsocket (anfd->handle, FIONREAD, &arg) == 0));
996 printf ("oi %d %x\n", fd, anfd->handle);//D
997 }
998#endif
999
1000 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */ 1115 /*if (expect_true (o_reify & EV_ANFD_REIFY)) probably a deoptimisation */
1001 { 1116 {
1002 anfd->events = 0; 1117 anfd->events = 0;
1003 1118
1004 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next) 1119 for (w = (ev_io *)anfd->head; w; w = (ev_io *)((WL)w)->next)
1029 fdchanges [fdchangecnt - 1] = fd; 1144 fdchanges [fdchangecnt - 1] = fd;
1030 } 1145 }
1031} 1146}
1032 1147
1033/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */ 1148/* the given fd is invalid/unusable, so make sure it doesn't hurt us anymore */
1034inline_speed void 1149inline_speed void ecb_cold
1035fd_kill (EV_P_ int fd) 1150fd_kill (EV_P_ int fd)
1036{ 1151{
1037 ev_io *w; 1152 ev_io *w;
1038 1153
1039 while ((w = (ev_io *)anfds [fd].head)) 1154 while ((w = (ev_io *)anfds [fd].head))
1042 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE); 1157 ev_feed_event (EV_A_ (W)w, EV_ERROR | EV_READ | EV_WRITE);
1043 } 1158 }
1044} 1159}
1045 1160
1046/* check whether the given fd is actually valid, for error recovery */ 1161/* check whether the given fd is actually valid, for error recovery */
1047inline_size int 1162inline_size int ecb_cold
1048fd_valid (int fd) 1163fd_valid (int fd)
1049{ 1164{
1050#ifdef _WIN32 1165#ifdef _WIN32
1051 return EV_FD_TO_WIN32_HANDLE (fd) != -1; 1166 return EV_FD_TO_WIN32_HANDLE (fd) != -1;
1052#else 1167#else
1053 return fcntl (fd, F_GETFD) != -1; 1168 return fcntl (fd, F_GETFD) != -1;
1054#endif 1169#endif
1055} 1170}
1056 1171
1057/* called on EBADF to verify fds */ 1172/* called on EBADF to verify fds */
1058static void noinline 1173static void noinline ecb_cold
1059fd_ebadf (EV_P) 1174fd_ebadf (EV_P)
1060{ 1175{
1061 int fd; 1176 int fd;
1062 1177
1063 for (fd = 0; fd < anfdmax; ++fd) 1178 for (fd = 0; fd < anfdmax; ++fd)
1065 if (!fd_valid (fd) && errno == EBADF) 1180 if (!fd_valid (fd) && errno == EBADF)
1066 fd_kill (EV_A_ fd); 1181 fd_kill (EV_A_ fd);
1067} 1182}
1068 1183
1069/* called on ENOMEM in select/poll to kill some fds and retry */ 1184/* called on ENOMEM in select/poll to kill some fds and retry */
1070static void noinline 1185static void noinline ecb_cold
1071fd_enomem (EV_P) 1186fd_enomem (EV_P)
1072{ 1187{
1073 int fd; 1188 int fd;
1074 1189
1075 for (fd = anfdmax; fd--; ) 1190 for (fd = anfdmax; fd--; )
1270 1385
1271/*****************************************************************************/ 1386/*****************************************************************************/
1272 1387
1273#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE 1388#if EV_SIGNAL_ENABLE || EV_ASYNC_ENABLE
1274 1389
1275static void noinline 1390static void noinline ecb_cold
1276evpipe_init (EV_P) 1391evpipe_init (EV_P)
1277{ 1392{
1278 if (!ev_is_active (&pipe_w)) 1393 if (!ev_is_active (&pipe_w))
1279 { 1394 {
1280# if EV_USE_EVENTFD 1395# if EV_USE_EVENTFD
1302 ev_io_start (EV_A_ &pipe_w); 1417 ev_io_start (EV_A_ &pipe_w);
1303 ev_unref (EV_A); /* watcher should not keep loop alive */ 1418 ev_unref (EV_A); /* watcher should not keep loop alive */
1304 } 1419 }
1305} 1420}
1306 1421
1307inline_size void 1422inline_speed void
1308evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1423evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1309{ 1424{
1310 if (!*flag) 1425 if (!*flag)
1311 { 1426 {
1312 int old_errno = errno; /* save errno because write might clobber it */
1313 char dummy;
1314
1315 *flag = 1; 1427 *flag = 1;
1316 1428
1429 pipe_write_skipped = 1;
1430
1431 if (pipe_write_wanted)
1432 {
1433 int old_errno;
1434
1435 pipe_write_skipped = 0;
1436
1437 old_errno = errno; /* save errno because write will clobber it */
1438
1317#if EV_USE_EVENTFD 1439#if EV_USE_EVENTFD
1318 if (evfd >= 0) 1440 if (evfd >= 0)
1319 { 1441 {
1320 uint64_t counter = 1; 1442 uint64_t counter = 1;
1321 write (evfd, &counter, sizeof (uint64_t)); 1443 write (evfd, &counter, sizeof (uint64_t));
1444 }
1445 else
1446#endif
1447 {
1448 /* win32 people keep sending patches that change this write() to send() */
1449 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1450 /* so when you think this write should be a send instead, please find out */
1451 /* where your send() is from - it's definitely not the microsoft send, and */
1452 /* tell me. thank you. */
1453 write (evpipe [1], &(evpipe [1]), 1);
1454 }
1455
1456 errno = old_errno;
1322 } 1457 }
1323 else
1324#endif
1325 /* win32 people keep sending patches that change this write() to send() */
1326 /* and then run away. but send() is wrong, it wants a socket handle on win32 */
1327 /* so when you think this write should be a send instead, please find out */
1328 /* where your send() is from - it's definitely not the microsoft send, and */
1329 /* tell me. thank you. */
1330 write (evpipe [1], &dummy, 1);
1331
1332 errno = old_errno;
1333 } 1458 }
1334} 1459}
1335 1460
1336/* called whenever the libev signal pipe */ 1461/* called whenever the libev signal pipe */
1337/* got some events (signal, async) */ 1462/* got some events (signal, async) */
1338static void 1463static void
1339pipecb (EV_P_ ev_io *iow, int revents) 1464pipecb (EV_P_ ev_io *iow, int revents)
1340{ 1465{
1341 int i; 1466 int i;
1342 1467
1468 if (revents & EV_READ)
1469 {
1343#if EV_USE_EVENTFD 1470#if EV_USE_EVENTFD
1344 if (evfd >= 0) 1471 if (evfd >= 0)
1345 { 1472 {
1346 uint64_t counter; 1473 uint64_t counter;
1347 read (evfd, &counter, sizeof (uint64_t)); 1474 read (evfd, &counter, sizeof (uint64_t));
1348 } 1475 }
1349 else 1476 else
1350#endif 1477#endif
1351 { 1478 {
1352 char dummy; 1479 char dummy;
1353 /* see discussion in evpipe_write when you think this read should be recv in win32 */ 1480 /* see discussion in evpipe_write when you think this read should be recv in win32 */
1354 read (evpipe [0], &dummy, 1); 1481 read (evpipe [0], &dummy, 1);
1482 }
1355 } 1483 }
1484
1485 pipe_write_skipped = 0;
1356 1486
1357#if EV_SIGNAL_ENABLE 1487#if EV_SIGNAL_ENABLE
1358 if (sig_pending) 1488 if (sig_pending)
1359 { 1489 {
1360 sig_pending = 0; 1490 sig_pending = 0;
1361 1491
1362 for (i = EV_NSIG - 1; i--; ) 1492 for (i = EV_NSIG - 1; i--; )
1363 if (expect_false (signals [i].pending)) 1493 if (expect_false (signals [i].pending))
1364 ev_feed_signal_event (EV_A_ i + 1); 1494 ev_feed_signal_event (EV_A_ i + 1);
1389 EV_P = signals [signum - 1].loop; 1519 EV_P = signals [signum - 1].loop;
1390 1520
1391 if (!EV_A) 1521 if (!EV_A)
1392 return; 1522 return;
1393#endif 1523#endif
1524
1525 evpipe_init (EV_A);
1394 1526
1395 signals [signum - 1].pending = 1; 1527 signals [signum - 1].pending = 1;
1396 evpipe_write (EV_A_ &sig_pending); 1528 evpipe_write (EV_A_ &sig_pending);
1397} 1529}
1398 1530
1530#endif 1662#endif
1531#if EV_USE_SELECT 1663#if EV_USE_SELECT
1532# include "ev_select.c" 1664# include "ev_select.c"
1533#endif 1665#endif
1534 1666
1535int 1667int ecb_cold
1536ev_version_major (void) 1668ev_version_major (void)
1537{ 1669{
1538 return EV_VERSION_MAJOR; 1670 return EV_VERSION_MAJOR;
1539} 1671}
1540 1672
1541int 1673int ecb_cold
1542ev_version_minor (void) 1674ev_version_minor (void)
1543{ 1675{
1544 return EV_VERSION_MINOR; 1676 return EV_VERSION_MINOR;
1545} 1677}
1546 1678
1547/* return true if we are running with elevated privileges and should ignore env variables */ 1679/* return true if we are running with elevated privileges and should ignore env variables */
1548int inline_size 1680int inline_size ecb_cold
1549enable_secure (void) 1681enable_secure (void)
1550{ 1682{
1551#ifdef _WIN32 1683#ifdef _WIN32
1552 return 0; 1684 return 0;
1553#else 1685#else
1554 return getuid () != geteuid () 1686 return getuid () != geteuid ()
1555 || getgid () != getegid (); 1687 || getgid () != getegid ();
1556#endif 1688#endif
1557} 1689}
1558 1690
1559unsigned int 1691unsigned int ecb_cold
1560ev_supported_backends (void) 1692ev_supported_backends (void)
1561{ 1693{
1562 unsigned int flags = 0; 1694 unsigned int flags = 0;
1563 1695
1564 if (EV_USE_PORT ) flags |= EVBACKEND_PORT; 1696 if (EV_USE_PORT ) flags |= EVBACKEND_PORT;
1568 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT; 1700 if (EV_USE_SELECT) flags |= EVBACKEND_SELECT;
1569 1701
1570 return flags; 1702 return flags;
1571} 1703}
1572 1704
1573unsigned int 1705unsigned int ecb_cold
1574ev_recommended_backends (void) 1706ev_recommended_backends (void)
1575{ 1707{
1576 unsigned int flags = ev_supported_backends (); 1708 unsigned int flags = ev_supported_backends ();
1577 1709
1578#ifndef __NetBSD__ 1710#ifndef __NetBSD__
1590#endif 1722#endif
1591 1723
1592 return flags; 1724 return flags;
1593} 1725}
1594 1726
1595unsigned int 1727unsigned int ecb_cold
1596ev_embeddable_backends (void) 1728ev_embeddable_backends (void)
1597{ 1729{
1598 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT; 1730 int flags = EVBACKEND_EPOLL | EVBACKEND_KQUEUE | EVBACKEND_PORT;
1599 1731
1600 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */ 1732 /* epoll embeddability broken on all linux versions up to at least 2.6.23 */
1645ev_userdata (EV_P) 1777ev_userdata (EV_P)
1646{ 1778{
1647 return userdata; 1779 return userdata;
1648} 1780}
1649 1781
1782void
1650void ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) 1783ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P))
1651{ 1784{
1652 invoke_cb = invoke_pending_cb; 1785 invoke_cb = invoke_pending_cb;
1653} 1786}
1654 1787
1788void
1655void ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P)) 1789ev_set_loop_release_cb (EV_P_ void (*release)(EV_P), void (*acquire)(EV_P))
1656{ 1790{
1657 release_cb = release; 1791 release_cb = release;
1658 acquire_cb = acquire; 1792 acquire_cb = acquire;
1659} 1793}
1660#endif 1794#endif
1661 1795
1662/* initialise a loop structure, must be zero-initialised */ 1796/* initialise a loop structure, must be zero-initialised */
1663static void noinline 1797static void noinline ecb_cold
1664loop_init (EV_P_ unsigned int flags) 1798loop_init (EV_P_ unsigned int flags)
1665{ 1799{
1666 if (!backend) 1800 if (!backend)
1667 { 1801 {
1668 origflags = flags; 1802 origflags = flags;
1696 if (!(flags & EVFLAG_NOENV) 1830 if (!(flags & EVFLAG_NOENV)
1697 && !enable_secure () 1831 && !enable_secure ()
1698 && getenv ("LIBEV_FLAGS")) 1832 && getenv ("LIBEV_FLAGS"))
1699 flags = atoi (getenv ("LIBEV_FLAGS")); 1833 flags = atoi (getenv ("LIBEV_FLAGS"));
1700 1834
1701 ev_rt_now = ev_time (); 1835 ev_rt_now = ev_time ();
1702 mn_now = get_clock (); 1836 mn_now = get_clock ();
1703 now_floor = mn_now; 1837 now_floor = mn_now;
1704 rtmn_diff = ev_rt_now - mn_now; 1838 rtmn_diff = ev_rt_now - mn_now;
1705#if EV_FEATURE_API 1839#if EV_FEATURE_API
1706 invoke_cb = ev_invoke_pending; 1840 invoke_cb = ev_invoke_pending;
1707#endif 1841#endif
1708 1842
1709 io_blocktime = 0.; 1843 io_blocktime = 0.;
1710 timeout_blocktime = 0.; 1844 timeout_blocktime = 0.;
1711 backend = 0; 1845 backend = 0;
1712 backend_fd = -1; 1846 backend_fd = -1;
1713 sig_pending = 0; 1847 sig_pending = 0;
1714#if EV_ASYNC_ENABLE 1848#if EV_ASYNC_ENABLE
1715 async_pending = 0; 1849 async_pending = 0;
1716#endif 1850#endif
1851 pipe_write_skipped = 0;
1852 pipe_write_wanted = 0;
1717#if EV_USE_INOTIFY 1853#if EV_USE_INOTIFY
1718 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2; 1854 fs_fd = flags & EVFLAG_NOINOTIFY ? -1 : -2;
1719#endif 1855#endif
1720#if EV_USE_SIGNALFD 1856#if EV_USE_SIGNALFD
1721 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1; 1857 sigfd = flags & EVFLAG_SIGNALFD ? -2 : -1;
1722#endif 1858#endif
1723 1859
1724 if (!(flags & EVBACKEND_MASK)) 1860 if (!(flags & EVBACKEND_MASK))
1725 flags |= ev_recommended_backends (); 1861 flags |= ev_recommended_backends ();
1726 1862
1751#endif 1887#endif
1752 } 1888 }
1753} 1889}
1754 1890
1755/* free up a loop structure */ 1891/* free up a loop structure */
1756void 1892void ecb_cold
1757ev_loop_destroy (EV_P) 1893ev_loop_destroy (EV_P)
1758{ 1894{
1759 int i; 1895 int i;
1760 1896
1761#if EV_MULTIPLICITY 1897#if EV_MULTIPLICITY
1891 infy_fork (EV_A); 2027 infy_fork (EV_A);
1892#endif 2028#endif
1893 2029
1894 if (ev_is_active (&pipe_w)) 2030 if (ev_is_active (&pipe_w))
1895 { 2031 {
1896 /* this "locks" the handlers against writing to the pipe */ 2032 /* pipe_write_wanted must be false now, so modifying fd vars should be safe */
1897 /* while we modify the fd vars */
1898 sig_pending = 1;
1899#if EV_ASYNC_ENABLE
1900 async_pending = 1;
1901#endif
1902 2033
1903 ev_ref (EV_A); 2034 ev_ref (EV_A);
1904 ev_io_stop (EV_A_ &pipe_w); 2035 ev_io_stop (EV_A_ &pipe_w);
1905 2036
1906#if EV_USE_EVENTFD 2037#if EV_USE_EVENTFD
1924 postfork = 0; 2055 postfork = 0;
1925} 2056}
1926 2057
1927#if EV_MULTIPLICITY 2058#if EV_MULTIPLICITY
1928 2059
1929struct ev_loop * 2060struct ev_loop * ecb_cold
1930ev_loop_new (unsigned int flags) 2061ev_loop_new (unsigned int flags)
1931{ 2062{
1932 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop)); 2063 EV_P = (struct ev_loop *)ev_malloc (sizeof (struct ev_loop));
1933 2064
1934 memset (EV_A, 0, sizeof (struct ev_loop)); 2065 memset (EV_A, 0, sizeof (struct ev_loop));
1942} 2073}
1943 2074
1944#endif /* multiplicity */ 2075#endif /* multiplicity */
1945 2076
1946#if EV_VERIFY 2077#if EV_VERIFY
1947static void noinline 2078static void noinline ecb_cold
1948verify_watcher (EV_P_ W w) 2079verify_watcher (EV_P_ W w)
1949{ 2080{
1950 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI)); 2081 assert (("libev: watcher has invalid priority", ABSPRI (w) >= 0 && ABSPRI (w) < NUMPRI));
1951 2082
1952 if (w->pending) 2083 if (w->pending)
1953 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w)); 2084 assert (("libev: pending watcher not on pending queue", pendings [ABSPRI (w)][w->pending - 1].w == w));
1954} 2085}
1955 2086
1956static void noinline 2087static void noinline ecb_cold
1957verify_heap (EV_P_ ANHE *heap, int N) 2088verify_heap (EV_P_ ANHE *heap, int N)
1958{ 2089{
1959 int i; 2090 int i;
1960 2091
1961 for (i = HEAP0; i < N + HEAP0; ++i) 2092 for (i = HEAP0; i < N + HEAP0; ++i)
1966 2097
1967 verify_watcher (EV_A_ (W)ANHE_w (heap [i])); 2098 verify_watcher (EV_A_ (W)ANHE_w (heap [i]));
1968 } 2099 }
1969} 2100}
1970 2101
1971static void noinline 2102static void noinline ecb_cold
1972array_verify (EV_P_ W *ws, int cnt) 2103array_verify (EV_P_ W *ws, int cnt)
1973{ 2104{
1974 while (cnt--) 2105 while (cnt--)
1975 { 2106 {
1976 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1)); 2107 assert (("libev: active index mismatch", ev_active (ws [cnt]) == cnt + 1));
1978 } 2109 }
1979} 2110}
1980#endif 2111#endif
1981 2112
1982#if EV_FEATURE_API 2113#if EV_FEATURE_API
1983void 2114void ecb_cold
1984ev_verify (EV_P) 2115ev_verify (EV_P)
1985{ 2116{
1986#if EV_VERIFY 2117#if EV_VERIFY
1987 int i; 2118 int i;
1988 WL w; 2119 WL w;
2054#endif 2185#endif
2055} 2186}
2056#endif 2187#endif
2057 2188
2058#if EV_MULTIPLICITY 2189#if EV_MULTIPLICITY
2059struct ev_loop * 2190struct ev_loop * ecb_cold
2060#else 2191#else
2061int 2192int
2062#endif 2193#endif
2063ev_default_loop (unsigned int flags) 2194ev_default_loop (unsigned int flags)
2064{ 2195{
2193 } 2324 }
2194} 2325}
2195 2326
2196#if EV_PERIODIC_ENABLE 2327#if EV_PERIODIC_ENABLE
2197 2328
2198inline_speed 2329static void noinline
2199periodic_recalc (EV_P_ ev_periodic *w) 2330periodic_recalc (EV_P_ ev_periodic *w)
2200{ 2331{
2201 /* TODO: use slow but potentially more correct incremental algo, */ 2332 ev_tstamp interval = w->interval > MIN_INTERVAL ? w->interval : MIN_INTERVAL;
2202 /* also do not rely on ceil */ 2333 ev_tstamp at = w->offset + interval * ev_floor ((ev_rt_now - w->offset) / interval);
2203 ev_at (w) = w->offset + ceil ((ev_rt_now - w->offset) / w->interval) * w->interval; 2334
2335 /* the above almost always errs on the low side */
2336 while (at <= ev_rt_now)
2337 {
2338 ev_tstamp nat = at + w->interval;
2339
2340 /* when resolution fails us, we use ev_rt_now */
2341 if (expect_false (nat == at))
2342 {
2343 at = ev_rt_now;
2344 break;
2345 }
2346
2347 at = nat;
2348 }
2349
2350 ev_at (w) = at;
2204} 2351}
2205 2352
2206/* make periodics pending */ 2353/* make periodics pending */
2207inline_size void 2354inline_size void
2208periodics_reify (EV_P) 2355periodics_reify (EV_P)
2230 downheap (periodics, periodiccnt, HEAP0); 2377 downheap (periodics, periodiccnt, HEAP0);
2231 } 2378 }
2232 else if (w->interval) 2379 else if (w->interval)
2233 { 2380 {
2234 periodic_recalc (EV_A_ w); 2381 periodic_recalc (EV_A_ w);
2235
2236 /* if next trigger time is not sufficiently in the future, put it there */
2237 /* this might happen because of floating point inexactness */
2238 if (ev_at (w) - ev_rt_now < TIME_EPSILON)
2239 {
2240 ev_at (w) += w->interval;
2241
2242 /* if interval is unreasonably low we might still have a time in the past */
2243 /* so correct this. this will make the periodic very inexact, but the user */
2244 /* has effectively asked to get triggered more often than possible */
2245 if (ev_at (w) < ev_rt_now)
2246 ev_at (w) = ev_rt_now;
2247 }
2248
2249 ANHE_at_cache (periodics [HEAP0]); 2382 ANHE_at_cache (periodics [HEAP0]);
2250 downheap (periodics, periodiccnt, HEAP0); 2383 downheap (periodics, periodiccnt, HEAP0);
2251 } 2384 }
2252 else 2385 else
2253 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */ 2386 ev_periodic_stop (EV_A_ w); /* nonrepeating: stop timer */
2261 } 2394 }
2262} 2395}
2263 2396
2264/* simply recalculate all periodics */ 2397/* simply recalculate all periodics */
2265/* TODO: maybe ensure that at least one event happens when jumping forward? */ 2398/* TODO: maybe ensure that at least one event happens when jumping forward? */
2266static void noinline 2399static void noinline ecb_cold
2267periodics_reschedule (EV_P) 2400periodics_reschedule (EV_P)
2268{ 2401{
2269 int i; 2402 int i;
2270 2403
2271 /* adjust periodics after time jump */ 2404 /* adjust periodics after time jump */
2284 reheap (periodics, periodiccnt); 2417 reheap (periodics, periodiccnt);
2285} 2418}
2286#endif 2419#endif
2287 2420
2288/* adjust all timers by a given offset */ 2421/* adjust all timers by a given offset */
2289static void noinline 2422static void noinline ecb_cold
2290timers_reschedule (EV_P_ ev_tstamp adjust) 2423timers_reschedule (EV_P_ ev_tstamp adjust)
2291{ 2424{
2292 int i; 2425 int i;
2293 2426
2294 for (i = 0; i < timercnt; ++i) 2427 for (i = 0; i < timercnt; ++i)
2331 * doesn't hurt either as we only do this on time-jumps or 2464 * doesn't hurt either as we only do this on time-jumps or
2332 * in the unlikely event of having been preempted here. 2465 * in the unlikely event of having been preempted here.
2333 */ 2466 */
2334 for (i = 4; --i; ) 2467 for (i = 4; --i; )
2335 { 2468 {
2469 ev_tstamp diff;
2336 rtmn_diff = ev_rt_now - mn_now; 2470 rtmn_diff = ev_rt_now - mn_now;
2337 2471
2472 diff = odiff - rtmn_diff;
2473
2338 if (expect_true (fabs (odiff - rtmn_diff) < MIN_TIMEJUMP)) 2474 if (expect_true ((diff < 0. ? -diff : diff) < MIN_TIMEJUMP))
2339 return; /* all is well */ 2475 return; /* all is well */
2340 2476
2341 ev_rt_now = ev_time (); 2477 ev_rt_now = ev_time ();
2342 mn_now = get_clock (); 2478 mn_now = get_clock ();
2343 now_floor = mn_now; 2479 now_floor = mn_now;
2433 ev_tstamp prev_mn_now = mn_now; 2569 ev_tstamp prev_mn_now = mn_now;
2434 2570
2435 /* update time to cancel out callback processing overhead */ 2571 /* update time to cancel out callback processing overhead */
2436 time_update (EV_A_ 1e100); 2572 time_update (EV_A_ 1e100);
2437 2573
2574 /* from now on, we want a pipe-wake-up */
2575 pipe_write_wanted = 1;
2576
2438 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt))) 2577 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2439 { 2578 {
2440 waittime = MAX_BLOCKTIME; 2579 waittime = MAX_BLOCKTIME;
2441 2580
2442 if (timercnt) 2581 if (timercnt)
2443 { 2582 {
2444 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now + backend_fudge; 2583 ev_tstamp to = ANHE_at (timers [HEAP0]) - mn_now;
2445 if (waittime > to) waittime = to; 2584 if (waittime > to) waittime = to;
2446 } 2585 }
2447 2586
2448#if EV_PERIODIC_ENABLE 2587#if EV_PERIODIC_ENABLE
2449 if (periodiccnt) 2588 if (periodiccnt)
2450 { 2589 {
2451 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now + backend_fudge; 2590 ev_tstamp to = ANHE_at (periodics [HEAP0]) - ev_rt_now;
2452 if (waittime > to) waittime = to; 2591 if (waittime > to) waittime = to;
2453 } 2592 }
2454#endif 2593#endif
2455 2594
2456 /* don't let timeouts decrease the waittime below timeout_blocktime */ 2595 /* don't let timeouts decrease the waittime below timeout_blocktime */
2457 if (expect_false (waittime < timeout_blocktime)) 2596 if (expect_false (waittime < timeout_blocktime))
2458 waittime = timeout_blocktime; 2597 waittime = timeout_blocktime;
2598
2599 /* at this point, we NEED to wait, so we have to ensure */
2600 /* to pass a minimum nonzero value to the backend */
2601 if (expect_false (waittime < backend_mintime))
2602 waittime = backend_mintime;
2459 2603
2460 /* extra check because io_blocktime is commonly 0 */ 2604 /* extra check because io_blocktime is commonly 0 */
2461 if (expect_false (io_blocktime)) 2605 if (expect_false (io_blocktime))
2462 { 2606 {
2463 sleeptime = io_blocktime - (mn_now - prev_mn_now); 2607 sleeptime = io_blocktime - (mn_now - prev_mn_now);
2464 2608
2465 if (sleeptime > waittime - backend_fudge) 2609 if (sleeptime > waittime - backend_mintime)
2466 sleeptime = waittime - backend_fudge; 2610 sleeptime = waittime - backend_mintime;
2467 2611
2468 if (expect_true (sleeptime > 0.)) 2612 if (expect_true (sleeptime > 0.))
2469 { 2613 {
2470 ev_sleep (sleeptime); 2614 ev_sleep (sleeptime);
2471 waittime -= sleeptime; 2615 waittime -= sleeptime;
2477 ++loop_count; 2621 ++loop_count;
2478#endif 2622#endif
2479 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */ 2623 assert ((loop_done = EVBREAK_RECURSE, 1)); /* assert for side effect */
2480 backend_poll (EV_A_ waittime); 2624 backend_poll (EV_A_ waittime);
2481 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */ 2625 assert ((loop_done = EVBREAK_CANCEL, 1)); /* assert for side effect */
2626
2627 pipe_write_wanted = 0;
2628
2629 if (pipe_write_skipped)
2630 {
2631 assert (("libev: pipe_w not active, but pipe not written", ev_is_active (&pipe_w)));
2632 ev_feed_event (EV_A_ &pipe_w, EV_CUSTOM);
2633 }
2634
2482 2635
2483 /* update ev_rt_now, do magic */ 2636 /* update ev_rt_now, do magic */
2484 time_update (EV_A_ waittime + sleeptime); 2637 time_update (EV_A_ waittime + sleeptime);
2485 } 2638 }
2486 2639
3063 if (!pend || pend == path) 3216 if (!pend || pend == path)
3064 break; 3217 break;
3065 3218
3066 *pend = 0; 3219 *pend = 0;
3067 w->wd = inotify_add_watch (fs_fd, path, mask); 3220 w->wd = inotify_add_watch (fs_fd, path, mask);
3068 } 3221 }
3069 while (w->wd < 0 && (errno == ENOENT || errno == EACCES)); 3222 while (w->wd < 0 && (errno == ENOENT || errno == EACCES));
3070 } 3223 }
3071 } 3224 }
3072 3225
3073 if (w->wd >= 0) 3226 if (w->wd >= 0)
3140 infy_wd (EV_A_ ev->wd, ev->wd, ev); 3293 infy_wd (EV_A_ ev->wd, ev->wd, ev);
3141 ofs += sizeof (struct inotify_event) + ev->len; 3294 ofs += sizeof (struct inotify_event) + ev->len;
3142 } 3295 }
3143} 3296}
3144 3297
3145inline_size void 3298inline_size void ecb_cold
3146ev_check_2625 (EV_P) 3299ev_check_2625 (EV_P)
3147{ 3300{
3148 /* kernels < 2.6.25 are borked 3301 /* kernels < 2.6.25 are borked
3149 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html 3302 * http://www.ussg.indiana.edu/hypermail/linux/kernel/0711.3/1208.html
3150 */ 3303 */
3775} 3928}
3776 3929
3777/*****************************************************************************/ 3930/*****************************************************************************/
3778 3931
3779#if EV_WALK_ENABLE 3932#if EV_WALK_ENABLE
3780void 3933void ecb_cold
3781ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w)) 3934ev_walk (EV_P_ int types, void (*cb)(EV_P_ int type, void *w))
3782{ 3935{
3783 int i, j; 3936 int i, j;
3784 ev_watcher_list *wl, *wn; 3937 ev_watcher_list *wl, *wn;
3785 3938

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines