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

Comparing libev/ev.c (file contents):
Revision 1.386 by root, Wed Jul 20 01:04:20 2011 UTC vs.
Revision 1.389 by root, Wed Aug 3 15:31:23 2011 UTC

… …
497#ifndef ECB_MEMORY_FENCE 497#ifndef ECB_MEMORY_FENCE
498 #if ECB_GCC_VERSION(2,5) 498 #if ECB_GCC_VERSION(2,5)
499 #if __x86 499 #if __x86
500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory") 500 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, -1(%%esp)" : : : "memory")
501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 501 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 502 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE /* better be safe than sorry */
503 #elif __amd64 503 #elif __amd64
504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory") 504 #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : "memory")
505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory") 505 #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : "memory")
506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") 506 #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence")
507 #endif 507 #endif
… …
511#ifndef ECB_MEMORY_FENCE 511#ifndef ECB_MEMORY_FENCE
512 #if ECB_GCC_VERSION(4,4) 512 #if ECB_GCC_VERSION(4,4)
513 #define ECB_MEMORY_FENCE __sync_synchronize () 513 #define ECB_MEMORY_FENCE __sync_synchronize ()
514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); }) 514 #define ECB_MEMORY_FENCE_ACQUIRE ({ char dummy = 0; __sync_lock_test_and_set (&dummy, 1); })
515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); }) 515 #define ECB_MEMORY_FENCE_RELEASE ({ char dummy = 1; __sync_lock_release (&dummy ); })
516 #elif defined(_WIN32) && defined(MemoryBarrier) 516 #elif _MSC_VER >= 1400 /* VC++ 2005 */
517 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
518 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
519 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
520 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
521 #elif defined(_WIN32)
522 #include <WinNT.h>
517 #define ECB_MEMORY_FENCE MemoryBarrier () 523 #define ECB_MEMORY_FENCE MemoryBarrier ()
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 524 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 525 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
520 #endif 526 #endif
521#endif 527#endif
… …
1456 1462
1457inline_speed void 1463inline_speed void
1458evpipe_write (EV_P_ EV_ATOMIC_T *flag) 1464evpipe_write (EV_P_ EV_ATOMIC_T *flag)
1459{ 1465{
1460 if (expect_true (*flag)) 1466 if (expect_true (*flag))
1461 /*return*//*D*/; 1467 return;
1462 1468
1463 *flag = 1; 1469 *flag = 1;
1464 1470
1465 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */ 1471 ECB_MEMORY_FENCE_RELEASE; /* make sure flag is visible before the wakeup */
1466 1472
… …
2612 time_update (EV_A_ 1e100); 2618 time_update (EV_A_ 1e100);
2613 2619
2614 /* from now on, we want a pipe-wake-up */ 2620 /* from now on, we want a pipe-wake-up */
2615 pipe_write_wanted = 1; 2621 pipe_write_wanted = 1;
2616 2622
2617 ECB_MEMORY_FENCE; /* amke sure pipe_write_wanted is visible before we check for potential skips */ 2623 ECB_MEMORY_FENCE; /* make sure pipe_write_wanted is visible before we check for potential skips */
2618 2624
2619 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped))) 2625 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2620 { 2626 {
2621 waittime = MAX_BLOCKTIME; 2627 waittime = MAX_BLOCKTIME;
2622 2628

Diff Legend

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