From 6641b4f0299debf0fb857fefe1c55c44a9a57b02 Mon Sep 17 00:00:00 2001
From: LepilkinaElena <Elena.Lepilkina@jetbrains.com>
Date: Tue, 2 Mar 2021 18:48:17 +0300
Subject: [PATCH] [LEGACY MM] Fixed types in messages for tracing GC (#4729)

(cherry picked from commit 2f34b0f98e77226f02809a685a96ebb683a69e9d)
---
 .../runtime/src/legacymm/cpp/Memory.cpp       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp b/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
index 35b59cc8888..a0bb391793d 100644
--- a/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
+++ b/kotlin-native/runtime/src/legacymm/cpp/Memory.cpp
@@ -1353,7 +1353,7 @@ inline void decrementRC(ContainerHeader* container) {
         container->setBuffered();
         if (state->toFree != nullptr) {
           state->toFree->push_back(container);
-          MEMORY_LOG("toFree is now %d\n", state->toFree->size())
+          MEMORY_LOG("toFree is now %lu\n", state->toFree->size())
           if (state->gcSuspendCount == 0 && state->toRelease->size() >= state->gcThreshold) {
             GC_LOG("Calling GC from DecrementRC: %d\n", state->toRelease->size())
             garbageCollect(state, false);
@@ -1396,7 +1396,7 @@ inline void enqueueDecrementRC(ContainerHeader* container) {
   auto* state = memoryState;
   if (CanCollect) {
     if (state->toRelease->size() >= state->gcThreshold && state->gcSuspendCount == 0) {
-      GC_LOG("Calling GC from EnqueueDecrementRC: %d\n", state->toRelease->size())
+      GC_LOG("Calling GC from EnqueueDecrementRC: %zu\n", state->toRelease->size())
       garbageCollect(state, false);
     }
   }
@@ -1856,7 +1856,7 @@ void garbageCollect(MemoryState* state, bool force) {
     return;
   }
 
-  GC_LOG(">>> %s GC: threshold = %d toFree %d toRelease %d alloc = %lld\n", \
+  GC_LOG(">>> %s GC: threshold = %zu toFree %zu toRelease %zu alloc = %lld\n", \
      force ? "forced" : "regular", state->gcThreshold, state->toFree->size(),
      state->toRelease->size(), allocSinceLastGc)
 
@@ -1892,10 +1892,10 @@ void garbageCollect(MemoryState* state, bool force) {
   size_t stackReferences = afterDecrements - beforeDecrements;
   if (state->gcErgonomics && stackReferences * 5 > state->gcThreshold) {
     increaseGcThreshold(state);
-    GC_LOG("||| GC: too many stack references, increased threshold to %d\n", state->gcThreshold);
+    GC_LOG("||| GC: too many stack references, increased threshold to %zu\n", state->gcThreshold);
   }
 
-  GC_LOG("||| GC: toFree %d toRelease %d\n", state->toFree->size(), state->toRelease->size())
+  GC_LOG("||| GC: toFree %zu toRelease %zu\n", state->toFree->size(), state->toRelease->size())
 #if PROFILE_GC
   auto processFinalizerQueueStartTime = konan::getTimeMicros();
 #endif
@@ -1938,7 +1938,7 @@ void garbageCollect(MemoryState* state, bool force) {
     auto gcToComputeRatio = double(gcEndTime - gcStartTime) / (gcStartTime - state->lastGcTimestamp + 1);
     if (!force && gcToComputeRatio > kGcToComputeRatioThreshold) {
       increaseGcThreshold(state);
-      GC_LOG("Adjusting GC threshold to %d\n", state->gcThreshold);
+      GC_LOG("Adjusting GC threshold to %zu\n", state->gcThreshold);
     }
   }
   GC_LOG("GC: gcToComputeRatio=%f duration=%lld sinceLast=%lld\n", double(gcEndTime - gcStartTime) / (gcStartTime - state->lastGcTimestamp + 1), (gcEndTime - gcStartTime), gcStartTime - state->lastGcTimestamp);
@@ -1950,7 +1950,7 @@ void garbageCollect(MemoryState* state, bool force) {
   }
 #endif
 
-  GC_LOG("<<< GC: toFree %d toRelease %d\n", state->toFree->size(), state->toRelease->size())
+  GC_LOG("<<< GC: toFree %zu toRelease %zu\n", state->toFree->size(), state->toRelease->size())
 }
 
 void rememberNewContainer(ContainerHeader* container) {
@@ -2241,7 +2241,7 @@ inline void checkIfGcNeeded(MemoryState* state) {
   if (state != nullptr && state->allocSinceLastGc > state->allocSinceLastGcThreshold && state->gcSuspendCount == 0) {
     // To avoid GC trashing check that at least 10ms passed since last GC.
     if (konan::getTimeMicros() - state->lastGcTimestamp > 10 * 1000) {
-      GC_LOG("Calling GC from checkIfGcNeeded: %d\n", state->toRelease->size())
+      GC_LOG("Calling GC from checkIfGcNeeded: %zu\n", state->toRelease->size())
       garbageCollect(state, false);
     }
   }
@@ -2252,7 +2252,7 @@ inline void checkIfForceCyclicGcNeeded(MemoryState* state) {
       && state->gcSuspendCount == 0) {
     // To avoid GC trashing check that at least 10ms passed since last GC.
     if (konan::getTimeMicros() - state->lastGcTimestamp > 10 * 1000) {
-      GC_LOG("Calling GC from checkIfForceCyclicGcNeeded: %d\n", state->toFree->size())
+      GC_LOG("Calling GC from checkIfForceCyclicGcNeeded: %zu\n", state->toFree->size())
       garbageCollect(state, true);
     }
   }
@@ -2585,7 +2585,7 @@ KInt getGCThreshold() {
 }
 
 void setGCCollectCyclesThreshold(KLong value) {
-  GC_LOG("setGCCollectCyclesThreshold %d\n", value)
+  GC_LOG("setGCCollectCyclesThreshold %lld\n", value)
   if (value <= 0) {
     ThrowIllegalArgumentException();
   }
@@ -2617,7 +2617,7 @@ void setTuneGCThreshold(KBoolean value) {
 }
 
 KBoolean getTuneGCThreshold() {
-  GC_LOG("getTuneGCThreshold %d\n")
+  GC_LOG("getTuneGCThreshold %d\n", memoryState->gcErgonomics)
   return memoryState->gcErgonomics;
 }