diff options
| author | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-05-18 09:04:36 +1000 |
|---|---|---|
| committer | Alex Gorrod <alexander.gorrod@mongodb.com> | 2017-05-18 09:04:36 +1000 |
| commit | a3874e7dfb6e3012098c843a1cd05735ee36aab3 (patch) | |
| tree | 4b7535cb89a0e35422887a47bd843546b23c2cb4 | |
| parent | ae06aa4ec7137bb1e2688838d29dd778338a6393 (diff) | |
| download | mongo-a3874e7dfb6e3012098c843a1cd05735ee36aab3.tar.gz | |
Import wiredtiger: 78109ca3fea602885a62fc2872fc553450168149 from branch mongodb-3.4r3.4.5-rc1
ref: cb16839cfb..78109ca3fe
for: 3.4.5
WT-3158 Fix structure layout on Windows.
| -rwxr-xr-x | src/third_party/wiredtiger/dist/s_style | 11 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 3 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/btmem.h | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/dist/s_style b/src/third_party/wiredtiger/dist/s_style index 388a481ef56..69cf1f667fa 100755 --- a/src/third_party/wiredtiger/dist/s_style +++ b/src/third_party/wiredtiger/dist/s_style @@ -101,10 +101,13 @@ else cat $t fi - # Alignment directive before "struct". - egrep 'WT_COMPILER_TYPE_ALIGN.*struct' $f > $t - test -s $t && { - echo "$f: compiler alignment direction must precede \"struct\"" + # If we don't have matching pack-begin and pack-end calls, we don't get + # an error, we just get a Windows performance regression. Using awk and + # not wc to ensure there's no whitespace in the assignment. + egrep WT_PACKED_STRUCT $f > $t + cnt=`awk 'BEGIN { line = 0 } { ++line } END { print line }' < $t` + test `expr "$cnt" % 2` -ne 0 && { + echo "$f: mismatched WT_PACKED_STRUCT_BEGIN/END lines" cat $t } diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 16d592dd33e..e605450169f 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -1,5 +1,6 @@ { - "commit": "cb16839cfbdf338af95bed43ca40979ae6e32f54", + "commit": "78109ca3fea602885a62fc2872fc553450168149", "github": "wiredtiger/wiredtiger.git", + "vendor": "wiredtiger", "branch": "mongodb-3.4" } diff --git a/src/third_party/wiredtiger/src/include/btmem.h b/src/third_party/wiredtiger/src/include/btmem.h index f1bb08d2699..b1d5df4e9d2 100644 --- a/src/third_party/wiredtiger/src/include/btmem.h +++ b/src/third_party/wiredtiger/src/include/btmem.h @@ -933,7 +933,7 @@ WT_PACKED_STRUCT_BEGIN(__wt_update) #define WT_UPDATE_MEMSIZE(upd) \ WT_ALIGN(sizeof(WT_UPDATE) + \ (WT_UPDATE_DELETED_ISSET(upd) ? 0 : (upd)->size), 32) -}; +WT_PACKED_STRUCT_END /* * WT_INSERT -- |