NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit08ede42

committed

Make elog() switch to ErrorContext while invoking libpq output routines,

since those routines may do palloc's. We want to be fairly sure we cansend the error message to the client even under low-memory conditions.That's what we stashed away 8K in ErrorContext for, after all ...

1 parenta49436d commit08ede42Copy full SHA for 08ede42

File tree

1 file changed

+27

-10

lines changed

src/backend/utils/error
- elog.c

1 file changed

+27

-10

lines changed

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

Lines changed: 27 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.69 2000/11/25 19:09:22 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.70 2000/12/01 19:52:04 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -30,12 +30,13 @@`
`30`	`30`	`#include<syslog.h>`
`31`	`31`	`#endif`
`32`	`32`
	`33`	`+#include"commands/copy.h"`
`33`	`34`	`#include"libpq/libpq.h"`
`34`	`35`	`#include"libpq/pqformat.h"`
`35`	`36`	`#include"miscadmin.h"`
`36`	`37`	`#include"storage/proc.h"`
`37`	`38`	`#include"tcop/tcopprot.h"`
`38`		`-#include"commands/copy.h"`
	`39`	`+#include"utils/memutils.h"`
`39`	`40`
`40`	`41`	`#ifdefMULTIBYTE`
`41`	`42`	`#include"mb/pg_wchar.h"`
`@@ -374,8 +375,17 @@ elog(int lev, const char *fmt, ...)`
`374`	`375`	`if (lev>DEBUG&&whereToSendOutput==Remote)`
`375`	`376`	`{`
`376`	`377`	`/* Send IPC message to the front-end program */`
	`378`	`+MemoryContextoldcxt;`
`377`	`379`	`charmsgtype;`
`378`	`380`
	`381`	`+/*`
	`382`	`+ * Since backend libpq may call palloc(), switch to a context where`
	`383`	`+ * there's fairly likely to be some free space. After all the`
	`384`	`+ * pushups above, we don't want to drop the ball by running out of`
	`385`	`+ * space now...`
	`386`	`+ */`
	`387`	`+oldcxt=MemoryContextSwitchTo(ErrorContext);`
	`388`	`+`
`379`	`389`	`if (lev==NOTICE)`
`380`	`390`	`msgtype='N';`
`381`	`391`	`else`
`@@ -402,6 +412,8 @@ elog(int lev, const char *fmt, ...)`
`402`	`412`	`* much ...`
`403`	`413`	`*/`
`404`	`414`	`pq_flush();`
	`415`	`+`
	`416`	`+MemoryContextSwitchTo(oldcxt);`
`405`	`417`	`}`
`406`	`418`
`407`	`419`	`if (lev>DEBUG&&whereToSendOutput!=Remote)`
`@@ -612,6 +624,7 @@ write_syslog(int level, const char *line)`
`612`	`624`	`staticboolopenlog_done= false;`
`613`	`625`	`staticunsigned longseq=0;`
`614`	`626`	`staticintsyslog_fac=LOG_LOCAL0;`
	`627`	`+`
`615`	`628`	`intlen=strlen(line);`
`616`	`629`
`617`	`630`	`if (Use_syslog==0)`
`@@ -649,19 +662,21 @@ write_syslog(int level, const char *line)`
`649`	`662`	`/* or if the message contains embedded NewLine(s) '\n' */`
`650`	`663`	`if (len>PG_SYSLOG_LIMIT\|\|strchr(line,'\n')!=NULL )`
`651`	`664`	`{`
`652`		`-staticcharbuf[PG_SYSLOG_LIMIT+1];`
`653`		`-intchunk_nr=0;`
`654`		`-intbuflen;`
	`665`	`+intchunk_nr=0;`
`655`	`666`
`656`	`667`	`while (len>0)`
`657`	`668`	`{`
`658`		`-intl;`
`659`		`-inti;`
	`669`	`+charbuf[PG_SYSLOG_LIMIT+1];`
	`670`	`+intbuflen;`
	`671`	`+intl;`
	`672`	`+inti;`
	`673`	`+`
`660`	`674`	`/* if we start at a newline, move ahead one char */`
`661`	`675`	`if (line[0]=='\n')`
`662`	`676`	`{`
`663`	`677`	`line++;`
`664`	`678`	`len--;`
	`679`	`+continue;`
`665`	`680`	`}`
`666`	`681`
`667`	`682`	`strncpy(buf,line,PG_SYSLOG_LIMIT);`
`@@ -681,9 +696,9 @@ write_syslog(int level, const char *line)`
`681`	`696`	`buflen=l;`
`682`	`697`	`else`
`683`	`698`	`{`
`684`		`-/* try to dividein word boundary */`
	`699`	`+/* try to divideat word boundary */`
`685`	`700`	`i=l-1;`
`686`		`-while(i>0&& !isspace(buf[i]))`
	`701`	`+while(i>0&& !isspace(buf[i]))`
`687`	`702`	`i--;`
`688`	`703`
`689`	`704`	`if (i <=0)/* couldn't divide word boundary */`
`@@ -702,9 +717,11 @@ write_syslog(int level, const char *line)`
`702`	`717`	`len-=buflen;`
`703`	`718`	`}`
`704`	`719`	`}`
`705`		`-/* message short enough */`
`706`	`720`	`else`
	`721`	`+{`
	`722`	`+/* message short enough */`
`707`	`723`	`syslog(level,"[%lu] %s",seq,line);`
	`724`	`+}`
`708`	`725`	`}`
`709`	`726`
`710`	`727`	`#endif/* ENABLE_SYSLOG */`

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!

Commit08ede42

File tree

1 file changed

1 file changed

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

0 commit comments