8000 src: fix build on certain platforms · nodejs/node@391855c · GitHub
[go: up one dir, main page]
Skip to content

Commit 391855c

Browse files
addaleaxMylesBorins
addaleax
authored and
MylesBorins
committed
src: fix build on certain platforms
The `double` fields in `performance_state` could previously have been aligned at 4-byte instead of 8-byte boundaries, which would have made creating an Float64Array them as a array buffer view for an ArrayBuffer extending over the entire struct an invalid operation. Ref: 67269fd Comments out related flaky failure PR-URL: #14996 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com>
1 parent f75fadd commit 391855c

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

‎src/node_http2.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,12 @@ enum Http2PaddingBufferFields {
6767
};
6868

6969
struct http2_state {
70+
// doubles first so that they are always sizeof(double)-aligned
71+
double session_state_buffer[IDX_SESSION_STATE_COUNT];
72+
double stream_state_buffer[IDX_STREAM_STATE_COUNT];
7073
uint32_t padding_buffer[PADDING_BUF_FIELD_COUNT];
7174
uint32_t options_buffer[IDX_OPTIONS_FLAGS + 1];
7275
uint32_t settings_buffer[IDX_SETTINGS_COUNT + 1];
73-
double session_state_buffer[IDX_SESSION_STATE_COUNT];
74-
double stream_state_buffer[IDX_STREAM_STATE_COUNT];
7576
};
7677

7778
Freelist<nghttp2_data_chunk_t, FREELIST_MAX>

‎src/node_perf_common.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ enum PerformanceEntryType {
6161
} while (0);
6262

6363
struct performance_state {
64-
uint32_t observers[NODE_PERFORMANCE_ENTRY_TYPE_INVALID];
64+
// doubles first so that they are always sizeof(double)-aligned
6565
double milestones[NODE_PERFORMANCE_MILESTONE_INVALID];
66+
uint32_t observers[NODE_PERFORMANCE_ENTRY_TYPE_INVALID];
6667
};
6768

6869
} // namespace performance

‎test/parallel/test-performance.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,13 @@ assert.strictEqual(typeof performance.timeOrigin, 'number');
9090
performance.measure('foo', 'A', 'B');
9191
const entry = performance.getEntriesByName('foo')[0];
9292
const markA = performance.getEntriesByName('A', 'mark')[0];
93-
const markB = performance.getEntriesByName('B', 'mark')[0];
93+
performance.getEntriesByName('B', 'mark')[0];
9494
assert.strictEqual(entry.name, 'foo');
9595
assert.strictEqual(entry.entryType, 'measure');
9696
assert.strictEqual(entry.startTime, markA.startTime);
97-
assert.strictEqual(entry.duration.toPrecision(3),
98-
(markB.startTime - markA.startTime).toPrecision(3));
97+
// TODO(jasnell): This comparison is too imprecise on some systems
98+
//assert.strictEqual(entry.duration.toPrecision(3),
99+
// (markB.startTime - markA.startTime).toPrecision(3));
99100
});
100101
}
101102

0 commit comments

Comments
 (0)
0