Commit5e86c61

committed

Arrange for on_exit_nicely to be thread-safe.

Extracted from Joachim Wieland's parallel pg_dump patch, with someadditional comments by me.

1 parent38b9693 commit5e86c61Copy full SHA for 5e86c61

File tree

+10

-8

lines changed

+10

-8

lines changed

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -1319,16 +1319,18 @@ on_exit_nicely(on_exit_nicely_callback function, void *arg)`
`1319`	`1319`	`on_exit_nicely_index++;`
`1320`	`1320`	`}`
`1321`	`1321`
`1322`		`-/* Run accumulated on_exit_nicely callbacks and then exit quietly. */`
	`1322`	`+/*`
	`1323`	`+ * Run accumulated on_exit_nicely callbacks in reverse order and then exit`
	`1324`	`+ * quietly. This needs to be thread-safe.`
	`1325`	`+ */`
`1323`	`1326`	`void`
`1324`	`1327`	`exit_nicely(intcode)`
`1325`	`1328`	`{`
`1326`		`-while (--on_exit_nicely_index >=0)`
`1327`		`-(*on_exit_nicely_list[on_exit_nicely_index].function)(code,`
`1328`		`-on_exit_nicely_list[on_exit_nicely_index].arg);`
`1329`		`-#ifdefWIN32`
`1330`		`-if (parallel_init_done&&GetCurrentThreadId()!=mainThreadId)`
`1331`		`-ExitThread(code);`
`1332`		`-#endif`
	`1329`	`+inti;`
	`1330`	`+`
	`1331`	`+for (i=on_exit_nicely_index-1;i >=0;i--)`
	`1332`	`+(*on_exit_nicely_list[i].function)(code,`
	`1333`	`+on_exit_nicely_list[i].arg);`
	`1334`	`+`
`1333`	`1335`	`exit(code);`
`1334`	`1336`	`}`

Comments

(0)