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

Comparing libev/ev.c (file contents):
Revision 1.388 by root, Fri Jul 29 12:17:26 2011 UTC vs.
Revision 1.390 by root, Thu Aug 4 11:58:02 2011 UTC

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 _MSC_VER >= 1400 && 0 /* TODO: only true when using volatiles */ 516 #elif _MSC_VER >= 1400 /* VC++ 2005 */
517 #pragma intrinsic(_ReadBarrier,_WriteBarrier,_ReadWriteBarrier)
517 #define ECB_MEMORY_FENCE do { } while (0) 518 #define ECB_MEMORY_FENCE _ReadWriteBarrier ()
518 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 519 #define ECB_MEMORY_FENCE_ACQUIRE _ReadWriteBarrier () /* according to msdn, _ReadBarrier is not a load fence */
519 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 520 #define ECB_MEMORY_FENCE_RELEASE _WriteBarrier ()
520 #elif defined(_WIN32) 521 #elif defined(_WIN32)
521 #include <WinNT.h> 522 #include <WinNT.h>
522 #define ECB_MEMORY_FENCE MemoryBarrier () 523 #define ECB_MEMORY_FENCE MemoryBarrier ()
523 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE 524 #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE
524 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE 525 #define ECB_MEMORY_FENCE_RELEASE ECB_MEMORY_FENCE
2617 time_update (EV_A_ 1e100); 2618 time_update (EV_A_ 1e100);
2618 2619
2619 /* from now on, we want a pipe-wake-up */ 2620 /* from now on, we want a pipe-wake-up */
2620 pipe_write_wanted = 1; 2621 pipe_write_wanted = 1;
2621 2622
2622 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 */
2623 2624
2624 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped))) 2625 if (expect_true (!(flags & EVRUN_NOWAIT || idleall || !activecnt || pipe_write_skipped)))
2625 { 2626 {
2626 waittime = MAX_BLOCKTIME; 2627 waittime = MAX_BLOCKTIME;
2627 2628
4029 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i])); 4030 cb (EV_A_ EV_PERIODIC, ANHE_w (periodics [i]));
4030#endif 4031#endif
4031 4032
4032#if EV_IDLE_ENABLE 4033#if EV_IDLE_ENABLE
4033 if (types & EV_IDLE) 4034 if (types & EV_IDLE)
4034 for (j = NUMPRI; i--; ) 4035 for (j = NUMPRI; j--; )
4035 for (i = idlecnt [j]; i--; ) 4036 for (i = idlecnt [j]; i--; )
4036 cb (EV_A_ EV_IDLE, idles [j][i]); 4037 cb (EV_A_ EV_IDLE, idles [j][i]);
4037#endif 4038#endif
4038 4039
4039#if EV_FORK_ENABLE 4040#if EV_FORK_ENABLE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines