azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow allocations while memory state not yet inited.

Browse Source
This commit is contained in:
Nikolay Igotti
2019-07-14 22:46:20 +03:00
committed by alexander-gorshenev
parent b8b8b8c84b
commit 9c38ff9c20
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/Memory.cpp
+3 -2
View File
@@ -688,7 +688,8 @@ ContainerHeader* allocContainer(MemoryState* state, size_t size) {
#endif #endif
if (result == nullptr) { if (result == nullptr) {
#if USE_GC #if USE_GC
state->allocSinceLastGc += size; if (state != nullptr)
state->allocSinceLastGc += size;
#endif #endif
result = konanConstructSizedInstance<ContainerHeader>(alignUp(size, kObjectAlignment)); result = konanConstructSizedInstance<ContainerHeader>(alignUp(size, kObjectAlignment));
atomicAdd(&allocCount, 1); atomicAdd(&allocCount, 1);
@@ -1661,7 +1662,7 @@ void updateHeapRefIfNull(ObjHeader** location, const ObjHeader* object) {
} }
inline void checkIfGcNeeded(MemoryState* state) { inline void checkIfGcNeeded(MemoryState* state) {
if (state->allocSinceLastGc > state->allocSinceLastGcThreshold) { if (state != nullptr && state->allocSinceLastGc > state->allocSinceLastGcThreshold) {
// To avoid GC trashing check that at least 10ms passed since last GC. // To avoid GC trashing check that at least 10ms passed since last GC.
if (konan::getTimeMicros() - state->lastGcTimestamp > 10 * 1000) { if (konan::getTimeMicros() - state->lastGcTimestamp > 10 * 1000) {
garbageCollect(state, false); garbageCollect(state, false);