Automated rollback of changelist 207007153

PiperOrigin-RevId: 207037226
Change-Id: I8b5f1a056d4f3eab17846f2e0193bb737ecb5428

3 files changed, 16 insertions, 5 deletions

diff --git a/pkg/sentry/usage/BUILD b/pkg/sentry/usage/BUILD
index 868dfd400..edee44d96 100644
--- a/pkg/sentry/usage/BUILD
+++ b/pkg/sentry/usage/BUILD
@@ -1,6 +1,17 @@
 package(licenses = ["notice"])  # Apache 2.0
 
-load("//tools/go_stateify:defs.bzl", "go_library")
+load("//tools/go_stateify:defs.bzl", "go_library", "go_stateify")
+
+go_stateify(
+    name = "usage_state",
+    srcs = [
+        "cpu.go",
+        "io.go",
+        "memory.go",
+    ],
+    out = "usage_state.go",
+    package = "usage",
+)
 
 go_library(
     name = "usage",
@@ -10,6 +21,7 @@ go_library(
         "memory.go",
         "memory_unsafe.go",
         "usage.go",
+        "usage_state.go",
     ],
     importpath = "gvisor.googlesource.com/gvisor/pkg/sentry/usage",
     visibility = [
@@ -17,6 +29,9 @@ go_library(
     ],
     deps = [
         "//pkg/bits",
+        "//pkg/log",
         "//pkg/sentry/memutil",
+        "//pkg/state",
+        "@org_golang_x_sys//unix:go_default_library",
     ],
 )
diff --git a/pkg/sentry/usage/cpu.go b/pkg/sentry/usage/cpu.go
index ed7b04b9e..1c2cc90e1 100644
--- a/pkg/sentry/usage/cpu.go
+++ b/pkg/sentry/usage/cpu.go
@@ -20,8 +20,6 @@ import (
 
 // CPUStats contains the subset of struct rusage fields that relate to CPU
 // scheduling.
-//
-// +stateify savable
 type CPUStats struct {
 	// UserTime is the amount of time spent executing application code.
 	UserTime time.Duration
diff --git a/pkg/sentry/usage/io.go b/pkg/sentry/usage/io.go
index 49faa507d..a05053c32 100644
--- a/pkg/sentry/usage/io.go
+++ b/pkg/sentry/usage/io.go
@@ -19,8 +19,6 @@ import (
 )
 
 // IO contains I/O-related statistics.
-//
-// +stateify savable
 type IO struct {
 	// CharsRead is the number of bytes read by read syscalls.
 	CharsRead uint64