Skip to content

Commit d111e66

Browse files
RaisinTenRaisinTen
committed
src: remove usage of AllocatedBuffer from stream_*
Signed-off-by: Darshan Sen <[email protected]>
1 parent 8a58fce commit d111e66

5 files changed

+64
-56
lines changed

‎src/stream_base-inl.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6-
#include "allocated_buffer-inl.h"
76
#include "async_wrap-inl.h"
87
#include "base_object-inl.h"
98
#include "node.h"
@@ -270,9 +269,9 @@ ShutdownWrap* ShutdownWrap::FromObject(
270269
return FromObject(base_obj->object());
271270
}
272271

273-
void WriteWrap::SetAllocatedStorage(AllocatedBuffer&& storage) {
274-
CHECK_NULL(storage_.data());
275-
storage_ = std::move(storage);
272+
void WriteWrap::SetBackingStore(std::unique_ptr<v8::BackingStore> bs) {
273+
CHECK(!backing_store_);
274+
backing_store_ = std::move(bs);
276275
}
277276

278277
void StreamReq::Done(int status, const char* error_str) {

‎src/stream_base.cc

+50-40
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ namespace node {
1919

2020
using v8::Array;
2121
using v8::ArrayBuffer;
22+
using v8::BackingStore;
2223
using v8::ConstructorBehavior;
2324
using v8::Context;
2425
using v8::DontDelete;
@@ -29,6 +30,7 @@ using v8::FunctionCallbackInfo;
2930
using v8::FunctionTemplate;
3031
using v8::HandleScope;
3132
using v8::Integer;
33+
using v8::Isolate;
3234
using v8::Local;
3335
using v8::MaybeLocal;
3436
using v8::Object;
@@ -80,6 +82,8 @@ void StreamBase::SetWriteResult(const StreamWriteResult& res) {
8082

8183
int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
8284
Environment* env = Environment::GetCurrent(args);
85+
Isolate* isolate = env->isolate();
86+
Local<Context> context(env->context());
8387

8488
CHECK(args[0]->IsObject());
8589
CHECK(args[1]->IsArray());
@@ -102,21 +106,21 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
102106
if (!all_buffers) {
103107
// Determine storage size first
104108
for (size_t i = 0; i < count; i++) {
105-
Local<Value> chunk = chunks->Get(env->context(), i * 2).ToLocalChecked();
109+
Local<Value> chunk = chunks->Get(context, i * 2).ToLocalChecked();
106110

107111
if (Buffer::HasInstance(chunk))
108112
continue;
109113
// Buffer chunk, no additional storage required
110114

111115
// String chunk
112-
Local<String> string = chunk->ToString(env->context()).ToLocalChecked();
113-
enum encoding encoding = ParseEncoding(env->isolate(),
114-
chunks->Get(env->context(), i * 2 + 1).ToLocalChecked());
116+
Local<String> string = chunk->ToString(context).ToLocalChecked();
117+
enum encoding encoding = ParseEncoding(isolate,
118+
chunks->Get(context, i * 2 + 1).ToLocalChecked());
115119
size_t chunk_size;
116120
if (encoding == UTF8 && string->Length() > 65535 &&
117-
!StringBytes::Size(env->isolate(), string, encoding).To(&chunk_size))
121+
!StringBytes::Size(isolate, string, encoding).To(&chunk_size))
118122
return 0;
119-
else if (!StringBytes::StorageSize(env->isolate(), string, encoding)
123+
else if (!StringBytes::StorageSize(isolate, string, encoding)
120124
.To(&chunk_size))
121125
return 0;
122126
storage_size += chunk_size;
@@ -126,20 +130,22 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
126130
return UV_ENOBUFS;
127131
} else {
128132
for (size_t i = 0; i < count; i++) {
129-
Local<Value> chunk = chunks->Get(env->context(), i).ToLocalChecked();
133+
Local<Value> chunk = chunks->Get(context, i).ToLocalChecked();
130134
bufs[i].base = Buffer::Data(chunk);
131135
bufs[i].len = Buffer::Length(chunk);
132136
}
133137
}
134138

135-
AllocatedBuffer storage;
136-
if (storage_size > 0)
137-
storage = AllocatedBuffer::AllocateManaged(env, storage_size);
139+
std::unique_ptr<BackingStore> bs;
140+
if (storage_size > 0) {
141+
NoArrayBufferZeroFillScope no_zero_fill_scope(env->isolate_data());
142+
bs = ArrayBuffer::NewBackingStore(isolate, storage_size);
143+
}
138144

139145
offset = 0;
140146
if (!all_buffers) {
141147
for (size_t i = 0; i < count; i++) {
142-
Local<Value> chunk = chunks->Get(env->context(), i * 2).ToLocalChecked();
148+
Local<Value> chunk = chunks->Get(context, i * 2).ToLocalChecked();
143149

144150
// Write buffer
145151
if (Buffer::HasInstance(chunk)) {
@@ -150,13 +156,14 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
150156

151157
// Write string
152158
CHECK_LE(offset, storage_size);
153-
char* str_storage = storage.data() + offset;
154-
size_t str_size = storage.size() - offset;
155-
156-
Local<String> string = chunk->ToString(env->context()).ToLocalChecked();
157-
enum encoding encoding = ParseEncoding(env->isolate(),
158-
chunks->Get(env->context(), i * 2 + 1).ToLocalChecked());
159-
str_size = StringBytes::Write(env->isolate(),
159+
char* str_storage =
160+
reinterpret_cast<char*>(bs ? bs->Data() : nullptr) + offset;
161+
size_t str_size = (bs ? bs->ByteLength() : 0) - offset;
162+
163+
Local<String> string = chunk->ToString(context).ToLocalChecked();
164+
enum encoding encoding = ParseEncoding(isolate,
165+
chunks->Get(context, i * 2 + 1).ToLocalChecked());
166+
str_size = StringBytes::Write(isolate,
160167
str_storage,
161168
str_size,
162169
string,
@@ -169,9 +176,8 @@ int StreamBase::Writev(const FunctionCallbackInfo<Value>& args) {
169176

170177
StreamWriteResult res = Write(*bufs, count, nullptr, req_wrap_obj);
171178
SetWriteResult(res);
172-
if (res.wrap != nullptr && storage_size > 0) {
173-
res.wrap->SetAllocatedStorage(std::move(storage));
174-
}
179+
if (res.wrap != nullptr && storage_size > 0)
180+
res.wrap->SetBackingStore(std::move(bs));
175181
return res.err;
176182
}
177183

@@ -216,6 +222,8 @@ int StreamBase::WriteBuffer(const FunctionCallbackInfo<Value>& args) {
216222
template <enum encoding enc>
217223
int StreamBase::WriteString(const FunctionCallbackInfo<Value>& args) {
218224
Environment* env = Environment::GetCurrent(args);
225+
Isolate* isolate = env->isolate();
226+
IsolateData* isolate_data = env->isolate_data();
219227
CHECK(args[0]->IsObject());
220228
CHECK(args[1]->IsString());
221229

@@ -230,9 +238,9 @@ int StreamBase::WriteString(const FunctionCallbackInfo<Value>& args) {
230238
// computing their actual size, rather than tripling the storage.
231239
size_t storage_size;
232240
if (enc == UTF8 && string->Length() > 65535 &&
233-
!StringBytes::Size(env->isolate(), string, enc).To(&storage_size))
241+
!StringBytes::Size(isolate, string, enc).To(&storage_size))
234242
return 0;
235-
else if (!StringBytes::StorageSize(env->isolate(), string, enc)
243+
else if (!StringBytes::StorageSize(isolate, string, enc)
236244
.To(&storage_size))
237245
return 0;
238246

@@ -248,7 +256,7 @@ int StreamBase::WriteString(const FunctionCallbackInfo<Value>& args) {
248256
bool try_write = storage_size <= sizeof(stack_storage) &&
249257
(!IsIPCPipe() || send_handle_obj.IsEmpty());
250258
if (try_write) {
251-
data_size = StringBytes::Write(env->isolate(),
259+
data_size = StringBytes::Write(isolate,
252260
stack_storage,
253261
storage_size,
254262
string,
@@ -274,26 +282,28 @@ int StreamBase::WriteString(const FunctionCallbackInfo<Value>& args) {
274282
CHECK_EQ(count, 1);
275283
}
276284

277-
AllocatedBuffer data;
285+
std::unique_ptr<BackingStore> bs;
278286

279287
if (try_write) {
280288
// Copy partial data
281-
data = AllocatedBuffer::AllocateManaged(env, buf.len);
282-
memcpy(data.data(), buf.base, buf.len);
289+
NoArrayBufferZeroFillScope no_zero_fill_scope(isolate_data);
290+
bs = ArrayBuffer::NewBackingStore(isolate, buf.len);
291+
memcpy(reinterpret_cast<char*>(bs->Data()), buf.base, buf.len);
283292
data_size = buf.len;
284293
} else {
285294
// Write it
286-
data = AllocatedBuffer::AllocateManaged(env, storage_size);
287-
data_size = StringBytes::Write(env->isolate(),
288-
data.data(),
295+
NoArrayBufferZeroFillScope no_zero_fill_scope(isolate_data);
296+
bs = ArrayBuffer::NewBackingStore(isolate, storage_size);
297+
data_size = StringBytes::Write(isolate,
298+
reinterpret_cast<char*>(bs->Data()),
289299
storage_size,
290300
string,
291301
enc);
292302
}
293303

294304
CHECK_LE(data_size, storage_size);
295305

296-
buf = uv_buf_init(data.data(), data_size);
306+
buf = uv_buf_init(reinterpret_cast<char*>(bs->Data()), data_size);
297307

298308
uv_stream_t* send_handle = nullptr;
299309

@@ -312,9 +322,8 @@ int StreamBase::WriteString(const FunctionCallbackInfo<Value>& args) {
312322
res.bytes += synchronously_written;
313323

314324
SetWriteResult(res);
315-
if (res.wrap != nullptr) {
316-
res.wrap->SetAllocatedStorage(std::move(data));
317-
}
325+
if (res.wrap != nullptr)
326+
res.wrap->SetBackingStore(std::move(bs));
318327

319328
return res.err;
320329
}
@@ -511,27 +520,28 @@ void StreamResource::ClearError() {
511520
uv_buf_t EmitToJSStreamListener::OnStreamAlloc(size_t suggested_size) {
512521
CHECK_NOT_NULL(stream_);
513522
Environment* env = static_cast<StreamBase*>(stream_)->stream_env();
514-
return AllocatedBuffer::AllocateManaged(env, suggested_size).release();
523+
return env->allocate_managed_buffer(suggested_size);
515524
}
516525

517526
void EmitToJSStreamListener::OnStreamRead(ssize_t nread, const uv_buf_t& buf_) {
518527
CHECK_NOT_NULL(stream_);
519528
StreamBase* stream = static_cast<StreamBase*>(stream_);
520529
Environment* env = stream->stream_env();
521-
HandleScope handle_scope(env->isolate());
530+
Isolate* isolate = env->isolate();
531+
HandleScope handle_scope(isolate);
522532
Context::Scope context_scope(env->context());
523-
AllocatedBuffer buf(env, buf_);
533+
std::unique_ptr<BackingStore> bs = env->release_managed_buffer(buf_);
524534

525535
if (nread <= 0) {
526536
if (nread < 0)
527537
stream->CallJSOnreadMethod(nread, Local<ArrayBuffer>());
528538
return;
529539
}
530540

531-
CHECK_LE(static_cast<size_t>(nread), buf.size());
532-
buf.Resize(nread);
541+
CHECK_LE(static_cast<size_t>(nread), bs->ByteLength());
542+
bs = BackingStore::Reallocate(isolate, std::move(bs), nread);
533543

534-
stream->CallJSOnreadMethod(nread, buf.ToArrayBuffer());
544+
stream->CallJSOnreadMethod(nread, ArrayBuffer::New(isolate, std::move(bs)));
535545
}
536546

537547

‎src/stream_base.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include "env.h"
7-
#include "allocated_buffer.h"
87
#include "async_wrap.h"
98
#include "node.h"
109
#include "util.h"
@@ -90,7 +89,7 @@ class ShutdownWrap : public StreamReq {
9089

9190
class WriteWrap : public StreamReq {
9291
public:
93-
inline void SetAllocatedStorage(AllocatedBuffer&& storage);
92+
inline void SetBackingStore(std::unique_ptr<v8::BackingStore> bs);
9493

9594
inline WriteWrap(
9695
StreamBase* stream,
@@ -105,7 +104,7 @@ class WriteWrap : public StreamReq {
105104
void OnDone(int status) override;
106105

107106
private:
108-
AllocatedBuffer storage_;
107+
std::unique_ptr<v8::BackingStore> backing_store_;
109108
};
110109

111110

‎src/stream_pipe.cc

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "stream_pipe.h"
2-
#include "allocated_buffer-inl.h"
32
#include "stream_base-inl.h"
43
#include "node_buffer.h"
54
#include "util-inl.h"
65

76
namespace node {
87

8+
using v8::BackingStore;
99
using v8::Context;
1010
using v8::Function;
1111
using v8::FunctionCallbackInfo;
@@ -118,13 +118,13 @@ uv_buf_t StreamPipe::ReadableListener::OnStreamAlloc(size_t suggested_size) {
118118
StreamPipe* pipe = ContainerOf(&StreamPipe::readable_listener_, this);
119119
size_t size = std::min(suggested_size, pipe->wanted_data_);
120120
CHECK_GT(size, 0);
121-
return AllocatedBuffer::AllocateManaged(pipe->env(), size).release();
121+
return pipe->env()->allocate_managed_buffer(size);
122122
}
123123

124124
void StreamPipe::ReadableListener::OnStreamRead(ssize_t nread,
125125
const uv_buf_t& buf_) {
126126
StreamPipe* pipe = ContainerOf(&StreamPipe::readable_listener_, this);
127-
AllocatedBuffer buf(pipe->env(), buf_);
127+
std::unique_ptr<BackingStore> bs = pipe->env()->release_managed_buffer(buf_);
128128
if (nread < 0) {
129129
// EOF or error; stop reading and pass the error to the previous listener
130130
// (which might end up in JS).
@@ -144,19 +144,20 @@ void StreamPipe::ReadableListener::OnStreamRead(ssize_t nread,
144144
return;
145145
}
146146

147-
pipe->ProcessData(nread, std::move(buf));
147+
pipe->ProcessData(nread, std::move(bs));
148148
}
149149

150-
void StreamPipe::ProcessData(size_t nread, AllocatedBuffer&& buf) {
150+
void StreamPipe::ProcessData(size_t nread,
151+
std::unique_ptr<BackingStore> bs) {
151152
CHECK(uses_wants_write_ || pending_writes_ == 0);
152-
uv_buf_t buffer = uv_buf_init(buf.data(), nread);
153+
uv_buf_t buffer = uv_buf_init(reinterpret_cast<char*>(bs->Data()), nread);
153154
StreamWriteResult res = sink()->Write(&buffer, 1);
154155
pending_writes_++;
155156
if (!res.async) {
156157
writable_listener_.OnStreamAfterWrite(nullptr, res.err);
157158
} else {
158159
is_reading_ = false;
159-
res.wrap->SetAllocatedStorage(std::move(buf));
160+
res.wrap->SetBackingStore(std::move(bs));
160161
if (source() != nullptr)
161162
source()->ReadStop();
162163
}

‎src/stream_pipe.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

66
#include "stream_base.h"
7-
#include "allocated_buffer.h"
87

98
namespace node {
109

@@ -43,7 +42,7 @@ class StreamPipe : public AsyncWrap {
4342
// `OnStreamWantsWrite()` support.
4443
size_t wanted_data_ = 0;
4544

46-
void ProcessData(size_t nread, AllocatedBuffer&& buf);
45+
void ProcessData(size_t nread, std::unique_ptr<v8::BackingStore> bs);
4746

4847
class ReadableListener : public StreamListener {
4948
public:

0 commit comments

Comments
 (0)