From 2154452ca43f7f8e76279fb5b973b59d52a81606 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 2 Apr 2010 16:17:31 +0000 Subject: [PATCH] Ensure that contrib/pgstattuple functions respond to cancel interrupts reasonably promptly, by adding CHECK_FOR_INTERRUPTS in the per-page loops. Tatsuhito Kasahara --- contrib/pgstattuple/pgstattuple.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c index bac41ceabc5..aa6373d36e1 100644 --- a/contrib/pgstattuple/pgstattuple.c +++ b/contrib/pgstattuple/pgstattuple.c @@ -1,5 +1,5 @@ /* - * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.12.4.2 2009/03/31 22:56:28 tgl Exp $ + * $Header: /cvsroot/pgsql/contrib/pgstattuple/pgstattuple.c,v 1.12.4.3 2010/04/02 16:17:31 tgl Exp $ * * Copyright (c) 2001,2002 Tatsuo Ishii * @@ -29,6 +29,7 @@ #include "access/heapam.h" #include "access/transam.h" #include "catalog/namespace.h" +#include "miscadmin.h" #include "utils/builtins.h" @@ -149,6 +150,8 @@ pgstattuple_real(Relation rel) { uint16 sv_infomask; + CHECK_FOR_INTERRUPTS(); + sv_infomask = tuple->t_data->t_infomask; if (HeapTupleSatisfiesNow(tuple->t_data)) { @@ -173,6 +176,8 @@ pgstattuple_real(Relation rel) while (block <= tupblock) { + CHECK_FOR_INTERRUPTS(); + buffer = ReadBuffer(rel, block); free_space += PageGetFreeSpace((Page) BufferGetPage(buffer)); ReleaseBuffer(buffer); @@ -183,6 +188,8 @@ pgstattuple_real(Relation rel) while (block < nblocks) { + CHECK_FOR_INTERRUPTS(); + buffer = ReadBuffer(rel, block); free_space += PageGetFreeSpace((Page) BufferGetPage(buffer)); ReleaseBuffer(buffer);