diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-02 16:17:05 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-04-02 16:17:05 +0000 |
| commit | e333b5297b8aa6edc95a75e6063840fb3bbe2df9 (patch) | |
| tree | f4aef98b8f9b1730e4353c82ae95b3c8025488d8 | |
| parent | 292934de2f62e6d59113461c7ffbfb6bb5e1be86 (diff) | |
Ensure that contrib/pgstattuple functions respond to cancel interrupts
reasonably promptly, by adding CHECK_FOR_INTERRUPTS in the per-page loops.
Tatsuhito Kasahara
| -rw-r--r-- | contrib/pgstattuple/pgstattuple.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index 989911fdd88..26e37f4df37 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.32.2.1 2009/03/31 22:54:52 tgl Exp $ + * $PostgreSQL: pgsql/contrib/pgstattuple/pgstattuple.c,v 1.32.2.2 2010/04/02 16:17:05 tgl Exp $ * * Copyright (c) 2001,2002 Tatsuo Ishii * @@ -273,6 +273,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo) /* scan the relation */ while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL) { + CHECK_FOR_INTERRUPTS(); + /* must hold a buffer lock to call HeapTupleSatisfiesVisibility */ LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE); @@ -299,6 +301,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo) while (block <= tupblock) { + CHECK_FOR_INTERRUPTS(); + buffer = ReadBuffer(rel, block); LockBuffer(buffer, BUFFER_LOCK_SHARE); stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer)); @@ -310,6 +314,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo) while (block < nblocks) { + CHECK_FOR_INTERRUPTS(); + buffer = ReadBuffer(rel, block); LockBuffer(buffer, BUFFER_LOCK_SHARE); stat.free_space += PageGetHeapFreeSpace((Page) BufferGetPage(buffer)); @@ -465,7 +471,11 @@ pgstat_index(Relation rel, BlockNumber start, pgstat_page pagefn, } for (; blkno < nblocks; blkno++) + { + CHECK_FOR_INTERRUPTS(); + pagefn(&stat, rel, blkno); + } } relation_close(rel, AccessShareLock); |