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

Comparing libev/ev.c (file contents):
Revision 1.451 by root, Tue Jan 22 05:18:28 2013 UTC vs.
Revision 1.457 by root, Thu Sep 5 18:45:29 2013 UTC

… …
357 357
358#ifndef EV_HEAP_CACHE_AT 358#ifndef EV_HEAP_CACHE_AT
359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA 359# define EV_HEAP_CACHE_AT EV_FEATURE_DATA
360#endif 360#endif
361 361
362#ifdef ANDROID
363/* supposedly, android doesn't typedef fd_mask */
364# undef EV_USE_SELECT
365# define EV_USE_SELECT 0
366/* supposedly, we need to include syscall.h, not sys/syscall.h, so just disable */
367# undef EV_USE_CLOCK_SYSCALL
368# define EV_USE_CLOCK_SYSCALL 0
369#endif
370
371/* aix's poll.h seems to cause lots of trouble */
372#ifdef _AIX
373/* AIX has a completely broken poll.h header */
374# undef EV_USE_POLL
375# define EV_USE_POLL 0
376#endif
377
362/* on linux, we can use a (slow) syscall to avoid a dependency on pthread, */ 378/* 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. */ 379/* which makes programs even slower. might work on other unices, too. */
364#if EV_USE_CLOCK_SYSCALL 380#if EV_USE_CLOCK_SYSCALL
365# include <sys/syscall.h> 381# include <sys/syscall.h>
366# ifdef SYS_clock_gettime 382# ifdef SYS_clock_gettime
… …
372# define EV_USE_CLOCK_SYSCALL 0 388# define EV_USE_CLOCK_SYSCALL 0
373# endif 389# endif
374#endif 390#endif
375 391
376/* this block fixes any misconfiguration where we know we run into trouble otherwise */ 392/* 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 393
384#ifndef CLOCK_MONOTONIC 394#ifndef CLOCK_MONOTONIC
385# undef EV_USE_MONOTONIC 395# undef EV_USE_MONOTONIC
386# define EV_USE_MONOTONIC 0 396# define EV_USE_MONOTONIC 0
387#endif 397#endif
… …
505 515
506#ifndef ECB_H 516#ifndef ECB_H
507#define ECB_H 517#define ECB_H
508 518
509/* 16 bits major, 16 bits minor */ 519/* 16 bits major, 16 bits minor */
510#define ECB_VERSION 0x00010002 520#define ECB_VERSION 0x00010003
511 521
512#ifdef _WIN32 522#ifdef _WIN32
513 typedef signed char int8_t; 523 typedef signed char int8_t;
514 typedef unsigned char uint8_t; 524 typedef unsigned char uint8_t;
515 typedef signed short int16_t; 525 typedef signed short int16_t;
… …
539 #else 549 #else
540 #define ECB_PTRSIZE 4 550 #define ECB_PTRSIZE 4
541 #endif 551 #endif
542#endif 552#endif
543 553
554/* work around x32 idiocy by defining proper macros */
555#if __x86_64 || _M_AMD64
556 #if __ILP32
557 #define ECB_AMD64_X32 1
558 #else
559 #define ECB_AMD64 1
560 #endif
561#endif
562
544/* many compilers define _GNUC_ to some versions but then only implement 563/* many compilers define _GNUC_ to some versions but then only implement
545 * what their idiot authors think are the "more important" extensions, 564 * what their idiot authors think are the "more important" extensions,
546 * causing enormous grief in return for some better fake benchmark numbers. 565 * causing enormous grief in return for some better fake benchmark numbers.
547 * or so. 566 * or so.
548 * we try to detect these and simply assume they are not gcc - if they have 567 * 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") 627 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("membar #LoadStore | #LoadLoad" : : : "memory")
609 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore") 628 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar #LoadStore | #StoreStore")
610 #elif defined __s390__ || defined __s390x__ 629 #elif defined __s390__ || defined __s390x__
611 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory") 630 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bcr 15,0" : : : "memory")
612 #elif defined __mips__ 631 #elif defined __mips__
632 /* GNU/Linux emulates sync on mips1 architectures, so we force it's use */
633 /* 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") 634 #define ECB_MEMORY_FENCE __asm__ __volatile__ (".set mips2; sync; .set mips0" : : : "memory")
614 #elif defined __alpha__ 635 #elif defined __alpha__
615 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory") 636 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mb" : : : "memory")
616 #elif defined __hppa__ 637 #elif defined __hppa__
617 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory") 638 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
618 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("") 639 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
619 #elif defined __ia64__ 640 #elif defined __ia64__
620 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory") 641 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mf" : : : "memory")
642 #elif defined __m68k__
643 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
644 #elif defined __m88k__
645 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("tb1 0,%%r0,128" : : : "memory")
646 #elif defined __sh__
647 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("" : : : "memory")
621 #endif 648 #endif
622 #endif 649 #endif
623#endif 650#endif
624 651
625#ifndef ECB_MEMORY_FENCE 652#ifndef ECB_MEMORY_FENCE
… …
1032 || defined __s390__ || defined __s390x__ \ 1059 || defined __s390__ || defined __s390x__ \
1033 || defined __mips__ \ 1060 || defined __mips__ \
1034 || defined __alpha__ \ 1061 || defined __alpha__ \
1035 || defined __hppa__ \ 1062 || defined __hppa__ \
1036 || defined __ia64__ \ 1063 || defined __ia64__ \
1064 || defined __m68k__ \
1065 || defined __m88k__ \
1066 || defined __sh__ \
1037 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64 1067 || defined _M_IX86 || defined _M_AMD64 || defined _M_IA64
1038 #define ECB_STDFP 1 1068 #define ECB_STDFP 1
1039 #include <string.h> /* for memcpy */ 1069 #include <string.h> /* for memcpy */
1040#else 1070#else
1041 #define ECB_STDFP 0 1071 #define ECB_STDFP 0
… …
2085 ev_syserr ("(libev) error creating signal/async pipe"); 2115 ev_syserr ("(libev) error creating signal/async pipe");
2086 2116
2087 fd_intern (fds [0]); 2117 fd_intern (fds [0]);
2088 } 2118 }
2089 2119
2090 fd_intern (fds [1]);
2091
2092 evpipe [0] = fds [0]; 2120 evpipe [0] = fds [0];
2093 2121
2094 if (evpipe [1] < 0) 2122 if (evpipe [1] < 0)
2095 evpipe [1] = fds [1]; /* first call, set write fd */ 2123 evpipe [1] = fds [1]; /* first call, set write fd */
2096 else 2124 else
… …
2101 /* so must not be executed on windows */ 2129 /* so must not be executed on windows */
2102 2130
2103 dup2 (fds [1], evpipe [1]); 2131 dup2 (fds [1], evpipe [1]);
2104 close (fds [1]); 2132 close (fds [1]);
2105 } 2133 }
2134
2135 fd_intern (evpipe [1]);
2106 2136
2107 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ); 2137 ev_io_set (&pipe_w, evpipe [0] < 0 ? evpipe [1] : evpipe [0], EV_READ);
2108 ev_io_start (EV_A_ &pipe_w); 2138 ev_io_start (EV_A_ &pipe_w);
2109 ev_unref (EV_A); /* watcher should not keep loop alive */ 2139 ev_unref (EV_A); /* watcher should not keep loop alive */
2110 } 2140 }
… …
2229 2259
2230void 2260void
2231ev_feed_signal (int signum) EV_THROW 2261ev_feed_signal (int signum) EV_THROW
2232{ 2262{
2233#if EV_MULTIPLICITY 2263#if EV_MULTIPLICITY
2264 EV_P;
2234 ECB_MEMORY_FENCE_ACQUIRE; 2265 ECB_MEMORY_FENCE_ACQUIRE;
2235 EV_P = signals [signum - 1].loop; 2266 EV_A = signals [signum - 1].loop;
2236 2267
2237 if (!EV_A) 2268 if (!EV_A)
2238 return; 2269 return;
2239#endif 2270#endif
2240 2271

Diff Legend

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