Commit5ac9e86

committed

Mark sigint_interrupt_enabled as sig_atomic_t

This is a continuation of78fdb1e, where this flag is set in the psqlcallback handler used for SIGINT. This was previously a boolean but theC standard recommends the use of sig_atomic_t. Note that thisinfluences PromptInterruptContext in string.h, where the same flag istracked.Author: Hayato KurodaDiscussion:https://postgr.es/m/TYAPR01MB58669A9EC96AA3078C2CD938F5549@TYAPR01MB5866.jpnprd01.prod.outlook.com

1 parentb8d8a45 commit5ac9e86Copy full SHA for 5ac9e86

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ NoticeProcessor(void arg, const char message)`
`246`	`246`	`* On Windows, currently this does not work, so control-C is less useful`
`247`	`247`	`* there.`
`248`	`248`	`*/`
`249`		`-volatileboolsigint_interrupt_enabled= false;`
	`249`	`+volatilesig_atomic_tsigint_interrupt_enabled= false;`
`250`	`250`
`251`	`251`	`sigjmp_bufsigint_interrupt_jmp;`
`252`	`252`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#defineCOMMON_H`
`10`	`10`
`11`	`11`	`#include<setjmp.h>`
	`12`	`+#include<signal.h>`
`12`	`13`
`13`	`14`	`#include"fe_utils/print.h"`
`14`	`15`	`#include"fe_utils/psqlscan.h"`
`@@ -22,7 +23,7 @@ extern char psql_get_variable(const char varname, PsqlScanQuoteType quote,`
`22`	`23`
`23`	`24`	`externvoidNoticeProcessor(voidarg,constcharmessage);`
`24`	`25`
`25`		`-externvolatileboolsigint_interrupt_enabled;`
	`26`	`+externvolatilesig_atomic_tsigint_interrupt_enabled;`
`26`	`27`
`27`	`28`	`externsigjmp_bufsigint_interrupt_jmp;`
`28`	`29`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,15 @@`
`10`	`10`	`#ifndefCOMMON_STRING_H`
`11`	`11`	`#defineCOMMON_STRING_H`
`12`	`12`
	`13`	`+#include<signal.h>`
	`14`	`+`
`13`	`15`	`structStringInfoData;/* avoid including stringinfo.h here */`
`14`	`16`
`15`	`17`	`typedefstructPromptInterruptContext`
`16`	`18`	`{`
`17`	`19`	`/* To avoid including <setjmp.h> here, jmpbuf is declared "void " /`
`18`	`20`	`voidjmpbuf;/ existing longjmp buffer */`
`19`		`-volatileboolenabled;/ flag that enables longjmp-on-interrupt */`
	`21`	`+volatilesig_atomic_tenabled;/ flag that enables longjmp-on-interrupt */`
`20`	`22`	`boolcanceled;/* indicates whether cancellation occurred */`
`21`	`23`	`}PromptInterruptContext;`
`22`	`24`

Comments

(0)