ScopedFlock: Refactor it to be a subclass of FdFile.
Makes callers cleaner, since they only have to worry about
dealing with regular File objects that they know will be locked
for the duration of their existence. Prevents issues and other
clunky code relating to acquire
Test: scoped_flock_test, test_art_host
Bug: 36369345
Change-Id: I2c9644e448acde6ddac472d88108c7d9a4e1a892
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index 2e2e8c3..4820feb 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -141,8 +141,8 @@
OatFileAssistant::~OatFileAssistant() {
// Clean up the lock file.
- if (flock_.HasFile()) {
- unlink(flock_.GetFile()->GetPath().c_str());
+ if (flock_.get() != nullptr) {
+ unlink(flock_->GetPath().c_str());
}
}
@@ -165,7 +165,7 @@
bool OatFileAssistant::Lock(std::string* error_msg) {
CHECK(error_msg != nullptr);
- CHECK(!flock_.HasFile()) << "OatFileAssistant::Lock already acquired";
+ CHECK(flock_.get() == nullptr) << "OatFileAssistant::Lock already acquired";
// Note the lock will only succeed for secondary dex files and in test
// environment.
@@ -179,7 +179,8 @@
// to generate oat files anyway.
std::string lock_file_name = dex_location_ + "." + GetInstructionSetString(isa_) + ".flock";
- if (!flock_.Init(lock_file_name.c_str(), error_msg)) {
+ flock_ = LockedFile::Open(lock_file_name.c_str(), error_msg);
+ if (flock_.get() == nullptr) {
unlink(lock_file_name.c_str());
return false;
}