FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

src: add v8::Local specialization for MaybeStackBuffer · nodejs/node@613be79 · GitHub

/ node Public

Commit 613be79

Browse files
jasnell
authored and
aduh95
committed
src: add v8::Local specialization for MaybeStackBuffer
Long-term itch. Per v8 rules, we're not supposed to be heap allocating v8::Local's; instead we're supposed to be using v8::LocalVector. Create a specialization of MaybeStackBuffer that uses either a stack array of v8::Locals or v8::LocalVector with some additional utility improvements. Signed-off-by: James M Snell <jasnell@gmail.com> PR-URL: #65159 Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
1 parent 825fcfe commit 613be79

15 files changed

Lines changed: 161 additions & 49 deletions

‎src/api/callback.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ MaybeLocal<Value> InternalMakeCallback(Environment* env,
245245

246246
Local<Context> context = env->context();
247247
if (use_async_hooks_trampoline) {
248-
MaybeStackBuffer<Local<Value>, 16> args(3 + argc);
248+
MaybeStackBuffer<Value, 16> args(env->isolate(), 3 + argc);
249249
args[0] = Number::New(env->isolate(), asyncContext.async_id);
250250
args[1] = resource;
251251
args[2] = callback;

‎src/cares_wrap.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ Local<Array> AddrTTLToArray(
201201
Environment* env,
202202
const T* addrttls,
203203
size_t naddrttls) {
204-
MaybeStackBuffer<Local<Value>, 8> ttls(naddrttls);
204+
MaybeStackBuffer<Value, 8> ttls(env->isolate(), naddrttls);
205205
for (size_t i = 0; i < naddrttls; i++) {
206206
ttls[i] = Integer::NewFromUnsigned(env->isolate(), addrttls[i].ttl);
207207
}
208208

209-
return Array::New(env->isolate(), ttls.out(), naddrttls);
209+
return ttls.ToArray();
210210
}
211211

212212
int GetAnswerCountForTTLBuffer(const unsigned char* buf, int len) {

‎src/crypto/crypto_tls.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ using ncrypto::MarkPopErrorOnReturn;
4141
using ncrypto::SSLPointer;
4242
using ncrypto::SSLSessionPointer;
4343
using ncrypto::X509Pointer;
44-
using v8::Array;
4544
using v8::ArrayBuffer;
4645
using v8::ArrayBufferView;
4746
using v8::BackingStore;
@@ -1956,7 +1955,7 @@ void TLSWrap::GetSharedSigalgs(const FunctionCallbackInfo<Value>& args) {
19561955
SSL* ssl = w->ssl_.get();
19571956
int nsig = SSL_get_shared_sigalgs(ssl, 0, nullptr, nullptr, nullptr, nullptr,
19581957
nullptr);
1959-
MaybeStackBuffer<Local<Value>, 16> ret_arr(nsig);
1958+
MaybeStackBuffer<Value, 16> ret_arr(env->isolate(), nsig);
19601959

19611960
for (int i = 0; i < nsig; i++) {
19621961
int hash_nid;
@@ -2023,8 +2022,7 @@ void TLSWrap::GetSharedSigalgs(const FunctionCallbackInfo<Value>& args) {
20232022
ret_arr[i] = OneByteString(env->isolate(), sig_with_md);
20242023
}
20252024

2026-
args.GetReturnValue().Set(
2027-
Array::New(env->isolate(), ret_arr.out(), ret_arr.length()));
2025+
args.GetReturnValue().Set(ret_arr.ToArray());
20282026
}
20292027

20302028
void TLSWrap::ExportKeyingMaterial(const FunctionCallbackInfo<Value>& args) {

‎src/js_stream.cc‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace node {
1111

1212
using errors::TryCatchScope;
1313

14-
using v8::Array;
1514
using v8::Context;
1615
using v8::FunctionCallbackInfo;
1716
using v8::FunctionTemplate;
@@ -119,17 +118,14 @@ int JSStream::DoWrite(WriteWrap* w,
119118

120119
int value_int = UV_EPROTO;
121120

122-
MaybeStackBuffer<Local<Value>, 16> bufs_arr(count);
121+
MaybeStackBuffer<Value, 16> bufs_arr(env()->isolate(), count);
123122
for (size_t i = 0; i < count; i++) {
124123
if (!Buffer::Copy(env(), bufs[i].base, bufs[i].len).ToLocal(&bufs_arr[i])) {
125124
return value_int;
126125
}
127126
}
128127

129-
Local<Value> argv[] = {
130-
w->object(),
131-
Array::New(env()->isolate(), bufs_arr.out(), count)
132-
};
128+
Local<Value> argv[] = {w->object(), bufs_arr.ToArray()};
133129

134130
TryCatchScope try_catch(env());
135131
Local<Value> value;

‎src/js_udp_wrap.cc‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
namespace node {
1212

1313
using errors::TryCatchScope;
14-
using v8::Array;
1514
using v8::Context;
1615
using v8::FunctionCallbackInfo;
1716
using v8::FunctionTemplate;
@@ -98,7 +97,7 @@ ssize_t JSUDPWrap::Send(uv_buf_t* bufs,
9897
int64_t value_int = JS_EXCEPTION_PENDING;
9998
size_t total_len = 0;
10099

101-
MaybeStackBuffer<Local<Value>, 16> buffers(nbufs);
100+
MaybeStackBuffer<Value, 16> buffers(env()->isolate(), nbufs);
102101
for (size_t i = 0; i < nbufs; i++) {
103102
if (!Buffer::Copy(env(), bufs[i].base, bufs[i].len).ToLocal(&buffers[i])) {
104103
return value_int;
@@ -110,9 +109,9 @@ ssize_t JSUDPWrap::Send(uv_buf_t* bufs,
110109
if (!AddressToJS(env(), addr).ToLocal(&address)) return value_int;
111110

112111
Local<Value> args[] = {
113-
listener()->CreateSendWrap(total_len)->object(),
114-
Array::New(env()->isolate(), buffers.out(), nbufs),
115-
address,
112+
listener()->CreateSendWrap(total_len)->object(),
113+
buffers.ToArray(),
114+
address,
116115
};
117116

118117
if (!MakeCallback(env()->onwrite_string(), arraysize(args), args)

‎src/node_concepts.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
55

6+
#include <v8.h>
67
#include <concepts>
78
#include <limits>
89
#include <type_traits>
@@ -32,6 +33,12 @@ concept StandardCharType =
3233
template <typename T>
3334
concept IsCallable = std::is_function<T>::value || requires { &T::operator(); };
3435

36+
// Types that can reside on V8's managed heap (v8::Value, v8::Object, etc.).
37+
// Used to select the MaybeStackBuffer specialization that holds handles in a
38+
// v8::LocalVector instead of malloc'd memory.
39+
template <typename T>
40+
concept V8Type = std::is_base_of_v<v8::Data, T>;
41+
3542
} // namespace node
3643

3744
#endif // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

‎src/node_dir.cc‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ static MaybeLocal<Array> DirentListToArray(Environment* env,
206206
uv_dirent_t* ents,
207207
int num,
208208
enum encoding encoding) {
209-
MaybeStackBuffer<Local<Value>, 64> entries(num * 2);
209+
MaybeStackBuffer<Value, 64> entries(env->isolate(), num * 2);
210210

211211
// Return an array of all read filenames.
212212
int j = 0;
@@ -222,7 +222,8 @@ static MaybeLocal<Array> DirentListToArray(Environment* env,
222222
entries[j++] = Integer::New(env->isolate(), ents[i].type);
223223
}
224224

225-
return Array::New(env->isolate(), entries.out(), j);
225+
CHECK_EQ(j, num * 2);
226+
return entries.ToArray();
226227
}
227228

228229
static void AfterDirRead(uv_fs_t* req) {

‎src/node_env_var.cc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ MaybeLocal<Array> RealEnvStore::Enumerate(Isolate* isolate) const {
201201
auto cleanup = OnScopeLeave([&]() { uv_os_free_environ(items, count); });
202202
CHECK_EQ(uv_os_environ(&items, &count), 0);
203203

204-
MaybeStackBuffer<Local<Value>, 256> env_v(count);
204+
MaybeStackBuffer<Value, 256> env_v(isolate, count);
205205
int env_v_index = 0;
206206
for (int i = 0; i < count; i++) {
207207
#ifdef _WIN32
@@ -216,7 +216,10 @@ MaybeLocal<Array> RealEnvStore::Enumerate(Isolate* isolate) const {
216216
env_v[env_v_index++] = str;
217217
}
218218

219-
return Array::New(isolate, env_v.out(), env_v_index);
219+
// We're possibly not filling the entire buffer.
220+
CHECK_LE(env_v_index, count);
221+
env_v.SetLength(env_v_index);
222+
return env_v.ToArray();
220223
}
221224

222225
std::shared_ptr<KVStore> KVStore::Clone(Isolate* isolate) const {

‎src/node_http2.cc‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,8 +1585,8 @@ void Http2Session::HandleHeadersFrame(const nghttp2_frame* frame) {
15851585
// this way for performance reasons (it's faster to generate and pass an
15861586
// array than it is to generate and pass the object).
15871587

1588-
MaybeStackBuffer<Local<Value>, 64> headers_v(stream->headers_count() * 2);
1589-
MaybeStackBuffer<Local<Value>, 32> sensitive_v(stream->headers_count());
1588+
MaybeStackBuffer<Value, 64> headers_v(isolate, stream->headers_count() * 2);
1589+
MaybeStackBuffer<Value, 32> sensitive_v(isolate, stream->headers_count());
15901590
size_t sensitive_count = 0;
15911591

15921592
stream->TransferHeaders([&](const Http2Header& header, size_t i) {
@@ -1603,13 +1603,14 @@ void Http2Session::HandleHeadersFrame(const nghttp2_frame* frame) {
16031603
stream->retained_headers_length_ += stream->current_headers_length_;
16041604
stream->current_headers_length_ = 0;
16051605

1606+
sensitive_v.SetLength(sensitive_count);
16061607
Local<Value> args[] = {
1607-
stream->object(),
1608-
Integer::New(isolate, id),
1609-
Integer::New(isolate, stream->headers_category()),
1610-
Integer::New(isolate, frame->hd.flags),
1611-
Array::New(isolate, headers_v.out(), headers_v.length()),
1612-
Array::New(isolate, sensitive_v.out(), sensitive_count),
1608+
stream->object(),
1609+
Integer::New(isolate, id),
1610+
Integer::New(isolate, stream->headers_category()),
1611+
Integer::New(isolate, frame->hd.flags),
1612+
headers_v.ToArray(),
1613+
sensitive_v.ToArray(),
16131614
};
16141615
MakeCallback(env()->http2session_on_headers_function(),
16151616
arraysize(args), args);

‎src/node_messaging.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,7 +1093,7 @@ void MessagePort::PostMessage(const FunctionCallbackInfo<Value>& args) {
10931093
"MessagePort.postMessage");
10941094
}
10951095

1096-
TransferList transfer_list;
1096+
TransferList transfer_list(env->isolate());
10971097
if (!GetTransferList(env, context, args[1], &transfer_list)) {
10981098
return;
10991099
}
@@ -1607,7 +1607,7 @@ static void StructuredClone(const FunctionCallbackInfo<Value>& args) {
16071607

16081608
Local<Value> value = args[0];
16091609

1610-
TransferList transfer_list;
1610+
TransferList transfer_list(isolate);
16111611
Local<Object> options = args[1].As<Object>();
16121612
Local<Value> transfer_list_v;
16131613
if (!options->Get(context, env->transfer_string())

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL