summaryrefslogtreecommitdiff
path: root/src/backend/access/transam/xact.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2001-01-19 22:08:47 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2001-01-19 22:08:47 +0000
commit6ce0ed2813ddcbb41a7199222fe0d2109fc5a5b4 (patch)
tree65e761d2289a6f4a88469fc7fdfc1dfcdfa03a90 /src/backend/access/transam/xact.c
parent75815c31009d84171d46bcaef603bcd0cecd4446 (diff)
Make critical sections (elog->crash) and interrupt holdoff sections
into distinct concepts, per recent discussion on pghackers.
Diffstat (limited to 'src/backend/access/transam/xact.c')
-rw-r--r--src/backend/access/transam/xact.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 01b4d5643c1..fb82e0fbc3b 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.94 2001/01/18 18:33:45 vadim Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.95 2001/01/19 22:08:46 tgl Exp $
*
* NOTES
* Transaction aborts can now occur two ways:
@@ -1016,7 +1016,7 @@ CommitTransaction(void)
elog(NOTICE, "CommitTransaction and not in in-progress state ");
/* Prevent cancel/die interrupt while cleaning up */
- START_CRIT_SECTION();
+ HOLD_INTERRUPTS();
/* ----------------
* Tell the trigger manager that this transaction is about to be
@@ -1087,7 +1087,7 @@ CommitTransaction(void)
*/
s->state = TRANS_DEFAULT;
- END_CRIT_SECTION();
+ RESUME_INTERRUPTS();
}
/* --------------------------------
@@ -1101,7 +1101,7 @@ AbortTransaction(void)
TransactionState s = CurrentTransactionState;
/* Prevent cancel/die interrupt while cleaning up */
- START_CRIT_SECTION();
+ HOLD_INTERRUPTS();
/*
* Let others to know about no transaction in progress - vadim
@@ -1133,7 +1133,7 @@ AbortTransaction(void)
*/
if (s->state == TRANS_DISABLED)
{
- END_CRIT_SECTION();
+ RESUME_INTERRUPTS();
return;
}
@@ -1185,7 +1185,7 @@ AbortTransaction(void)
* State remains TRANS_ABORT until CleanupTransaction().
* ----------------
*/
- END_CRIT_SECTION();
+ RESUME_INTERRUPTS();
}
/* --------------------------------