diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-06-11 00:46:02 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-11 00:46:02 +0000 |
| commit | a210c0fa92431d8cc1af544ccb7cbf2c7dd19866 (patch) | |
| tree | 287e054e775937491cd57a26a226b7f626d08a7a /pkg/sentry | |
| parent | 52698578c71d3d04675ab7a12f77e59de9c78526 (diff) | |
| parent | 508e7c3a792d56b87e54b530145968aee85ead87 (diff) | |
Merge release-20200522.0-125-g508e7c3a7 (automated)
Diffstat (limited to 'pkg/sentry')
| -rw-r--r-- | pkg/sentry/kernel/timekeeper.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/timekeeper.go b/pkg/sentry/kernel/timekeeper.go index da0ea7bb5..0adf25691 100644 --- a/pkg/sentry/kernel/timekeeper.go +++ b/pkg/sentry/kernel/timekeeper.go @@ -186,6 +186,7 @@ func (t *Timekeeper) startUpdater() { timer := time.NewTicker(sentrytime.ApproxUpdateInterval) t.wg.Add(1) go func() { // S/R-SAFE: stopped during save. + defer t.wg.Done() for { // Start with an update immediately, so the clocks are // ready ASAP. @@ -220,7 +221,6 @@ func (t *Timekeeper) startUpdater() { select { case <-timer.C: case <-t.stop: - t.wg.Done() return } } |