first very naive implementation for testing

mmomtchev · May 4, 2024 · f306589 · f306589
1 parent fcc1629
commit f306589
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-### [1.1.0] 2024-04-26
+## [1.2.0]
+
+ - Implement a solution to [#110](https://github.com/mmomtchev/everything-json/issues/110), report allocated memory to the GC
+
+## [1.1.0] 2024-04-26
 
  - Pre-built binaries for macOS 14 / ARM64
  - Update `simdjson` to 3.9.1

diff --git a/src/JSON.cc b/src/JSON.cc
@@ -12,7 +12,7 @@ JSONElementContext::JSONElementContext(const JSONElementContext &parent, const e
 
 JSONElementContext::JSONElementContext() {}
 
-JSON::JSON(const CallbackInfo &info) : ObjectWrap<JSON>(info) {
+JSON::JSON(const CallbackInfo &info) : ObjectWrap<JSON>(info), external_memory(0) {
   Napi::Env env(info.Env());
 
   if (info.Length() != 1 || !info[0].IsExternal()) {
@@ -28,9 +28,15 @@ JSON::JSON(const CallbackInfo &info) : ObjectWrap<JSON>(info) {
   store_json = context->store_json;
   store_get = context->store_get;
   store_expand = context->store_expand;
+  // This overreports memory to the GC
+  external_memory = input_text->length() * 2;
+  Napi::MemoryManagement::AdjustExternalMemory(env, external_memory);
 }
 
-JSON::~JSON() {}
+JSON::~JSON() {
+  Napi::MemoryManagement::AdjustExternalMemory(Env(), -external_memory);
+  external_memory = 0;
+}
 
 shared_ptr<padded_string> JSON::GetString(const CallbackInfo &info) {
   Napi::Env env(info.Env());

diff --git a/src/jsonAsync.h b/src/jsonAsync.h
@@ -136,6 +136,9 @@ class JSON : public ObjectWrap<JSON>, JSONElementContext {
   static void ProcessRunQueue(uv_async_t *);
 
   static Function GetClass(Napi::Env env);
+
+private:
+  int64_t external_memory;
 };
 
 #define TRY_RETURN_FROM_STORE(store, el)                                                                               \