Skip to content

wasi: use memory-tracking allocator #30745

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 6 commits into from
Closed

wasi: use memory-tracking allocator #30745

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b09d63
src: port memory-tracking allocator from QUIC repo
addaleax Dec 1, 2019
34a9e5f
http2: use shared memory tracking implementation
addaleax Sep 21, 2019
a550883
http2: track nghttp2-allocated memory in heap snapshot
addaleax Dec 1, 2019
11135bb
deps: update uvwasi
addaleax Dec 1, 2019
05d809e
wasi: use memory-tracking allocator
addaleax Dec 1, 2019
8bf83d3
fixup! src: port memory-tracking allocator from QUIC repo
addaleax Dec 4, 2019
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
wasi: use memory-tracking allocator 
This:

- Protects against memory leaks in uvwasi.
- Allows tracking the allocated memory in heap dumps.
  • Loading branch information
@addaleax
addaleax committed Dec 1, 2019
commit 05d809eca85a49933ae72231f15291817a3e9c4e
21 changes: 21 additions & 0 deletions src/node_wasi.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "env-inl.h"
#include "base_object-inl.h"
#include "debug_utils.h"
#include "memory_tracker-inl.h"
#include "node_mem-inl.h"
#include "util-inl.h"
#include "node.h"
#include "uv.h"
Expand Down Expand Up @@ -85,14 +87,33 @@ WASI::WASI(Environment* env,
Local<Object> object,
uvwasi_options_t* options) : BaseObject(env, object) {
MakeWeak();
alloc_info_ = MakeAllocator();
options->allocator = &alloc_info_;
CHECK_EQ(uvwasi_init(&uvw_, options), UVWASI_ESUCCESS);
}


WASI::~WASI() {
uvwasi_destroy(&uvw_);
CHECK_EQ(current_uvwasi_memory_, 0);
}

void WASI::MemoryInfo(MemoryTracker* tracker) const {
tracker->TrackField("memory", memory_);
tracker->TrackFieldWithSize("uvwasi_memory", current_uvwasi_memory_);
}

void WASI::CheckAllocatedSize(size_t previous_size) const {
CHECK_GE(current_uvwasi_memory_, previous_size);
}

void WASI::IncreaseAllocatedSize(size_t size) {
current_uvwasi_memory_ += size;
}

void WASI::DecreaseAllocatedSize(size_t size) {
current_uvwasi_memory_ -= size;
}

void WASI::New(const FunctionCallbackInfo<Value>& args) {
CHECK(args.IsConstructCall());
Expand Down
17 changes: 11 additions & 6 deletions src/node_wasi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,22 @@
#if defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS

#include "base_object.h"
#include "memory_tracker-inl.h"
#include "node_mem.h"
#include "uvwasi.h"

namespace node {
namespace wasi {


class WASI : public BaseObject {
class WASI : public BaseObject,
public mem::NgLibMemoryManager<WASI, uvwasi_mem_t> {
public:
WASI(Environment* env,
v8::Local<v8::Object> object,
uvwasi_options_t* options);
static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
void MemoryInfo(MemoryTracker* tracker) const override {
/* TODO(cjihrig): Get memory consumption from uvwasi. */
tracker->TrackField("memory", memory_);
}

void MemoryInfo(MemoryTracker* tracker) const override;
SET_MEMORY_INFO_NAME(WASI)
SET_SELF_SIZE(WASI)

Expand Down Expand Up @@ -79,6 +77,11 @@ class WASI : public BaseObject {

static void _SetMemory(const v8::FunctionCallbackInfo<v8::Value>& args);

// Implementation for mem::NgLibMemoryManager
void CheckAllocatedSize(size_t previous_size) const;
void IncreaseAllocatedSize(size_t size);
void DecreaseAllocatedSize(size_t size);

private:
~WASI() override;
inline void readUInt8(char* memory, uint8_t* value, uint32_t offset);
Expand All @@ -92,6 +95,8 @@ class WASI : public BaseObject {
uvwasi_errno_t backingStore(char** store, size_t* byte_length);
uvwasi_t uvw_;
v8::Global<v8::Object> memory_;
uvwasi_mem_t alloc_info_;
size_t current_uvwasi_memory_ = 0;
};


Expand Down