Commit db4ec2ff authored by Andres Freund's avatar Andres Freund

Fix alignment of pg_atomic_uint64 variables on some 32bit platforms.

I failed to recognize that pg_atomic_uint64 wasn't guaranteed to be 8
byte aligned on some 32bit platforms - which it has to be on some
platforms to guarantee the desired atomicity and which we assert.

As this is all compiler specific code anyway we can just rely on
compiler specific tricks to enforce alignment.

I've been unable to find concrete documentation about the version that
introduce the sunpro alignment support, so that might need additional
guards.

I've verified that this works with gcc x86 32bit, but I don't have
access to any other 32bit environment.

Discussion: op.xpsjdkil0sbe7t@vld-kuci

Per report from Vladimir Koković.
parent 62f5e447
......@@ -73,6 +73,7 @@ typedef struct pg_atomic_uint32
#define PG_HAVE_ATOMIC_U64_SUPPORT
typedef struct pg_atomic_uint64
{
/* alignment guaranteed due to being on a 64bit platform */
volatile uint64 value;
} pg_atomic_uint64;
#endif
......
......@@ -40,6 +40,12 @@ typedef struct pg_atomic_uint32
#define PG_HAVE_ATOMIC_U64_SUPPORT
typedef struct pg_atomic_uint64
{
/*
* Alignment is guaranteed to be 64bit. Search for "Well-behaved
* application restrictions" => "Data alignment and data sharing" on HP's
* website. Unfortunately the URL doesn't seem to stable enough to
* include.
*/
volatile uint64 value;
} pg_atomic_uint64;
......
......@@ -98,7 +98,7 @@ typedef struct pg_atomic_uint32
typedef struct pg_atomic_uint64
{
volatile uint64 value;
volatile uint64 value __attribute__((aligned(8)));
} pg_atomic_uint64;
#endif /* defined(HAVE_GCC__ATOMIC_INT64_CAS) || defined(HAVE_GCC__SYNC_INT64_CAS) */
......
......@@ -41,7 +41,7 @@ typedef struct pg_atomic_uint32
} pg_atomic_uint32;
#define PG_HAVE_ATOMIC_U64_SUPPORT
typedef struct pg_atomic_uint64
typedef struct __declspec(align(8)) pg_atomic_uint64
{
volatile uint64 value;
} pg_atomic_uint64;
......
......@@ -55,7 +55,13 @@ typedef struct pg_atomic_uint32
#define PG_HAVE_ATOMIC_U64_SUPPORT
typedef struct pg_atomic_uint64
{
volatile uint64 value;
/*
* Syntax to enforce variable alignment should be supported by versions
* supporting atomic.h, but it's hard to find accurate documentation. If
* it proves to be a problem, we'll have to add more version checks for 64
* bit support.
*/
volatile uint64 value __attribute__((__aligned__(8)));
} pg_atomic_uint64;
#endif /* HAVE_ATOMIC_H */
......
......@@ -32,7 +32,7 @@ typedef struct pg_atomic_uint32
#define PG_HAVE_ATOMIC_U64_SUPPORT
typedef struct pg_atomic_uint64
{
volatile uint64 value;
volatile uint64 value __attribute__((__aligned__(8)));
} pg_atomic_uint64;
#endif /* __64BIT__ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment