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

[optimization] free string memory after JSON is parsed. #17479

Merged
merged 5 commits into from
Aug 1, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
12 changes: 11 additions & 1 deletion native/cocos/bindings/jswrapper/v8/Object.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,23 @@ Object *Object::createJSONObject(const ccstd::string &jsonStr) {
}

Object *Object::createJSONObject(std::u16string &&jsonStr) {
auto v8Str = v8::String::NewExternalTwoByte(__isolate, ccnew internal::ExternalStringResource(std::move(jsonStr)));
auto *external = ccnew internal::ExternalStringResource(std::move(jsonStr));
external->addRef();
minggo marked this conversation as resolved.
Show resolved Hide resolved

auto v8Str = v8::String::NewExternalTwoByte(__isolate, external);
if (v8Str.IsEmpty()) {
external->release();
return nullptr;
}

v8::Local<v8::Context> context = __isolate->GetCurrentContext();
v8::MaybeLocal<v8::Value> ret = v8::JSON::Parse(context, v8Str.ToLocalChecked());

// After v8::JSON::Parse, the memory of u16string could be freed.
external->freeMemory();
external->release();
external = nullptr;

if (ret.IsEmpty()) {
return nullptr;
}
Expand Down
33 changes: 33 additions & 0 deletions native/cocos/bindings/jswrapper/v8/Utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,39 @@ void clearPrivate(v8::Isolate *isolate, ObjectWrap &wrap) {
}
}

// ExternalStringResource
ExternalStringResource::ExternalStringResource(std::u16string &&s)
: _s(std::move(s)) {
minggo marked this conversation as resolved.
Show resolved Hide resolved
}

const uint16_t* ExternalStringResource::data() const {
return reinterpret_cast<const uint16_t*>(_s.data());
}

size_t ExternalStringResource::length() const {
return _s.length();
}

void ExternalStringResource::Dispose() {
release();
}

void ExternalStringResource::freeMemory() {
_s.clear();
_s.shrink_to_fit();
}

void ExternalStringResource::addRef() {
++_refCount;
}

void ExternalStringResource::release() {
--_refCount;
if (_refCount == 0) {
delete this;
}
}

} // namespace internal
} // namespace se

Expand Down
22 changes: 8 additions & 14 deletions native/cocos/bindings/jswrapper/v8/Utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,26 +52,20 @@ void clearPrivate(v8::Isolate *isolate, ObjectWrap &wrap);

class ExternalStringResource : public v8::String::ExternalStringResource {
public:
explicit ExternalStringResource(std::u16string &&s)
: _s(std::move(s)) {

}

explicit ExternalStringResource(std::u16string &&s);
~ExternalStringResource() override = default;

const uint16_t* data() const override {
return reinterpret_cast<const uint16_t*>(_s.data());
}
const uint16_t* data() const override;
size_t length() const override;
void Dispose() override;

size_t length() const override {
return _s.length();
}
void freeMemory();

void Dispose() override {
delete this;
}
void addRef();
void release();
private:
std::u16string _s;
uint32_t _refCount{1};
};

} // namespace internal
Expand Down
Loading