diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2016-04-16 10:41:57 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2016-04-16 10:41:57 -0400 |
| commit | 9008922bf727ba4337ed26b5c07df7f1d5f1548b (patch) | |
| tree | 8f89ca87445293ec796c5e46bd44876f427973f5 | |
| parent | 56aa0f142d8e450bc0f94bb39b50f16aff3296df (diff) | |
| download | postgresql-9008922bf727ba4337ed26b5c07df7f1d5f1548b.tar.gz postgresql-9008922bf727ba4337ed26b5c07df7f1d5f1548b.zip | |
Make fallback implementation of pg_memory_barrier() work in 9.2 and 9.3.
Back-patch 9.4-era commit 44cd47c1d49655c5 into 9.2 and 9.3. As with
my back-patches of yesterday, this was not seen as necessary at the time
because we didn't expect barrier.h to need to work before 9.4, but
commit 37de8de9e33606a0 invalidated that theory.
Per an attempt to run gaur and pademelon over old branches they've
not been run on since ~2013.
| -rw-r--r-- | src/backend/main/main.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/backend/main/main.c b/src/backend/main/main.c index 3f6860244ae..67707d43a2b 100644 --- a/src/backend/main/main.c +++ b/src/backend/main/main.c @@ -42,6 +42,8 @@ #include "bootstrap/bootstrap.h" #include "postmaster/postmaster.h" +#include "storage/barrier.h" +#include "storage/spin.h" #include "tcop/tcopprot.h" #include "utils/help_config.h" #include "utils/memutils.h" @@ -313,6 +315,12 @@ startup_hacks(const char *progname) } #endif /* WIN32 */ + + /* + * Initialize dummy_spinlock, in case we are on a platform where we have + * to use the fallback implementation of pg_memory_barrier(). + */ + SpinLockInit(&dummy_spinlock); } |