Author: Remi Meier <remi.me...@gmail.com> Branch: stmgc-c8 Changeset: r83556:ddb53f437889 Date: 2016-04-07 10:27 +0300 http://bitbucket.org/pypy/pypy/changeset/ddb53f437889/
Log: missing renaming to stm_spinlock diff --git a/rpython/translator/c/src/mem.c b/rpython/translator/c/src/mem.c --- a/rpython/translator/c/src/mem.c +++ b/rpython/translator/c/src/mem.c @@ -64,8 +64,8 @@ // spinlock_acquire/spinlock_release defined in ../../stm/src_stm/stmgcintf.h static uint8_t pypy_debug_alloc_lock = 0; #else -# define spinlock_acquire(lock) /* nothing */ -# define spinlock_release(lock) /* nothing */ +# define stm_spinlock_acquire(lock) /* nothing */ +# define stm_spinlock_release(lock) /* nothing */ #endif RPY_EXTERN @@ -75,10 +75,10 @@ RPyAssert(p, "out of memory"); p->addr = addr; p->funcname = funcname; - spinlock_acquire(pypy_debug_alloc_lock); + stm_spinlock_acquire(pypy_debug_alloc_lock); p->next = pypy_debug_alloc_list; pypy_debug_alloc_list = p; - spinlock_release(pypy_debug_alloc_lock); + stm_spinlock_release(pypy_debug_alloc_lock); } RPY_EXTERN @@ -87,18 +87,18 @@ struct pypy_debug_alloc_s **p; if (!addr) return 1; - spinlock_acquire(pypy_debug_alloc_lock); + stm_spinlock_acquire(pypy_debug_alloc_lock); for (p = &pypy_debug_alloc_list; *p; p = &((*p)->next)) if ((*p)->addr == addr) { struct pypy_debug_alloc_s *dying; dying = *p; *p = dying->next; - spinlock_release(pypy_debug_alloc_lock); + stm_spinlock_release(pypy_debug_alloc_lock); free(dying); return 1; } - spinlock_release(pypy_debug_alloc_lock); + stm_spinlock_release(pypy_debug_alloc_lock); return 0; } @@ -114,7 +114,7 @@ { long count = 0; struct pypy_debug_alloc_s *p; - spinlock_acquire(pypy_debug_alloc_lock); + stm_spinlock_acquire(pypy_debug_alloc_lock); for (p = pypy_debug_alloc_list; p; p = p->next) count++; if (count > 0) @@ -130,7 +130,7 @@ else fprintf(stderr, " (use PYPY_ALLOC=1 to see the list)\n"); } - spinlock_release(pypy_debug_alloc_lock); + stm_spinlock_release(pypy_debug_alloc_lock); } #endif /* RPY_ASSERT */ _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit