Add unittest for ParseProcInfo.
Driveby stylistic change to ParseProcInfo to a missing space. Without
the space, it does look suspiciously like it might parse incorrect, but
details of sscanf means it does not.
Change-Id: I994dbbc1c48a4210f9af0cff699716236e3ed8ca
diff --git a/Android.bp b/Android.bp
index ba600ad..0b61019 100644
--- a/Android.bp
+++ b/Android.bp
@@ -6255,6 +6255,7 @@
"src/base/unix_socket_unittest.cc",
"src/base/utils_unittest.cc",
"src/base/uuid_unittest.cc",
+ "src/base/watchdog_posix_unittest.cc",
"src/base/watchdog_unittest.cc",
"src/base/weak_ptr_unittest.cc",
],
diff --git a/src/base/BUILD.gn b/src/base/BUILD.gn
index 8a229a8..3edc948 100644
--- a/src/base/BUILD.gn
+++ b/src/base/BUILD.gn
@@ -162,6 +162,7 @@
"thread_checker_unittest.cc",
"thread_task_runner_unittest.cc",
"utils_unittest.cc",
+ "watchdog_posix_unittest.cc",
]
}
if (perfetto_build_standalone || perfetto_build_with_android) {
diff --git a/src/base/watchdog_posix.cc b/src/base/watchdog_posix.cc
index 06184b1..688d144 100644
--- a/src/base/watchdog_posix.cc
+++ b/src/base/watchdog_posix.cc
@@ -71,7 +71,7 @@
c[c_pos] = '\0';
if (sscanf(c,
- "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %lu"
+ "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u %lu "
"%lu %*d %*d %*d %*d %*d %*d %*u %*u %ld",
&out->utime, &out->stime, &out->rss_pages) != 3) {
PERFETTO_ELOG("Invalid stat format: %s", c);
diff --git a/src/base/watchdog_posix_unittest.cc b/src/base/watchdog_posix_unittest.cc
new file mode 100644
index 0000000..f4c63d9
--- /dev/null
+++ b/src/base/watchdog_posix_unittest.cc
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "perfetto/ext/base/watchdog_posix.h"
+
+#include <stdio.h>
+
+#include "perfetto/ext/base/file_utils.h"
+#include "perfetto/ext/base/temp_file.h"
+
+#include "test/gtest_and_gmock.h"
+
+namespace perfetto {
+namespace base {
+namespace {
+
+TEST(WatchdogPosixTest, ParseProcStat) {
+ constexpr const char stat[] =
+ "2965981 (zsh) S 2965977 2965981 2965981 34822 2966607 4194304 6632 6697 "
+ "0 0 11 6 4 1 20 0 1 0 227163466 15839232 2311 18446744073709551615 "
+ "94823961161728 94823961762781 140722993535472 0 0 0 2 3686400 134295555 "
+ "0 0 0 17 2 0 0 0 0 0 94823961905904 94823961935208 94823993954304 "
+ "140722993543678 140722993543691 140722993543691 140722993545195 0";
+ TempFile f = TempFile::CreateUnlinked();
+ WriteAll(f.fd(), stat, sizeof(stat));
+ ASSERT_NE(lseek(f.fd(), 0, SEEK_SET), -1);
+ ProcStat ps;
+ ASSERT_TRUE(ReadProcStat(f.fd(), &ps));
+ EXPECT_EQ(ps.utime, 11u);
+ EXPECT_EQ(ps.stime, 6u);
+ EXPECT_EQ(ps.rss_pages, 2311);
+}
+
+} // namespace
+} // namespace base
+} // namespace perfetto