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

Comparing libev/ev.c (file contents):
Revision 1.450 by root, Mon Oct 8 15:43:35 2012 UTC vs.
Revision 1.461 by root, Fri Dec 27 06:01:22 2013 UTC

… …
241#elif defined SIGARRAYSIZE 241#elif defined SIGARRAYSIZE
242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */ 242# define EV_NSIG (SIGARRAYSIZE) /* Assume ary[SIGARRAYSIZE] */
243#elif defined _sys_nsig 243#elif defined _sys_nsig
244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */ 244# define EV_NSIG (_sys_nsig) /* Solaris 2.5 */
245#else 245#else
246# error "unable to find value for NSIG, please report" 246# define EV_NSIG (8 * sizeof (sigset_t) + 1)
247/* to make it compile regardless, just remove the above line, */
248/* but consider reporting it, too! :) */
249# define EV_NSIG 65
250#endif 247#endif
251 248
252#ifndef EV_USE_FLOOR 249#ifndef EV_USE_FLOOR
253# define EV_USE_FLOOR 0 250# define EV_USE_FLOOR 0
254#endif 251#endif
255 252
256#ifndef EV_USE_CLOCK_SYSCALL 253#ifndef EV_USE_CLOCK_SYSCALL
257# if __linux && __GLIBC__ >= 2 254# if __linux && __GLIBC__ == 2 && __GLIBC_MINOR__ < 17
258# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS 255# define EV_USE_CLOCK_SYSCALL EV_FEATURE_OS
259# else 256# else
260# define EV_USE_CLOCK_SYSCALL 0 257# define EV_USE_CLOCK_SYSCALL 0
261# endif 258# endif
262#endif 259#endif
… …
355# define EV_USE_4HEAP EV_FEATURE_DATA 352# define EV_USE_4HEAP EV_FEATURE_DATA
356#endif 353#endif
357 354
358#ifndef EV_HEAP_CACHE_AT 355#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 356# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
357#endif
358
359#ifdef ANDROID
360/* supposedly, android doesn't typedef fd_mask */
361# undef EV_USE_SELECT
362# define EV_USE_SELECT 0
363/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
364# undef EV_USE_CLOCK_SYSCALL
365# define EV_USE_CLOCK_SYSCALL 0
366#endif
367
368/* aix's poll.h seems to cause lots of trouble */
369#ifdef _AIX
370/* AIX has a completely broken poll.h header */
371# undef EV_USE_POLL
372# define EV_USE_POLL 0
360#endif 373#endif
361 374
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 375/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */
363/* which makes programs even slower. might work on other unices, too. */ 376/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 377#if EV_USE_CLOCK_SYSCALL
… …
372# define EV_USE_CLOCK_SYSCALL 0 385# define EV_USE_CLOCK_SYSCALL 0
373# endif 386# endif
374#endif 387#endif
375 388
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 389/* this block fixes any misconfiguration where we know we run into trouble otherwise */
377
378#ifdef _AIX
379/* AIX has a completely broken poll.h header */
380# undef EV_USE_POLL
381# define EV_USE_POLL 0
382#endif
383 390
384#ifndef CLOCK_MONOTONIC 391#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 392# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 393# define EV_USE_MONOTONIC 0
387#endif 394#endif
… …
505 512
506#ifndef ECB_H 513#ifndef ECB_H
507#define ECB_H 514#define ECB_H
508 515
509/* 16 bits major, 16 bits minor */ 516/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010002 517#define ECB_VERSION 0x00010003
511 518
512#ifdef _WIN32 519#ifdef _WIN32
513 typedef signed char int8_t; 520 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 521 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 522 typedef signed short int16_t;
… …
539 #else 546 #else
540 #define ECB_PTRSIZE 4 547 #define ECB_PTRSIZE 4
541 #endif 548 #endif
542#endif 549#endif
543 550
551/* work around x32 idiocy by defining proper macros */
552#if __x86_64 || _M_AMD64
553 #if _ILP32
554 #define ECB_AMD64_X32 1
555 #else
556 #define ECB_AMD64 1
557 #endif
558#endif
559
544/* many compilers define _GNUC_ to some versions but then only implement 560/* many compilers define _GNUC_ to some versions but then only implement
545 * what their idiot authors think are the "more important" extensions, 561 * what their idiot authors think are the "more important" extensions,
546 * causing enormous grief in return for some better fake benchmark numbers. 562 * causing enormous grief in return for some better fake benchmark numbers.
547 * or so. 563 * or so.
548 * we try to detect these and simply assume they are not gcc - if they have 564 * we try to detect these and simply assume they are not gcc - if they have
… …
608 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory") 624 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
609 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 625 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
610 #elif defined __s390__ || defined __s390x__ 626 #elif defined __s390__ || defined __s390x__
611 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 627 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
612 #elif defined __mips__ 628 #elif defined __mips__
629 /* GNU/Linux emulates sync on mips1 architectures, so we force its use */
630 /* anybody else who still uses mips1 is supposed to send in their version, with detection code. */
613 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : "memory") 631 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
614 #elif defined __alpha__ 632 #elif defined __alpha__
615 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 633 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
616 #elif defined __hppa__ 634 #elif defined __hppa__
617 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 635 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
618 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 636 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
619 #elif defined __ia64__ 637 #elif defined __ia64__
620 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
639 #elif defined __m68k__
640 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
641 #elif defined __m88k__
642 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
643 #elif defined __sh__
644 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
621 #endif 645 #endif
622 #endif 646 #endif
623#endif 647#endif
624 648
625#ifndef ECB_MEMORY_FENCE 649#ifndef ECB_MEMORY_FENCE
… …
1032 || defined __s390__ || defined __s390x__ \ 1056 || defined __s390__ || defined __s390x__ \
1033 || defined __mips__ \ 1057 || defined __mips__ \
1034 || defined __alpha__ \ 1058 || defined __alpha__ \
1035 || defined __hppa__ \ 1059 || defined __hppa__ \
1036 || defined __ia64__ \ 1060 || defined __ia64__ \
1061 || defined __m68k__ \
1062 || defined __m88k__ \
1063 || defined __sh__ \
1037 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 1064 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1038 #define ECB_STDFP 1 1065 #define ECB_STDFP 1
1039 #include <string.h> /* for memcpy */ 1066 #include <string.h> /* for memcpy */
1040#else 1067#else
1041 #define ECB_STDFP 0 1068 #define ECB_STDFP 0
1042 #include <math.h> /* for frexp*, ldexp* */
1043#endif 1069#endif
1044 1070
1045#ifndef ECB_NO_LIBM 1071#ifndef ECB_NO_LIBM
1072
1073 #include <math.h> /* for frexp*, ldexp*, INFINITY, NAN */
1074
1075 #ifdef NEN
1076 #define ECB_NAN NAN
1077 #else
1078 #define ECB_NAN INFINITY
1079 #endif
1080
1081 /* converts an ieee half/binary16 to a float */
1082 ecb_function_ float ecb_binary16_to_float (uint16_t x) ecb_const;
1083 ecb_function_ float
1084 ecb_binary16_to_float (uint16_t x)
1085 {
1086 int e = (x >> 10) & 0x1f;
1087 int m = x & 0x3ff;
1088 float r;
1089
1090 if (!e ) r = ldexpf (m , -24);
1091 else if (e != 31) r = ldexpf (m + 0x400, e - 25);
1092 else if (m ) r = ECB_NAN;
1093 else r = INFINITY;
1094
1095 return x & 0x8000 ? -r : r;
1096 }
1046 1097
1047 /* convert a float to ieee single/binary32 */ 1098 /* convert a float to ieee single/binary32 */
1048 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const; 1099 ecb_function_ uint32_t ecb_float_to_binary32 (float x) ecb_const;
1049 ecb_function_ uint32_t 1100 ecb_function_ uint32_t
1050 ecb_float_to_binary32 (float x) 1101 ecb_float_to_binary32 (float x)
… …
2085 ev_syserr ("(libev) error creating signal/async pipe"); 2136 ev_syserr ("(libev) error creating signal/async pipe");
2086 2137
2087 fd_intern (fds [0]); 2138 fd_intern (fds [0]);
2088 } 2139 }
2089 2140
2090 fd_intern (fds [1]);
2091
2092 evpipe [0] = fds [0]; 2141 evpipe [0] = fds [0];
2093 2142
2094 if (evpipe [1] < 0) 2143 if (evpipe [1] < 0)
2095 evpipe [1] = fds [1]; /* first call, set write fd */ 2144 evpipe [1] = fds [1]; /* first call, set write fd */
2096 else 2145 else
… …
2101 /* so must not be executed on windows */ 2150 /* so must not be executed on windows */
2102 2151
2103 dup2 (fds [1], evpipe [1]); 2152 dup2 (fds [1], evpipe [1]);
2104 close (fds [1]); 2153 close (fds [1]);
2105 } 2154 }
2155
2156 fd_intern (evpipe [1]);
2106 2157
2107 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ); 2158 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
2108 ev_io_start (EV_A_ &pipe_w); 2159 ev_io_start (EV_A_ &pipe_w);
2109 ev_unref (EV_A); /* watcher should not keep loop alive */ 2160 ev_unref (EV_A); /* watcher should not keep loop alive */
2110 } 2161 }
… …
2229 2280
2230void 2281void
2231ev_feed_signal (int signum) EV_THROW 2282ev_feed_signal (int signum) EV_THROW
2232{ 2283{
2233#if EV_MULTIPLICITY 2284#if EV_MULTIPLICITY
2285 EV_P;
2234 ECB_MEMORY_FENCE_ACQUIRE; 2286 ECB_MEMORY_FENCE_ACQUIRE;
2235 EV_P = signals [signum - 1].loop; 2287 EV_A = signals [signum - 1].loop;
2236 2288
2237 if (!EV_A) 2289 if (!EV_A)
2238 return; 2290 return;
2239#endif 2291#endif
2240 2292
… …
2493{ 2545{
2494 return userdata; 2546 return userdata;
2495} 2547}
2496 2548
2497void 2549void
2498ev_set_invoke_pending_cb (EV_P_ void (*invoke_pending_cb)(EV_P)) EV_THROW 2550ev_set_invoke_pending_cb (EV_P_ ev_loop_callback invoke_pending_cb) EV_THROW
2499{ 2551{
2500 invoke_cb = invoke_pending_cb; 2552 invoke_cb = invoke_pending_cb;
2501} 2553}
2502 2554
2503void 2555void
2504ev_set_loop_release_cb (EV_P_ void (*release)(EV_P) EV_THROW, void (*acquire)(EV_P) EV_THROW) EV_THROW 2556ev_set_loop_release_cb (EV_P_ ev_loop_callback_nothrow release, ev_loop_callback_nothrow acquire) EV_THROW
2505{ 2557{
2506 release_cb = release; 2558 release_cb = release;
2507 acquire_cb = acquire; 2559 acquire_cb = acquire;
2508} 2560}
2509#endif 2561#endif
… …
3893# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX) 3945# define EV_INOTIFY_BUFSIZE (sizeof (struct inotify_event) * 2 + NAME_MAX)
3894 3946
3895static void noinline 3947static void noinline
3896infy_add (EV_P_ ev_stat *w) 3948infy_add (EV_P_ ev_stat *w)
3897{ 3949{
3898 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); 3950 w->wd = inotify_add_watch (fs_fd, w->path,
3951 IN_ATTRIB | IN_DELETE_SELF | IN_MOVE_SELF | IN_MODIFY
3952 | IN_CREATE | IN_DELETE | IN_MOVED_FROM | IN_MOVED_TO
3953 | IN_DONT_FOLLOW | IN_MASK_ADD);
3899 3954
3900 if (w->wd >= 0) 3955 if (w->wd >= 0)
3901 { 3956 {
3902 struct statfs sfs; 3957 struct statfs sfs;
3903 3958
… …
3907 3962
3908 if (!fs_2625) 3963 if (!fs_2625)
3909 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL; 3964 w->timer.repeat = w->interval ? w->interval : DEF_STAT_INTERVAL;
3910 else if (!statfs (w->path, &sfs) 3965 else if (!statfs (w->path, &sfs)
3911 && (sfs.f_type == 0x1373 /* devfs */ 3966 && (sfs.f_type == 0x1373 /* devfs */
3967 || sfs.f_type == 0x4006 /* fat */
3968 || sfs.f_type == 0x4d44 /* msdos */
3912 || sfs.f_type == 0xEF53 /* ext2/3 */ 3969 || sfs.f_type == 0xEF53 /* ext2/3 */
3970 || sfs.f_type == 0x72b6 /* jffs2 */
3971 || sfs.f_type == 0x858458f6 /* ramfs */
3972 || sfs.f_type == 0x5346544e /* ntfs */
3913 || sfs.f_type == 0x3153464a /* jfs */ 3973 || sfs.f_type == 0x3153464a /* jfs */
3974 || sfs.f_type == 0x9123683e /* btrfs */
3914 || sfs.f_type == 0x52654973 /* reiser3 */ 3975 || sfs.f_type == 0x52654973 /* reiser3 */
3915 || sfs.f_type == 0x01021994 /* tempfs */ 3976 || sfs.f_type == 0x01021994 /* tmpfs */
3916 || sfs.f_type == 0x58465342 /* xfs */)) 3977 || sfs.f_type == 0x58465342 /* xfs */))
3917 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */ 3978 w->timer.repeat = 0.; /* filesystem is local, kernel new enough */
3918 else 3979 else
3919 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */ 3980 w->timer.repeat = w->interval ? w->interval : NFS_STAT_INTERVAL; /* remote, use reduced frequency */
3920 } 3981 }

Diff Legend

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