From 37acac49e2e68d6d82ecc0495e4d45b571144bde Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Thu, 14 Jun 2018 18:51:43 +0000 Subject: [PATCH] Revert "init: Add warning in init first stage mount" This reverts commit fdafb3d0ec67b40894ce0dd597d3142cc98ab943. Reason for revert: coldboot time increase Bug: 110210279 Test: Boot Change-Id: Ibb92c1856f3fc114685c40df67556131409a9231 --- init/uevent_listener.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/init/uevent_listener.cpp b/init/uevent_listener.cpp index 81486e108..24b14c44d 100644 --- a/init/uevent_listener.cpp +++ b/init/uevent_listener.cpp @@ -23,11 +23,7 @@ #include -#include -#include #include -#include -#include #include namespace android { @@ -134,19 +130,9 @@ ListenerAction UeventListener::RegenerateUeventsForDir(DIR* d, int fd = openat(dfd, "uevent", O_WRONLY); if (fd >= 0) { - android::base::Timer t; write(fd, "add\n", 4); - const std::string fd_path = android::base::StringPrintf("/proc/self/fd/%d", fd); - std::string uevent_file_path; - android::base::Readlink(fd_path, &uevent_file_path); close(fd); - auto guard = android::base::make_scope_guard([&t, &uevent_file_path]() { - if (t.duration() > 50ms) { - LOG(WARNING) << "ReadUevent took " << t << " on '" << uevent_file_path << "'"; - } - }); - Uevent uevent; while (ReadUevent(&uevent)) { if (callback(uevent) == ListenerAction::kStop) return ListenerAction::kStop;