Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d53aac4 authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge "Log lock time if it takes too long" into main am: 17468350 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3180781



Change-Id: I7add6d69ff52c9f0d3b3b6275b5e3a920f06b3a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 38cc5e1d 17468350

fs_mgr/libsnapshot/snapshot.cpp

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <sys/types.h>

#include <sys/unistd.h>



#include <chrono>

#include <filesystem>

#include <optional>

#include <thread>
@@ -2892,6 +2893,7 @@ bool SnapshotManager::UnmapAllSnapshots(LockedFile* lock) { 


auto SnapshotManager::OpenFile(const std::string& file,

                               int lock_flags) -> std::unique_ptr<LockedFile> {

    const auto start = std::chrono::system_clock::now();

    unique_fd fd(open(file.c_str(), O_RDONLY | O_CLOEXEC | O_NOFOLLOW));

    if (fd < 0) {

        PLOG(ERROR) << "Open failed: " << file;
@@ -2904,6 +2906,11 @@ auto SnapshotManager::OpenFile(const std::string& file, 
    // For simplicity, we want to CHECK that lock_mode == LOCK_EX, in some

    // calls, so strip extra flags.

    int lock_mode = lock_flags & (LOCK_EX | LOCK_SH);

    const auto end = std::chrono::system_clock::now();

    const auto duration_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);

    if (duration_ms >= 1000ms) {

        LOG(INFO) << "Taking lock on " << file << " took " << duration_ms.count() << "ms";

    }

    return std::make_unique<LockedFile>(file, std::move(fd), lock_mode);

}