Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/gitlab/memory/instrumentation.rb b/lib/gitlab/memory/instrumentation.rb
index 8f9f6d19ce8..e800fe14cf1 100644
--- a/lib/gitlab/memory/instrumentation.rb
+++ b/lib/gitlab/memory/instrumentation.rb
@@ -45,9 +45,12 @@ module Gitlab
       end
 
       # This method returns a hash with the following keys:
-      # - mem_objects: a number of allocated heap slots (as reflected by GC)
-      # - mem_mallocs: a number of malloc calls
-      # - mem_bytes: a number of bytes allocated with a mallocs tied to heap slots
+      # - mem_objects:     number of allocated heap slots (as reflected by GC)
+      # - mem_mallocs:     number of malloc calls
+      # - mem_bytes:       number of bytes allocated by malloc for objects that did not fit
+      #                    into a heap slot
+      # - mem_total_bytes: number of bytes allocated for both objects consuming an object slot
+      #                    and objects that required a malloc (mem_malloc_bytes)
       def self.measure_thread_memory_allocations(previous)
         return unless available?
         return unless previous
@@ -56,9 +59,13 @@ module Gitlab
         return unless current
 
         # calculate difference in a memory allocations
-        previous.to_h do |key, value|
+        result = previous.to_h do |key, value|
           [KEY_MAPPING.fetch(key), current[key].to_i - value]
         end
+
+        result[:mem_total_bytes] = result[:mem_bytes] + result[:mem_objects] * GC::INTERNAL_CONSTANTS[:RVALUE_SIZE]
+
+        result
       end
 
       def self.with_memory_allocations