From 067e40cc6d1c9254c68e7ad29e7a07f14daa7eaa Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 14 Jun 2006 01:24:14 +0000 Subject: [PATCH] Do a CHECK_FOR_INTERRUPTS immediately before terminating a fastpath function call. Previously, there may have been no CHECK_FOR_INTERRUPTS at all in the fastpath code path, making it impossible to cancel an operation such as \lo_import externally. This addition doesn't ensure you can cancel, since your SIGINT may arrive while the backend is idle waiting for the client, but it gives the largest window we can easily provide. Noted while experimenting with new control-C code for psql. --- src/backend/tcop/fastpath.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c index 3f769d9a9a..c0ac339eab 100644 --- a/src/backend/tcop/fastpath.c +++ b/src/backend/tcop/fastpath.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.87 2006/06/11 15:49:28 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.88 2006/06/14 01:24:14 tgl Exp $ * * NOTES * This cruft is the server side of PQfn. @@ -382,6 +382,9 @@ HandleFunctionRequest(StringInfo msgBuf) retval = (Datum) 0; } + /* ensure we do at least one CHECK_FOR_INTERRUPTS per function call */ + CHECK_FOR_INTERRUPTS(); + SendFunctionResult(retval, fcinfo.isnull, fip->rettype, rformat); return 0; -- 2.11.0