NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitc77a29a

committed

Substantial rewrite of async.c to avoid problems with non-reentrant stdio

and possibly other problems. Minor changes in xact.c and postgres.c'smain loop to support new handling of async NOTIFY.

1 parente7e027a commitc77a29aCopy full SHA for c77a29a

File tree

7 files changed

+645

-511

lines changed

src
- backend
  - access/transam
    - xact.c
  - commands
    - async.c
  - tcop
    - postgres.c
  - utils/misc
    - trace.c
- include
  - access
    - xact.h
  - commands
    - async.h
  - utils
    - trace.h

7 files changed

+645

-511

lines changed

`‎src/backend/access/transam/xact.c`

Lines changed: 29 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.23 1998/09/01 04:27:19 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.24 1998/10/06 02:39:58 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`* NOTES`
`13`	`13`	`*Transaction aborts can now occur two ways:`
`@@ -901,6 +901,9 @@ CommitTransaction()`
`901`	`901`	`/* handle commit for large objects [ PA, 7/17/98 ] */`
`902`	`902`	`_lo_commit();`
`903`	`903`
	`904`	`+/* NOTIFY commit must also come before lower-level cleanup */`
	`905`	`+AtCommit_Notify();`
	`906`	`+`
`904`	`907`	`CloseSequences();`
`905`	`908`	`DestroyTempRels();`
`906`	`909`	`AtEOXact_portals();`
`@@ -916,10 +919,6 @@ CommitTransaction()`
`916`	`919`	`* ----------------`
`917`	`920`	`*/`
`918`	`921`	`s->state=TRANS_DEFAULT;`
`919`		`-{/* want this after commit */`
`920`		`-if (IsNormalProcessingMode())`
`921`		`-Async_NotifyAtCommit();`
`922`		`-}`
`923`	`922`
`924`	`923`	`/*`
`925`	`924`	`* Let others to know about no transaction in progress - vadim`
`@@ -967,6 +966,7 @@ AbortTransaction()`
`967`	`966`	`*do abort processing`
`968`	`967`	`* ----------------`
`969`	`968`	`*/`
	`969`	`+AtAbort_Notify();`
`970`	`970`	`CloseSequences();`
`971`	`971`	`AtEOXact_portals();`
`972`	`972`	`RecordTransactionAbort();`
`@@ -982,17 +982,6 @@ AbortTransaction()`
`982`	`982`	`* ----------------`
`983`	`983`	`*/`
`984`	`984`	`s->state=TRANS_DEFAULT;`
`985`		`-{`
`986`		`-`
`987`		`-/*`
`988`		`- * We need to do this in case another process notified us while we`
`989`		`- * are in the middle of an aborted transaction. We need to notify`
`990`		`- * our frontend after we finish the current transaction. -- jw,`
`991`		`- * 1/3/94`
`992`		`- */`
`993`		`-if (IsNormalProcessingMode())`
`994`		`-Async_NotifyAtAbort();`
`995`		`-}`
`996`	`985`	`}`
`997`	`986`
`998`	`987`	`/* --------------------------------`
`@@ -1455,6 +1444,30 @@ UserAbortTransactionBlock()`
`1455`	`1444`	`s->blockState=TBLOCK_ENDABORT;`
`1456`	`1445`	`}`
`1457`	`1446`
	`1447`	`+/* --------------------------------`
	`1448`	`+ *AbortOutOfAnyTransaction`
	`1449`	`+ *`
	`1450`	`+ * This routine is provided for error recovery purposes. It aborts any`
	`1451`	`+ * active transaction or transaction block, leaving the system in a known`
	`1452`	`+ * idle state.`
	`1453`	`+ * --------------------------------`
	`1454`	`+ */`
	`1455`	`+void`
	`1456`	`+AbortOutOfAnyTransaction()`
	`1457`	`+{`
	`1458`	`+TransactionStates=CurrentTransactionState;`
	`1459`	`+`
	`1460`	`+/*`
	`1461`	`+ * Get out of any low-level transaction`
	`1462`	`+ */`
	`1463`	`+if (s->state!=TRANS_DEFAULT)`
	`1464`	`+AbortTransaction();`
	`1465`	`+/*`
	`1466`	`+ * Now reset the high-level state`
	`1467`	`+ */`
	`1468`	`+s->blockState=TBLOCK_DEFAULT;`
	`1469`	`+}`
	`1470`	`+`
`1458`	`1471`	`bool`
`1459`	`1472`	`IsTransactionBlock()`
`1460`	`1473`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc77a29a

File tree

7 files changed

7 files changed

`‎src/backend/access/transam/xact.c`

0 commit comments