Skip to content
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.

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

src: allow embedder-provided PageAllocator in NodePlatform #38362

Closed
Closed
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
src: allow embedder-provided PageAllocator in NodePlatform
For certain embedder use cases there are more complex memory allocation
requirements that the default V8 page allocator does not handle. For example,
using MAP_JIT when running under a hardened runtime environment on macOS.
This allows embedders like Electron to provide their own allocator that
does handle these cases.
  • Loading branch information
codebytere committed Apr 25, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 68b6cef9bf5dcf1fdbaef801df154cac9af78c14
10 changes: 7 additions & 3 deletions src/api/environment.cc
Original file line number Diff line number Diff line change
@@ -465,7 +465,8 @@ MultiIsolatePlatform* CreatePlatform(
MultiIsolatePlatform* CreatePlatform(
int thread_pool_size,
v8::TracingController* tracing_controller) {
return MultiIsolatePlatform::Create(thread_pool_size, tracing_controller)
return MultiIsolatePlatform::Create(thread_pool_size,
tracing_controller)
.release();
}

@@ -475,8 +476,11 @@ void FreePlatform(MultiIsolatePlatform* platform) {

std::unique_ptr<MultiIsolatePlatform> MultiIsolatePlatform::Create(
int thread_pool_size,
v8::TracingController* tracing_controller) {
return std::make_unique<NodePlatform>(thread_pool_size, tracing_controller);
v8::TracingController* tracing_controller,
v8::PageAllocator* page_allocator) {
return std::make_unique<NodePlatform>(thread_pool_size,
tracing_controller,
page_allocator);
}

MaybeLocal<Object> GetPerContextExports(Local<Context> context) {
3 changes: 2 additions & 1 deletion src/node.h
Original file line number Diff line number Diff line change
@@ -310,7 +310,8 @@ class NODE_EXTERN MultiIsolatePlatform : public v8::Platform {

static std::unique_ptr<MultiIsolatePlatform> Create(
int thread_pool_size,
v8::TracingController* tracing_controller = nullptr);
v8::TracingController* tracing_controller = nullptr,
v8::PageAllocator* page_allocator = nullptr);
codebytere marked this conversation as resolved.
Show resolved Hide resolved
};

enum IsolateSettingsFlags {
11 changes: 10 additions & 1 deletion src/node_platform.cc
Original file line number Diff line number Diff line change
@@ -324,12 +324,17 @@ void PerIsolatePlatformData::DecreaseHandleCount() {
}

NodePlatform::NodePlatform(int thread_pool_size,
v8::TracingController* tracing_controller) {
v8::TracingController* tracing_controller,
v8::PageAllocator* page_allocator) {
if (tracing_controller != nullptr) {
tracing_controller_ = tracing_controller;
} else {
tracing_controller_ = new v8::TracingController();
}

// V8 will default to its built in allocator if none is provided.
page_allocator_ = page_allocator;

// TODO(addaleax): It's a bit icky that we use global state here, but we can't
// really do anything about it unless V8 starts exposing a way to access the
// current v8::Platform instance.
@@ -550,6 +555,10 @@ Platform::StackTracePrinter NodePlatform::GetStackTracePrinter() {
};
}

v8::PageAllocator* NodePlatform::GetPageAllocator() {
return page_allocator_;
}

template <class T>
TaskQueue<T>::TaskQueue()
: lock_(), tasks_available_(), tasks_drained_(),
5 changes: 4 additions & 1 deletion src/node_platform.h
Original file line number Diff line number Diff line change
@@ -138,7 +138,8 @@ class WorkerThreadsTaskRunner {
class NodePlatform : public MultiIsolatePlatform {
public:
NodePlatform(int thread_pool_size,
v8::TracingController* tracing_controller);
v8::TracingController* tracing_controller,
v8::PageAllocator* page_allocator = nullptr);
~NodePlatform() override;

void DrainTasks(v8::Isolate* isolate) override;
@@ -170,6 +171,7 @@ class NodePlatform : public MultiIsolatePlatform {
v8::Isolate* isolate) override;

Platform::StackTracePrinter GetStackTracePrinter() override;
v8::PageAllocator* GetPageAllocator() override;

private:
IsolatePlatformDelegate* ForIsolate(v8::Isolate* isolate);
@@ -181,6 +183,7 @@ class NodePlatform : public MultiIsolatePlatform {
std::unordered_map<v8::Isolate*, DelegatePair> per_isolate_;

v8::TracingController* tracing_controller_;
v8::PageAllocator* page_allocator_;
std::shared_ptr<WorkerThreadsTaskRunner> worker_thread_task_runner_;
bool has_shut_down_ = false;
};