Skip to content

src: refactor WriteWrap and ShutdownWrap #18676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
addaleax wants to merge 8 commits into from
Closed

src: refactor WriteWrap and ShutdownWrap #18676

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d26a912
tls_wrap: use DoTryWrite()
addaleax Jan 28, 2018
901a4ba
src: only set JSStreamWrap write req after `write()`
addaleax Feb 8, 2018
6ea19a5
test: make sure WriteWrap tests are actually async
addaleax Feb 8, 2018
7867be2
src: refactor WriteWrap and ShutdownWraps
addaleax Feb 8, 2018
98de11a
[squash] fix stupid memory leak, un-tank performance
addaleax Feb 9, 2018
ba18a7a
[squash] bnoordhuis nits
addaleax Feb 10, 2018
a852cc6
[squash] bnoordhuis suggestion: simplify memory management a bit
addaleax Feb 10, 2018
a9cdc4b
[squash] review comments
addaleax Feb 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[squash] bnoordhuis suggestion: simplify memory management a bit
  • Loading branch information
@addaleax
addaleax committed Feb 13, 2018
commit a852cc606a0e996907a0dfb80f85e805bb6f9ad0
33 changes: 17 additions & 16 deletions src/stream_base.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ template int StreamBase::WriteString<LATIN1>(
const FunctionCallbackInfo<Value>& args);


struct Free {
void operator()(char* ptr) const { free(ptr); }
};


int StreamBase::ReadStartJS(const FunctionCallbackInfo<Value>& args) {
return ReadStart();
}
Expand Down Expand Up @@ -107,9 +112,9 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
}
}

char* storage = nullptr;
std::unique_ptr<char, Free> storage;
if (storage_size > 0)
storage = Malloc(storage_size);
storage = std::unique_ptr<char, Free>(Malloc(storage_size));

offset = 0;
if (!all_buffers) {
Expand All @@ -126,7 +131,7 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {

// Write string
CHECK_LE(offset, storage_size);
char* str_storage = storage + offset;
char* str_storage = storage.get() + offset;
size_t str_size = storage_size - offset;

Local<String> string = chunk->ToString(env->context()).ToLocalChecked();
Expand All @@ -146,10 +151,8 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {

StreamWriteResult res = Write(*bufs, count, nullptr, req_wrap_obj);
req_wrap_obj->Set(env->bytes_string(), Number::New(env->isolate(), bytes));
if (res.wrap != nullptr && storage != nullptr) {
res.wrap->SetAllocatedStorage(storage, storage_size);
} else {
free(storage);
if (res.wrap != nullptr && storage) {
res.wrap->SetAllocatedStorage(storage.release(), storage_size);
}
return res.err;
}
Expand Down Expand Up @@ -243,26 +246,26 @@ int StreamBase::WriteString(const FunctionCallbackInfo<Value>& args) {
CHECK_EQ(count, 1);
}

char* data;
std::unique_ptr<char, Free> data;

if (try_write) {
// Copy partial data
data = Malloc(buf.len);
memcpy(data, buf.base, buf.len);
data = std::unique_ptr<char, Free>(Malloc(buf.len));
memcpy(data.get(), buf.base, buf.len);
data_size = buf.len;
} else {
// Write it
data = Malloc(storage_size);
data = std::unique_ptr<char, Free>(Malloc(storage_size));
data_size = StringBytes::Write(env->isolate(),
data,
data.get(),
storage_size,
string,
enc);
}

CHECK_LE(data_size, storage_size);

buf = uv_buf_init(data, data_size);
buf = uv_buf_init(data.get(), data_size);

uv_stream_t* send_handle = nullptr;

Expand All @@ -288,9 +291,7 @@ int StreamBase::WriteString(const FunctionCallbackInfo<Value>& args) {
.FromJust();

if (res.wrap != nullptr) {
res.wrap->SetAllocatedStorage(data, data_size);
} else {
free(data);
res.wrap->SetAllocatedStorage(data.release(), data_size);
}

return res.err;
Expand Down