diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-29 21:31:21 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-12-29 21:31:21 +0000 |
| commit | 7f60b81e1ab7cbb27298e980f25445dfa58d50bb (patch) | |
| tree | f1ace7fa85f8f4037bf254008b41e65c9a7ce7f8 /src/backend/storage/buffer/bufmgr.c | |
| parent | 7d363c4c3376459bc9389b250bc7b70e9cf7aa75 (diff) | |
Fix failure in CreateCheckPoint on some Alpha boxes --- it's not OK to
assume that TAS() will always succeed the first time, even if the lock
is known to be free. Also, make sure that code will eventually time out
and report a stuck spinlock, rather than looping forever. Small cleanups
in s_lock.h, too.
Diffstat (limited to 'src/backend/storage/buffer/bufmgr.c')
| -rw-r--r-- | src/backend/storage/buffer/bufmgr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c index 2adea99e82c..d97ddfdbff4 100644 --- a/src/backend/storage/buffer/bufmgr.c +++ b/src/backend/storage/buffer/bufmgr.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.100 2000/12/28 13:00:21 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/storage/buffer/bufmgr.c,v 1.101 2000/12/29 21:31:21 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1987,7 +1987,7 @@ LockBuffer(Buffer buffer, int mode) while (buf->ri_lock || buf->w_lock) { S_UNLOCK(&(buf->cntx_lock)); - s_lock_sleep(i++); + S_LOCK_SLEEP(&(buf->cntx_lock), i++); S_LOCK(&(buf->cntx_lock)); } (buf->r_locks)++; @@ -2013,7 +2013,7 @@ LockBuffer(Buffer buffer, int mode) buf->ri_lock = true; } S_UNLOCK(&(buf->cntx_lock)); - s_lock_sleep(i++); + S_LOCK_SLEEP(&(buf->cntx_lock), i++); S_LOCK(&(buf->cntx_lock)); } buf->w_lock = true; |