[llvm] r187846 - Fix boolean logic in LockFileManager and test it
Reid Kleckner
reid at kleckner.net
Tue Aug 6 18:22:05 PDT 2013
Author: rnk
Date: Tue Aug 6 20:22:04 2013
New Revision: 187846
URL: http://llvm.org/viewvc/llvm-project?rev=187846&view=rev
Log:
Fix boolean logic in LockFileManager and test it
This fixes a bug from r187826.
Reviewers: hans
Differential Revision: http://llvm-reviews.chandlerc.com/D1304
Added:
llvm/trunk/unittests/Support/LockFileManagerTest.cpp
Modified:
llvm/trunk/lib/Support/LockFileManager.cpp
llvm/trunk/unittests/Support/CMakeLists.txt
Modified: llvm/trunk/lib/Support/LockFileManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/LockFileManager.cpp?rev=187846&r1=187845&r2=187846&view=diff
==============================================================================
--- llvm/trunk/lib/Support/LockFileManager.cpp (original)
+++ llvm/trunk/lib/Support/LockFileManager.cpp Tue Aug 6 20:22:04 2013
@@ -38,14 +38,16 @@ LockFileManager::readLockFile(StringRef
// Read the owning host and PID out of the lock file. If it appears that the
// owning process is dead, the lock file is invalid.
OwningPtr<MemoryBuffer> MB;
- if (MemoryBuffer::getFile(LockFileName, MB)) {
- StringRef Hostname;
- StringRef PIDStr;
- tie(Hostname, PIDStr) = getToken(MB->getBuffer(), " ");
- int PID;
- if (PIDStr.getAsInteger(10, PID))
- return std::make_pair(std::string(Hostname), PID);
- }
+ if (MemoryBuffer::getFile(LockFileName, MB))
+ return None;
+
+ StringRef Hostname;
+ StringRef PIDStr;
+ tie(Hostname, PIDStr) = getToken(MB->getBuffer(), " ");
+ PIDStr = PIDStr.substr(PIDStr.find_first_not_of(" "));
+ int PID;
+ if (!PIDStr.getAsInteger(10, PID))
+ return std::make_pair(std::string(Hostname), PID);
// Delete the lock file. It's invalid anyway.
sys::fs::remove(LockFileName);
Modified: llvm/trunk/unittests/Support/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/CMakeLists.txt?rev=187846&r1=187845&r2=187846&view=diff
==============================================================================
--- llvm/trunk/unittests/Support/CMakeLists.txt (original)
+++ llvm/trunk/unittests/Support/CMakeLists.txt Tue Aug 6 20:22:04 2013
@@ -20,6 +20,7 @@ add_llvm_unittest(SupportTests
IntegersSubsetTest.cpp
LeakDetectorTest.cpp
LocaleTest.cpp
+ LockFileManagerTest.cpp
ManagedStatic.cpp
MathExtrasTest.cpp
MD5Test.cpp
Added: llvm/trunk/unittests/Support/LockFileManagerTest.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Support/LockFileManagerTest.cpp?rev=187846&view=auto
==============================================================================
--- llvm/trunk/unittests/Support/LockFileManagerTest.cpp (added)
+++ llvm/trunk/unittests/Support/LockFileManagerTest.cpp Tue Aug 6 20:22:04 2013
@@ -0,0 +1,48 @@
+//===- unittests/LockFileManagerTest.cpp - LockFileManager tests ----------===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/Support/LockFileManager.h"
+#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/Path.h"
+
+#include "gtest/gtest.h"
+
+#include <memory>
+
+using namespace llvm;
+
+namespace {
+
+TEST(LockFileManagerTest, Basic) {
+ SmallString<64> TmpDir;
+ error_code EC;
+ EC = sys::fs::createUniqueDirectory("LockFileManagerTestDir", TmpDir);
+ ASSERT_FALSE(EC);
+
+ SmallString<64> LockedFile(TmpDir);
+ sys::path::append(LockedFile, "file.lock");
+
+ {
+ // The lock file should not exist, so we should successfully acquire it.
+ LockFileManager Locked1(LockedFile);
+ EXPECT_EQ(LockFileManager::LFS_Owned, Locked1.getState());
+
+ // Attempting to reacquire the lock should fail. Waiting on it would cause
+ // deadlock, so don't try that.
+ LockFileManager Locked2(LockedFile);
+ EXPECT_NE(LockFileManager::LFS_Owned, Locked2.getState());
+ }
+
+ // Now that the lock is out of scope, the file should be gone.
+ EXPECT_FALSE(sys::fs::exists(StringRef(LockedFile)));
+
+ sys::fs::remove_all(StringRef(TmpDir));
+}
+
+} // end anonymous namespace
More information about the llvm-commits
mailing list