NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit18c170a

committed

Include the process PID in assertion-failure messages.

This should help to identify what happened when studying the postmasterlog after-the-fact.While here, clean up some old comments in the same function.Discussion:https://postgr.es/m/1568983.1601845687@sss.pgh.pa.us

1 parent53c6daf commit18c170aCopy full SHA for 18c170a

File tree

1 file changed

+15

-13

lines changed

src/backend/utils/error
- assert.c

1 file changed

+15

-13

lines changed

`‎src/backend/utils/error/assert.c`

Lines changed: 15 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/*-------------------------------------------------------------------------`
`2`	`2`	`*`
`3`	`3`	`* assert.c`
`4`		`- * Assert code.`
	`4`	`+ * Assertsupportcode.`
`5`	`5`	`*`
`6`	`6`	`* Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`@@ -10,9 +10,6 @@`
`10`	`10`	`* IDENTIFICATION`
`11`	`11`	`* src/backend/utils/error/assert.c`
`12`	`12`	`*`
`13`		`- * NOTE`
`14`		`- * This should eventually work with elog()`
`15`		`- *`
`16`	`13`	`*-------------------------------------------------------------------------`
`17`	`14`	`*/`
`18`	`15`	`#include"postgres.h"`
`@@ -24,27 +21,32 @@`
`24`	`21`
`25`	`22`	`/*`
`26`	`23`	`* ExceptionalCondition - Handles the failure of an Assert()`
	`24`	`+ *`
	`25`	`+ * We intentionally do not go through elog() here, on the grounds of`
	`26`	`+ * wanting to minimize the amount of infrastructure that has to be`
	`27`	`+ * working to report an assertion failure.`
`27`	`28`	`*/`
`28`	`29`	`void`
`29`	`30`	`ExceptionalCondition(constchar*conditionName,`
`30`	`31`	`constchar*errorType,`
`31`	`32`	`constchar*fileName,`
`32`	`33`	`intlineNumber)`
`33`	`34`	`{`
	`35`	`+/* Report the failure on stderr (or local equivalent) */`
`34`	`36`	`if (!PointerIsValid(conditionName)`
`35`	`37`	`\|\| !PointerIsValid(fileName)`
`36`	`38`	`\|\| !PointerIsValid(errorType))`
`37`		`-write_stderr("TRAP: ExceptionalCondition: bad arguments\n");`
	`39`	`+write_stderr("TRAP: ExceptionalCondition: bad arguments in PID %d\n",`
	`40`	`+ (int)getpid());`
`38`	`41`	`else`
`39`		`-{`
`40`		`-write_stderr("TRAP: %s(\"%s\", File: \"%s\", Line: %d)\n",`
	`42`	`+write_stderr("TRAP: %s(\"%s\", File: \"%s\", Line: %d, PID: %d)\n",`
`41`	`43`	`errorType,conditionName,`
`42`		`-fileName,lineNumber);`
`43`		`-}`
	`44`	`+fileName,lineNumber, (int)getpid());`
`44`	`45`
`45`	`46`	`/* Usually this shouldn't be needed, but make sure the msg went out */`
`46`	`47`	`fflush(stderr);`
`47`	`48`
	`49`	`+/* If we have support for it, dump a simple backtrace */`
`48`	`50`	`#ifdefHAVE_BACKTRACE_SYMBOLS`
`49`	`51`	`{`
`50`	`52`	`void*buf[100];`
`@@ -55,12 +57,12 @@ ExceptionalCondition(const char *conditionName,`
`55`	`57`	`}`
`56`	`58`	`#endif`
`57`	`59`
`58`		`-#ifdefSLEEP_ON_ASSERT`
`59`		`-`
`60`	`60`	`/*`
`61`		`- * It would be nice to use pg_usleep() here, but only does 2000 sec or 33`
`62`		`- * minutes, which seems too short.`
	`61`	`+ * If configured to do so, sleep indefinitely to allow user to attach a`
	`62`	`+ * debugger. It would be nice to use pg_usleep() here, but that can sleep`
	`63`	`+ * at most 2G usec or ~33 minutes, which seems too short.`
`63`	`64`	`*/`
	`65`	`+#ifdefSLEEP_ON_ASSERT`
`64`	`66`	`sleep(1000000);`
`65`	`67`	`#endif`
`66`	`68`

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!

Commit18c170a

File tree

1 file changed

1 file changed

`‎src/backend/utils/error/assert.c`

0 commit comments