diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-11-13 02:25:59 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-11-13 02:25:59 +0000 |
| commit | 4ad47eb13ee2d819e61b97c796e844cee75a60c5 (patch) | |
| tree | 4aa8070febff5f0fddc3c3f4eac2cd7c04fb2c56 /pkg/sentry/kernel/task_log.go | |
| parent | 04ef4f2fedb11ff4abb34f5c91794a9832e68967 (diff) | |
| parent | 62db1fad2cb7d2249720e157aa79c84b7531a2e9 (diff) | |
Merge release-20201030.0-79-g62db1fad2 (automated)
Diffstat (limited to 'pkg/sentry/kernel/task_log.go')
| -rw-r--r-- | pkg/sentry/kernel/task_log.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/task_log.go b/pkg/sentry/kernel/task_log.go index 7591eaace..c70e5e6ce 100644 --- a/pkg/sentry/kernel/task_log.go +++ b/pkg/sentry/kernel/task_log.go @@ -19,6 +19,7 @@ import ( "runtime/trace" "sort" + "gvisor.dev/gvisor/pkg/context" "gvisor.dev/gvisor/pkg/log" "gvisor.dev/gvisor/pkg/usermem" ) @@ -215,7 +216,7 @@ func (t *Task) rebuildTraceContext(tid ThreadID) { // arbitrarily large (in general it won't be, especially for cases // where we're collecting a brief profile), so using the TID is a // reasonable compromise in this case. - t.traceContext, t.traceTask = trace.NewTask(t, fmt.Sprintf("tid:%d", tid)) + t.traceContext, t.traceTask = trace.NewTask(context.Background(), fmt.Sprintf("tid:%d", tid)) } // traceCloneEvent is called when a new task is spawned. |