mirrors/escargot
2
0
Fork 0
mirror of https://github.com/Samsung/escargot.git synced 2026-06-22 10:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update measurement of source code size for the code compression

Browse source 
Signed-off-by: HyukWoo Park <hyukwoo.park@samsung.com>
This commit is contained in:
HyukWoo Park 2022-01-27 21:18:18 +09:00
commit d1535b2088
4 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/EscargotPublic.h
View file

@ -645,8 +645,6 @@ public:
void unregisterErrorCreationCallback();
size_t validSourceSize();
void increaseSourceSize(size_t size);
void decreaseSourceSize(size_t size);
enum PromiseHookType {
Init,

19
src/runtime/CompressibleString.cpp
View file

@ -58,14 +58,17 @@ CompressibleString::CompressibleString(VMInstance* instance)
GC_REGISTER_FINALIZER_NO_ORDER(this, [](void* obj, void*) {
CompressibleString* self = (CompressibleString*)obj;
ASSERT(self->refCount() == 0);
size_t strLength = self->m_bufferData.length * (self->m_bufferData.has8BitContent ? 1 : 2);
if (self->isCompressed()) {
self->clearCompressedData();
} else {
deallocateStringDataBuffer(const_cast<void*>(self->m_bufferData.buffer), self->m_bufferData.length * (self->m_bufferData.has8BitContent ? 1 : 2));
deallocateStringDataBuffer(const_cast<void*>(self->m_bufferData.buffer), strLength);
}
if (!self->m_isOwnerMayFreed) {
self->m_vmInstance->compressibleStringsUncomressedBufferSize() -= self->decomressedBufferSize();
self->m_vmInstance->decreaseSourceSize(strLength);
auto& v = self->m_vmInstance->compressibleStrings();
v.erase(std::find(v.begin(), v.end(), self));
@ -80,6 +83,7 @@ CompressibleString::CompressibleString(VMInstance* instance, const char* str, si
char* buf = (char*)allocateStringDataBuffer(sizeof(char) * len);
memcpy(buf, str, len);
initBufferAccessData(buf, len, true);
instance->increaseSourceSize(len);
}
CompressibleString::CompressibleString(VMInstance* instance, const LChar* str, size_t len)
@ -88,6 +92,7 @@ CompressibleString::CompressibleString(VMInstance* instance, const LChar* str, s
char* buf = (char*)allocateStringDataBuffer(sizeof(char) * len);
memcpy(buf, str, len);
initBufferAccessData(buf, len, true);
instance->increaseSourceSize(len);
}
CompressibleString::CompressibleString(VMInstance* instance, const char16_t* str, size_t len)
@ -96,11 +101,13 @@ CompressibleString::CompressibleString(VMInstance* instance, const char16_t* str
char* buf = (char*)allocateStringDataBuffer(sizeof(char) * len * 2);
memcpy(buf, str, len * 2);
initBufferAccessData(buf, len, false);
instance->increaseSourceSize(len * 2);
}
CompressibleString::CompressibleString(VMInstance* instance, void* buffer, size_t stringLength, bool is8bit)
: CompressibleString(instance)
{
RELEASE_ASSERT_NOT_REACHED();
initBufferAccessData(buffer, stringLength, is8bit);
}
@ -206,6 +213,7 @@ bool CompressibleString::compressWorker()
GC_disable();
size_t originByteLength = m_bufferData.length * sizeof(StringType);
size_t totalDecompLength = 0;
int lastBoundLength = 0;
char* tempBuffer = nullptr;
for (size_t srcIndex = 0; srcIndex < originByteLength; srcIndex += g_compressChunkSize) {
@ -228,6 +236,8 @@ bool CompressibleString::compressWorker()
}
ASSERT(compressedLength > 0);
totalDecompLength += compressedLength;
char* compBuffer = reinterpret_cast<char*>(GC_MALLOC_ATOMIC(compressedLength));
memcpy(compBuffer, tempBuffer, compressedLength);
m_compressedData.push_back(CompressedElement(compBuffer, compressedLength));
@ -236,6 +246,8 @@ bool CompressibleString::compressWorker()
delete[] tempBuffer;
m_vmInstance->compressibleStringsUncomressedBufferSize() -= decomressedBufferSize();
ASSERT(originByteLength > totalDecompLength);
m_vmInstance->decreaseSourceSize(originByteLength - totalDecompLength);
GC_enable();
@ -265,6 +277,7 @@ void CompressibleString::decompressWorker()
ASSERT(m_isCompressed);
size_t originByteLength = m_bufferData.length * sizeof(StringType);
size_t totalDecompLength = 0;
char* dstBuffer = (char*)allocateStringDataBuffer(originByteLength);
int dstIndex = 0;
@ -272,6 +285,8 @@ void CompressibleString::decompressWorker()
for (size_t srcIndex = 0, bufIndex = 0; srcIndex < originByteLength; srcIndex += g_compressChunkSize, bufIndex++) {
int srcSize = (int)std::min(g_compressChunkSize, originByteLength - srcIndex);
totalDecompLength += m_compressedData[bufIndex].compressedLength;
int decompressedLength = LZ4::LZ4_decompress_safe(m_compressedData[bufIndex].compressedBuffer, dstBuffer + dstIndex, m_compressedData[bufIndex].compressedLength, srcSize);
if (!decompressedLength) {
// decompress fail
@ -287,6 +302,8 @@ void CompressibleString::decompressWorker()
m_isCompressed = false;
m_vmInstance->compressibleStringsUncomressedBufferSize() += decomressedBufferSize();
ASSERT(originByteLength > totalDecompLength);
m_vmInstance->increaseSourceSize(originByteLength - totalDecompLength);
}
} // namespace Escargot

1
src/runtime/String.cpp
View file

@ -664,6 +664,7 @@ String* String::fromUTF8(const char* src, size_t len, bool maybeASCII)
String* String::fromUTF8ToCompressibleString(VMInstance* instance, const char* src, size_t len, bool maybeASCII)
{
if (maybeASCII && isAllASCII(src, len)) {
RELEASE_ASSERT_NOT_REACHED();
return new CompressibleString(instance, src, len);
} else {
auto s = utf8StringToUTF16StringNonGC(src, len);

15
src/shell/Shell.cpp
View file

@ -192,19 +192,22 @@ static OptionalRef<StringRef> builtinHelperFileRead(OptionalRef<ExecutionStateRe
}
fclose(fp);
if (StringRef::isCompressibleStringEnabled()) {
if (state) {
if (hasNonLatin1Content) {
src = StringRef::createFromUTF8ToCompressibleString(state->context()->vmInstance(), utf8Str.data(), utf8Str.length(), false);
} else {
src = StringRef::createFromLatin1ToCompressibleString(state->context()->vmInstance(), str.data(), str.length());
}
//if (state) {
if (hasNonLatin1Content) {
src = StringRef::createFromUTF8ToCompressibleString(state->context()->vmInstance(), utf8Str.data(), utf8Str.length(), false);
} else {
src = StringRef::createFromLatin1ToCompressibleString(state->context()->vmInstance(), str.data(), str.length());
}
//}
/*
else {
if (hasNonLatin1Content) {
src = StringRef::createFromUTF8(utf8Str.data(), utf8Str.length(), false);
} else {
src = StringRef::createFromLatin1(str.data(), str.length());
}
}
*/
} else {
if (hasNonLatin1Content) {
src = StringRef::createFromUTF8(state->context(), utf8Str.data(), utf8Str.length(), false);