database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-17 17:02:08 +03:00
Code Activity

Remove remnants of ImmediateInterruptOK handling.

Browse Source 
Now that nothing sets ImmediateInterruptOK to true anymore, we can
remove all the supporting code.

Reviewed-By: Heikki Linnakangas
This commit is contained in:
Andres Freund
2015-02-03 23:25:47 +01:00
parent d06995710b
commit 2505ce0be0
7 changed files with 7 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/backend/tcop/postgres.c
View File

@ -2648,13 +2648,6 @@ die(SIGNAL_ARGS)
{
InterruptPending = true;
ProcDiePending = true;
/*
* If we're waiting for input or a lock so that it's safe to
* interrupt, service the interrupt immediately
*/
if (ImmediateInterruptOK)
ProcessInterrupts();
}
/* If we're still here, waken anything waiting on the process latch */
@ -2688,13 +2681,6 @@ StatementCancelHandler(SIGNAL_ARGS)
{
InterruptPending = true;
QueryCancelPending = true;
/*
* If we're waiting for input or a lock so that it's safe to
* interrupt, service the interrupt immediately
*/
if (ImmediateInterruptOK)
ProcessInterrupts();
}
/* If we're still here, waken anything waiting on the process latch */
@ -2835,13 +2821,6 @@ RecoveryConflictInterrupt(ProcSignalReason reason)
*/
if (reason == PROCSIG_RECOVERY_CONFLICT_DATABASE)
RecoveryConflictRetryable = false;
/*
* If we're waiting for input or a lock so that it's safe to
* interrupt, service the interrupt immediately.
*/
if (ImmediateInterruptOK)
ProcessInterrupts();
}
/*
@ -2875,7 +2854,6 @@ ProcessInterrupts(void)
{
ProcDiePending = false;
QueryCancelPending = false; /* ProcDie trumps QueryCancel */
ImmediateInterruptOK = false; /* not idle anymore */
LockErrorCleanup();
/* As in quickdie, don't risk sending to client during auth */
if (ClientAuthInProgress && whereToSendOutput == DestRemote)
@ -2914,7 +2892,6 @@ ProcessInterrupts(void)
if (ClientConnectionLost)
{
QueryCancelPending = false; /* lost connection trumps QueryCancel */
ImmediateInterruptOK = false; /* not idle anymore */
LockErrorCleanup();
/* don't send to client, we already know the connection to be dead. */
whereToSendOutput = DestNone;
@ -2932,7 +2909,6 @@ ProcessInterrupts(void)
if (RecoveryConflictPending && DoingCommandRead)
{
QueryCancelPending = false; /* this trumps QueryCancel */
ImmediateInterruptOK = false; /* not idle anymore */
RecoveryConflictPending = false;
LockErrorCleanup();
pgstat_report_recovery_conflict(RecoveryConflictReason);
@ -2970,7 +2946,6 @@ ProcessInterrupts(void)
*/
if (get_timeout_indicator(LOCK_TIMEOUT, true))
{
ImmediateInterruptOK = false; /* not idle anymore */
(void) get_timeout_indicator(STATEMENT_TIMEOUT, true);
LockErrorCleanup();
ereport(ERROR,
@ -2979,7 +2954,6 @@ ProcessInterrupts(void)
}
if (get_timeout_indicator(STATEMENT_TIMEOUT, true))
{
ImmediateInterruptOK = false; /* not idle anymore */
LockErrorCleanup();
ereport(ERROR,
(errcode(ERRCODE_QUERY_CANCELED),
@ -2987,7 +2961,6 @@ ProcessInterrupts(void)
}
if (IsAutoVacuumWorkerProcess())
{
ImmediateInterruptOK = false; /* not idle anymore */
LockErrorCleanup();
ereport(ERROR,
(errcode(ERRCODE_QUERY_CANCELED),
@ -2995,7 +2968,6 @@ ProcessInterrupts(void)
}
if (RecoveryConflictPending)
{
ImmediateInterruptOK = false; /* not idle anymore */
RecoveryConflictPending = false;
LockErrorCleanup();
pgstat_report_recovery_conflict(RecoveryConflictReason);
@ -3012,7 +2984,6 @@ ProcessInterrupts(void)
*/
if (!DoingCommandRead)
{
ImmediateInterruptOK = false; /* not idle anymore */
LockErrorCleanup();
ereport(ERROR,
(errcode(ERRCODE_QUERY_CANCELED),