1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: plug AliasedBuffer cctest memory leak

Browse Source 
No need to heap-allocate values here.

PR-URL: https://github.com/nodejs/node/pull/20665
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
This commit is contained in:
Anna Henningsen 2018-05-10 22:18:36 +02:00 committed by James M Snell
parent e3ceae724c
commit 19c9ff5a92
1 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
test/cctest/test_aliased_buffer.cc
View File

@ -8,28 +8,26 @@ using node::AliasedBuffer;
class AliasBufferTest : public NodeTestFixture {}; class AliasBufferTest : public NodeTestFixture {};
template<class NativeT> template<class NativeT>
void CreateOracleValues(NativeT* buf, size_t count) { void CreateOracleValues(std::vector<NativeT>* buf) {
for (size_t i = 0, j = count; i < count; i++, j--) { for (size_t i = 0, j = buf->size(); i < buf->size(); i++, j--) {
buf[i] = static_cast<NativeT>(j); (*buf)[i] = static_cast<NativeT>(j);
} }
} }
template<class NativeT, class V8T> template<class NativeT, class V8T>
void WriteViaOperator(AliasedBuffer<NativeT, V8T>* aliasedBuffer, void WriteViaOperator(AliasedBuffer<NativeT, V8T>* aliasedBuffer,
size_t size, const std::vector<NativeT>& oracle) {
NativeT* oracle) {
// write through the API // write through the API
for (size_t i = 0; i < size; i++) { for (size_t i = 0; i < oracle.size(); i++) {
(*aliasedBuffer)[i] = oracle[i]; (*aliasedBuffer)[i] = oracle[i];
} }
} }
template<class NativeT, class V8T> template<class NativeT, class V8T>
void WriteViaSetValue(AliasedBuffer<NativeT, V8T>* aliasedBuffer, void WriteViaSetValue(AliasedBuffer<NativeT, V8T>* aliasedBuffer,
size_t size, const std::vector<NativeT>& oracle) {
NativeT* oracle) {
// write through the API // write through the API
for (size_t i = 0; i < size; i++) { for (size_t i = 0; i < oracle.size(); i++) {
aliasedBuffer->SetValue(i, oracle[i]); aliasedBuffer->SetValue(i, oracle[i]);
} }
} }
@ -38,10 +36,9 @@ template<class NativeT, class V8T>
void ReadAndValidate(v8::Isolate* isolate, void ReadAndValidate(v8::Isolate* isolate,
v8::Local<v8::Context> context, v8::Local<v8::Context> context,
AliasedBuffer<NativeT, V8T>* aliasedBuffer, AliasedBuffer<NativeT, V8T>* aliasedBuffer,
size_t size, const std::vector<NativeT>& oracle) {
NativeT* oracle) {
// read through the API // read through the API
for (size_t i = 0; i < size; i++) { for (size_t i = 0; i < oracle.size(); i++) {
NativeT v1 = (*aliasedBuffer)[i]; NativeT v1 = (*aliasedBuffer)[i];
NativeT v2 = aliasedBuffer->GetValue(i); NativeT v2 = aliasedBuffer->GetValue(i);
EXPECT_TRUE(v1 == oracle[i]); EXPECT_TRUE(v1 == oracle[i]);
@ -49,16 +46,16 @@ void ReadAndValidate(v8::Isolate* isolate,
} }
// validate size of JS Buffer // validate size of JS Buffer
EXPECT_TRUE(aliasedBuffer->GetJSArray()->Length() == size); EXPECT_TRUE(aliasedBuffer->GetJSArray()->Length() == oracle.size());
EXPECT_TRUE( EXPECT_TRUE(
aliasedBuffer->GetJSArray()->ByteLength() == aliasedBuffer->GetJSArray()->ByteLength() ==
(size * sizeof(NativeT))); (oracle.size() * sizeof(NativeT)));
// validate operator * and GetBuffer are the same // validate operator * and GetBuffer are the same
EXPECT_TRUE(aliasedBuffer->GetNativeBuffer() == *(*aliasedBuffer)); EXPECT_TRUE(aliasedBuffer->GetNativeBuffer() == *(*aliasedBuffer));
// read through the JS API // read through the JS API
for (size_t i = 0; i < size; i++) { for (size_t i = 0; i < oracle.size(); i++) {
v8::Local<V8T> v8TypedArray = aliasedBuffer->GetJSArray(); v8::Local<V8T> v8TypedArray = aliasedBuffer->GetJSArray();
v8::MaybeLocal<v8::Value> v = v8TypedArray->Get(context, i); v8::MaybeLocal<v8::Value> v = v8TypedArray->Get(context, i);
EXPECT_TRUE(v.IsEmpty() == false); EXPECT_TRUE(v.IsEmpty() == false);
@ -80,21 +77,19 @@ void ReadWriteTest(v8::Isolate* isolate) {
const size_t size = 100; const size_t size = 100;
AliasedBuffer<NativeT, V8T> ab(isolate, size); AliasedBuffer<NativeT, V8T> ab(isolate, size);
NativeT* oracle = new NativeT[size]; std::vector<NativeT> oracle(size);
CreateOracleValues(oracle, size); CreateOracleValues(&oracle);
WriteViaOperator(&ab, size, oracle); WriteViaOperator(&ab, oracle);
ReadAndValidate(isolate, context, &ab, size, oracle); ReadAndValidate(isolate, context, &ab, oracle);
WriteViaSetValue(&ab, size, oracle); WriteViaSetValue(&ab, oracle);
// validate copy constructor // validate copy constructor
{ {
AliasedBuffer<NativeT, V8T> ab2(ab); AliasedBuffer<NativeT, V8T> ab2(ab);
ReadAndValidate(isolate, context, &ab2, size, oracle); ReadAndValidate(isolate, context, &ab2, oracle);
} }
ReadAndValidate(isolate, context, &ab, size, oracle); ReadAndValidate(isolate, context, &ab, oracle);
delete[] oracle;
} }
template< template<
@ -124,28 +119,28 @@ void SharedBufferTest(
AliasedBuffer<NativeT_C, V8T_C> ab_C( AliasedBuffer<NativeT_C, V8T_C> ab_C(
isolate, sizeInBytes_A + sizeInBytes_B, count_C, rootBuffer); isolate, sizeInBytes_A + sizeInBytes_B, count_C, rootBuffer);
NativeT_A* oracle_A = new NativeT_A[count_A]; std::vector<NativeT_A> oracle_A(count_A);
NativeT_B* oracle_B = new NativeT_B[count_B]; std::vector<NativeT_B> oracle_B(count_B);
NativeT_C* oracle_C = new NativeT_C[count_C]; std::vector<NativeT_C> oracle_C(count_C);
CreateOracleValues(oracle_A, count_A); CreateOracleValues(&oracle_A);
CreateOracleValues(oracle_B, count_B); CreateOracleValues(&oracle_B);
CreateOracleValues(oracle_C, count_C); CreateOracleValues(&oracle_C);
WriteViaOperator(&ab_A, count_A, oracle_A); WriteViaOperator(&ab_A, oracle_A);
WriteViaOperator(&ab_B, count_B, oracle_B); WriteViaOperator(&ab_B, oracle_B);
WriteViaOperator(&ab_C, count_C, oracle_C); WriteViaOperator(&ab_C, oracle_C);
ReadAndValidate(isolate, context, &ab_A, count_A, oracle_A); ReadAndValidate(isolate, context, &ab_A, oracle_A);
ReadAndValidate(isolate, context, &ab_B, count_B, oracle_B); ReadAndValidate(isolate, context, &ab_B, oracle_B);
ReadAndValidate(isolate, context, &ab_C, count_C, oracle_C); ReadAndValidate(isolate, context, &ab_C, oracle_C);
WriteViaSetValue(&ab_A, count_A, oracle_A); WriteViaSetValue(&ab_A, oracle_A);
WriteViaSetValue(&ab_B, count_B, oracle_B); WriteViaSetValue(&ab_B, oracle_B);
WriteViaSetValue(&ab_C, count_C, oracle_C); WriteViaSetValue(&ab_C, oracle_C);
ReadAndValidate(isolate, context, &ab_A, count_A, oracle_A); ReadAndValidate(isolate, context, &ab_A, oracle_A);
ReadAndValidate(isolate, context, &ab_B, count_B, oracle_B); ReadAndValidate(isolate, context, &ab_B, oracle_B);
ReadAndValidate(isolate, context, &ab_C, count_C, oracle_C); ReadAndValidate(isolate, context, &ab_C, oracle_C);
} }
TEST_F(AliasBufferTest, Uint8Array) { TEST_F(AliasBufferTest, Uint8Array) {