Author: Armin Rigo <[email protected]>
Branch:
Changeset: r271:b5764c2a5742
Date: 2013-06-25 11:25 +0200
http://bitbucket.org/pypy/stmgc/changeset/b5764c2a5742/
Log: Use stm_pointer_equal().
diff --git a/c4/demo2.c b/c4/demo2.c
--- a/c4/demo2.c
+++ b/c4/demo2.c
@@ -97,23 +97,9 @@
r_current = (struct node*)stm_read_barrier((gcptr)r_next);
r_next = (struct node*)stm_read_barrier((gcptr)tmp);
}
- // results from consecutive read_barriers can differ. needs Ptr_Eq()
- int i = 0;
- while (!(stm_read_barrier((gcptr)r_prev->next) ==
- stm_read_barrier((gcptr)r_current) &&
- stm_read_barrier((gcptr)r_current->next) ==
- stm_read_barrier((gcptr)r_next))) {
- asm volatile ("pause":::"memory"); /* smp_spinloop() */
- i++;
- assert(i < 1000000);
- }
- // for now:
- assert(((nodeptr)stm_read_barrier((gcptr)r_prev->next))->value
- == r_current->value
- &&
- ((nodeptr)stm_read_barrier((gcptr)r_current->next))->value
- == r_next->value);
-
+ assert(stm_pointer_equal((gcptr)r_prev->next, (gcptr)r_current));
+ assert(stm_pointer_equal((gcptr)r_current->next, (gcptr)r_next));
+
r_prev = r_current;
r_current = r_next;
r_next = r_next->next;
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
