Compare commits

...

2 Commits

Author SHA1 Message Date
Andres Freund 70516b8fc3 meson: Stop using deprecated way getting path of files
The just released meson 1.3 strongly deprecated a hack we were using, emitting
a noisy warning (the hack basically depended on an implementation detail to
work). Turns out there has been a better way available for a while, I just
hadn't found it. 1.4 added a more convenient approach, but we can't rely on
that.

Reviewed-by: Tristan Partin <tristan@neon.tech>
Discussion: https://postgr.es/m/20231129185053.s6c7f73eg7b4ztfi@awork3.anarazel.de
Backpatch: 16-, where the meson build was added.
2023-11-30 19:26:43 -08:00
Thomas Munro cf84755575 Adjust obsolete comment explaining set_stack_base().
Commit 7389aad6 removed the notion of backends started from inside a
signal handler.  A stray comment still referred to them, while
explaining the need for a call to set_stack_base().  That leads to the
question of whether we still need the call in !EXEC_BACKEND builds.
There doesn't seem to be much point in suppressing it now, as it doesn't
hurt and probably helps to measure the stack base from the exact same
place in EXEC_BACKEND and !EXEC_BACKEND builds.

Back-patch to 16.

Reported-by: Heikki Linnakangas <hlinnaka@iki.fi>
Reported-by: Tristan Partin <tristan@neon.tech>
Reported-by: Andres Freund <andres@anarazel.de>
Discussion: https://postgr.es/m/CA%2BhUKG%2BEJHcevNGNOxVWxTNFbuB%3Dvjf4U68%2B85rAC_Sxvy2zEQ%40mail.gmail.com
2023-12-01 15:19:28 +13:00
2 changed files with 8 additions and 5 deletions

View File

@ -2925,8 +2925,12 @@ potentially_conflicting_files = []
foreach t : potentially_conflicting_files_t
potentially_conflicting_files += t.full_path()
endforeach
foreach t : configure_files
t = '@0@'.format(t)
foreach t1 : configure_files
if meson.version().version_compare('>=0.59')
t = fs.parent(t1) / fs.name(t1)
else
t = '@0@'.format(t1)
endif
potentially_conflicting_files += meson.current_build_dir() / t
endforeach
foreach sub, fnames : generated_sources_ac

View File

@ -107,9 +107,8 @@ InitPostmasterChild(void)
/*
* Set reference point for stack-depth checking. This might seem
* redundant in !EXEC_BACKEND builds; but it's not because the postmaster
* launches its children from signal handlers, so we might be running on
* an alternative stack.
* redundant in !EXEC_BACKEND builds, but it's better to keep the depth
* logic the same with and without that build option.
*/
(void) set_stack_base();