postgres.git / summary / log / commit / refs

commit    5962519b362d28ef02bc8ec135b9bf9b9a168263
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Mon Oct 07 22:59:57 2013 +0000
First released in: 9.4.0

    TYPEALIGN doesn't work on int64 on 32-bit platforms.
    
    The TYPEALIGN macro, and the related ones like MAXALIGN, don't work with
    values larger than intptr_t, because TYPEALIGN casts the argument to
    intptr_t to do the arithmetic. That's not a problem when dealing with
    pointers or lengths or offsets related to pointers, but the XLogInsert
    scaling patch added a call to MAXALIGN with an XLogRecPtr argument.
    
    To fix, add wider variants of the macros, called TYPEALIGN64 and MAXALIGN64,
    which are just like the existing variants but work with uint64 instead of
    intptr_t.
    
    Report and patch by David Rowley, analysis by Andres Freund.


 src/backend/access/transam/xlog.c |  2 +-
 src/include/c.h                   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index fc495d6a62d..06f5eb003cd 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -1482,7 +1482,7 @@ CopyXLogRecordToWAL(int write_len, bool isLogSwitch, XLogRecData *rdata,
 	Assert(written == write_len);
 
 	/* Align the end position, so that the next record starts aligned */
-	CurrPos = MAXALIGN(CurrPos);
+	CurrPos = MAXALIGN64(CurrPos);
 
 	/*
 	 * If this was an xlog-switch, it's not enough to write the switch record,
diff --git a/src/include/c.h b/src/include/c.h
index 14bfdcd4dab..8916310b5bf 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -551,6 +551,18 @@ typedef NameData *Name;
 #define DOUBLEALIGN_DOWN(LEN)	TYPEALIGN_DOWN(ALIGNOF_DOUBLE, (LEN))
 #define MAXALIGN_DOWN(LEN)		TYPEALIGN_DOWN(MAXIMUM_ALIGNOF, (LEN))
 
+/*
+ * The above macros will not work with types wider than intptr_t, like with
+ * uint64 on 32-bit platforms.  That's not problem for the usual use where a
+ * pointer or a length is aligned, but for the odd case that you need to
+ * align something (potentially) wider, use TYPEALIGN64.
+ */
+#define TYPEALIGN64(ALIGNVAL,LEN)  \
+	(((uint64) (LEN) + ((ALIGNVAL) - 1)) & ~((uint64) ((ALIGNVAL) - 1)))
+
+/* we don't currently need wider versions of the other ALIGN macros */
+#define MAXALIGN64(LEN)			TYPEALIGN64(MAXIMUM_ALIGNOF, (LEN))
+
 /* ----------------------------------------------------------------
  *				Section 6:	assertions
  * ----------------------------------------------------------------


[parent: 81fbbfe3352d]