Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
599 changes: 246 additions & 353 deletions src/cares_wrap.cc

Large diffs are not rendered by default.

15 changes: 3 additions & 12 deletions src/encoding_binding.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ using v8::BackingStoreInitializationMode;
using v8::BackingStoreOnFailureMode;
using v8::Context;
using v8::FunctionCallbackInfo;
using v8::HandleScope;
using v8::Isolate;
using v8::Local;
using v8::Object;
Expand Down Expand Up @@ -67,10 +66,7 @@ bool BindingData::PrepareForSerialization(Local<Context> context,
}

InternalFieldInfoBase* BindingData::Serialize(int index) {
DCHECK_IS_SNAPSHOT_SLOT(index);
InternalFieldInfo* info = internal_field_info_;
internal_field_info_ = nullptr;
return info;
return TakeInternalFieldInfo(index, &internal_field_info_);
}

// The following code is adapted from Cloudflare workers.
Expand Down Expand Up @@ -185,13 +181,8 @@ void BindingData::Deserialize(Local<Context> context,
int index,
InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index);
HandleScope scope(Isolate::GetCurrent());
Realm* realm = Realm::GetCurrent(context);
// Recreate the buffer in the constructor.
InternalFieldInfo* casted_info = static_cast<InternalFieldInfo*>(info);
BindingData* binding =
realm->AddBindingData<BindingData>(holder, casted_info);
CHECK_NOT_NULL(binding);
Realm::DeserializeBindingData<BindingData>(
context, holder, static_cast<InternalFieldInfo*>(info));
}

void BindingData::EncodeInto(const FunctionCallbackInfo<Value>& args) {
Expand Down
5 changes: 1 addition & 4 deletions src/glob/node_glob.cc
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,7 @@ void BindingData::Deserialize(Local<Context> context,
int index,
InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index);
Realm* realm = Realm::GetCurrent(context);
HandleScope scope(realm->isolate());
BindingData* binding = realm->AddBindingData<BindingData>(holder, info);
CHECK_NOT_NULL(binding);
Realm::DeserializeBindingData<BindingData>(context, holder, info);
}

void BindingData::MemoryInfo(MemoryTracker* tracker) const {
Expand Down
9 changes: 2 additions & 7 deletions src/node_blob.cc
Original file line number Diff line number Diff line change
Expand Up @@ -584,10 +584,7 @@ void BlobBindingData::Deserialize(Local<Context> context,
int index,
InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index);
HandleScope scope(Isolate::GetCurrent());
Realm* realm = Realm::GetCurrent(context);
BlobBindingData* binding = realm->AddBindingData<BlobBindingData>(holder);
CHECK_NOT_NULL(binding);
Realm::DeserializeBindingData<BlobBindingData>(context, holder);
}

bool BlobBindingData::PrepareForSerialization(Local<Context> context,
Expand All @@ -600,9 +597,7 @@ bool BlobBindingData::PrepareForSerialization(Local<Context> context,

InternalFieldInfoBase* BlobBindingData::Serialize(int index) {
DCHECK_IS_SNAPSHOT_SLOT(index);
InternalFieldInfo* info =
InternalFieldInfoBase::New<InternalFieldInfo>(type());
return info;
return InternalFieldInfoBase::New<InternalFieldInfo>(type());
}

void Blob::RegisterExternalReferences(ExternalReferenceRegistry* registry) {
Expand Down
12 changes: 3 additions & 9 deletions src/node_diagnostics_channel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -125,22 +125,16 @@ bool BindingData::PrepareForSerialization(Local<Context> context,
}

InternalFieldInfoBase* BindingData::Serialize(int index) {
DCHECK_IS_SNAPSHOT_SLOT(index);
InternalFieldInfo* info = internal_field_info_;
internal_field_info_ = nullptr;
return info;
return TakeInternalFieldInfo(index, &internal_field_info_);
}

void BindingData::Deserialize(Local<Context> context,
Local<Object> holder,
int index,
InternalFieldInfoBase* info) {
DCHECK_IS_SNAPSHOT_SLOT(index);
HandleScope scope(Isolate::GetCurrent());
Realm* realm = Realm::GetCurrent(context);
BindingData* binding = realm->AddBindingData<BindingData>(
holder, static_cast<InternalFieldInfo*>(info));
CHECK_NOT_NULL(binding);
Realm::DeserializeBindingData<BindingData>(
context, holder, static_cast<InternalFieldInfo*>(info));
}

void BindingData::SetChannelStatusCallback(uint32_t index,
Expand Down
Loading
Loading