go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add start time to /proc/<pid>/stat. 

The start time is the number of clock ticks between the boot time and
application start time.

PiperOrigin-RevId: 240619475
Change-Id: Ic8bd7a73e36627ed563988864b0c551c052492a5
This commit is contained in:
Nicolas Lacasse 2019-03-27 12:40:18 -07:00 committed by Shentubot
parent 5d94c893ae
commit 2d355f0e8f
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/sentry/fs/proc/task.go
View File

@ -461,7 +461,14 @@ func (s *taskStatData) ReadSeqFileData(ctx context.Context, h seqfile.SeqHandle)
fmt.Fprintf(&buf, "%d %d ", linux.ClockTFromDuration(cputime.UserTime), linux.ClockTFromDuration(cputime.SysTime))
fmt.Fprintf(&buf, "%d %d ", s.t.Priority(), s.t.Niceness())
fmt.Fprintf(&buf, "%d ", s.t.ThreadGroup().Count())
fmt.Fprintf(&buf, "0 0 " /* itrealvalue starttime */)
// itrealvalue. Since kernel 2.6.17, this field is no longer
// maintained, and is hard coded as 0.
fmt.Fprintf(&buf, "0 ")
// Start time is relative to boot time, expressed in clock ticks.
fmt.Fprintf(&buf, "%d ", linux.ClockTFromDuration(s.t.StartTime().Sub(s.t.Kernel().Timekeeper().BootTime())))
var vss, rss uint64
s.t.WithMuLocked(func(t *kernel.Task) {
if mm := t.MemoryManager(); mm != nil {

8
test/syscalls/linux/proc.cc
View File

@ -880,6 +880,14 @@ TEST_P(ProcPidStatTest, HasBasicFields) {
EXPECT_EQ("R", fields[2]); // task state
EXPECT_EQ(absl::StrCat(getppid()), fields[3]);
// If the test starts up quickly, then the process start time and the kernel
// boot time will be very close, and the proc starttime field (which is the
// delta of the two times) will be 0. For that unfortunate reason, we can
// only check that starttime >= 0, and not that it is strictly > 0.
uint64_t starttime;
ASSERT_TRUE(absl::SimpleAtoi(fields[21], &starttime));
EXPECT_GE(starttime, 0);
uint64_t vss;
ASSERT_TRUE(absl::SimpleAtoi(fields[22], &vss));
EXPECT_GT(vss, 0);