From adf8f339703922211886d3e5588160f65bc131b3 Mon Sep 17 00:00:00 2001 From: Rahat Mahmood Date: Thu, 13 Sep 2018 15:15:33 -0700 Subject: Extend memory usage events to report mapped memory usage. PiperOrigin-RevId: 212887555 Change-Id: I3545383ce903cbe9f00d9b5288d9ef9a049b9f4f --- pkg/sentry/kernel/memevent/memory_events.go | 5 ++++- pkg/sentry/kernel/memevent/memory_events.proto | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/sentry/kernel/memevent/memory_events.go b/pkg/sentry/kernel/memevent/memory_events.go index ecc9151de..f7a183a1d 100644 --- a/pkg/sentry/kernel/memevent/memory_events.go +++ b/pkg/sentry/kernel/memevent/memory_events.go @@ -94,5 +94,8 @@ func (m *MemoryEvents) emit() { snapshot, _ := usage.MemoryAccounting.Copy() total := totalPlatform + snapshot.Mapped - eventchannel.Emit(&pb.MemoryUsageEvent{Total: total}) + eventchannel.Emit(&pb.MemoryUsageEvent{ + Mapped: snapshot.Mapped, + Total: total, + }) } diff --git a/pkg/sentry/kernel/memevent/memory_events.proto b/pkg/sentry/kernel/memevent/memory_events.proto index e6e0bd628..abc565054 100644 --- a/pkg/sentry/kernel/memevent/memory_events.proto +++ b/pkg/sentry/kernel/memevent/memory_events.proto @@ -22,4 +22,8 @@ message MemoryUsageEvent { // The total memory usage of the sandboxed application in bytes, calculated // using the 'fast' method. uint64 total = 1; + + // Memory used to back memory-mapped regions for files in the application, in + // bytes. This corresponds to the usage.MemoryKind.Mapped memory type. + uint64 mapped = 2; } -- cgit v1.2.3