[llvm] r203143 - Revert create_symbolic_link and both depending changes
Reid Kleckner
reid at kleckner.net
Thu Mar 6 11:07:35 PST 2014
Author: rnk
Date: Thu Mar 6 13:07:35 2014
New Revision: 203143
URL: http://llvm.org/viewvc/llvm-project?rev=203143&view=rev
Log:
Revert create_symbolic_link and both depending changes
This reverts commits r203136, r203137, and r203138.
This code doesn't build on Windows. Even on Vista+, Windows requires
elevated privileges to create a symlink. Therefore we can't use
symlinks in the compiler. We'll have to find another approach.
Modified:
llvm/trunk/include/llvm/Support/FileSystem.h
llvm/trunk/lib/Support/LockFileManager.cpp
llvm/trunk/lib/Support/Unix/Path.inc
llvm/trunk/lib/Support/Windows/Path.inc
Modified: llvm/trunk/include/llvm/Support/FileSystem.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/FileSystem.h?rev=203143&r1=203142&r2=203143&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/FileSystem.h (original)
+++ llvm/trunk/include/llvm/Support/FileSystem.h Thu Mar 6 13:07:35 2014
@@ -293,14 +293,6 @@ error_code create_directory(const Twine
/// , otherwise a platform specific error_code.
error_code create_hard_link(const Twine &to, const Twine &from);
-/// @brief Create a symbolic link from \a from to \a to.
-///
-/// @param to The path to link to.
-/// @param from The path to link from. This is created.
-/// @returns errc::success if successful
-/// , otherwise a platform specific error_code.
-error_code create_symbolic_link(const Twine &to, const Twine &from);
-
/// @brief Get the current path.
///
/// @param result Holds the current path on return.
Modified: llvm/trunk/lib/Support/LockFileManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/LockFileManager.cpp?rev=203143&r1=203142&r2=203143&view=diff
==============================================================================
--- llvm/trunk/lib/Support/LockFileManager.cpp (original)
+++ llvm/trunk/lib/Support/LockFileManager.cpp Thu Mar 6 13:07:35 2014
@@ -115,42 +115,34 @@ LockFileManager::LockFileManager(StringR
}
}
- while (1) {
- // Create a symbolic link from the lock file name. If this succeeds, we're
- // done. Note that we are using symbolic link because hard links are not
- // supported by all filesystems.
- error_code EC
- = sys::fs::create_symbolic_link(UniqueLockFileName.str(),
- LockFileName.str());
- if (EC == errc::success)
- return;
-
- if (EC != errc::file_exists) {
- Error = EC;
- return;
- }
-
- // Someone else managed to create the lock file first. Read the process ID
- // from the lock file.
- if ((Owner = readLockFile(LockFileName))) {
- // Wipe out our unique lock file (it's useless now)
- sys::fs::remove(UniqueLockFileName.str());
- return;
- }
-
- if (!sys::fs::exists(LockFileName.str())) {
- // The previous owner released the lock file before we could read it.
- // Try to get ownership again.
- continue;
- }
-
- // There is a lock file that nobody owns; try to clean it up and get
- // ownership.
- if ((EC = sys::fs::remove(LockFileName.str()))) {
- Error = EC;
- return;
- }
- }
+ // Create a hard link from the lock file name. If this succeeds, we're done.
+ error_code EC
+ = sys::fs::create_hard_link(UniqueLockFileName.str(),
+ LockFileName.str());
+ if (EC == errc::success)
+ return;
+
+ // Creating the hard link failed.
+
+#ifdef LLVM_ON_UNIX
+ // The creation of the hard link may appear to fail, but if stat'ing the
+ // unique file returns a link count of 2, then we can still declare success.
+ struct stat StatBuf;
+ if (stat(UniqueLockFileName.c_str(), &StatBuf) == 0 &&
+ StatBuf.st_nlink == 2)
+ return;
+#endif
+
+ // Someone else managed to create the lock file first. Wipe out our unique
+ // lock file (it's useless now) and read the process ID from the lock file.
+ sys::fs::remove(UniqueLockFileName.str());
+ if ((Owner = readLockFile(LockFileName)))
+ return;
+
+ // There is a lock file that nobody owns; try to clean it up and report
+ // an error.
+ sys::fs::remove(LockFileName.str());
+ Error = EC;
}
LockFileManager::LockFileState LockFileManager::getState() const {
Modified: llvm/trunk/lib/Support/Unix/Path.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/Path.inc?rev=203143&r1=203142&r2=203143&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Unix/Path.inc (original)
+++ llvm/trunk/lib/Support/Unix/Path.inc Thu Mar 6 13:07:35 2014
@@ -285,19 +285,6 @@ error_code create_hard_link(const Twine
return error_code::success();
}
-error_code create_symbolic_link(const Twine &to, const Twine &from) {
- // Get arguments.
- SmallString<128> from_storage;
- SmallString<128> to_storage;
- StringRef f = from.toNullTerminatedStringRef(from_storage);
- StringRef t = to.toNullTerminatedStringRef(to_storage);
-
- if (::symlink(t.begin(), f.begin()) == -1)
- return error_code(errno, system_category());
-
- return error_code::success();
-}
-
error_code remove(const Twine &path, bool IgnoreNonExisting) {
SmallString<128> path_storage;
StringRef p = path.toNullTerminatedStringRef(path_storage);
Modified: llvm/trunk/lib/Support/Windows/Path.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Windows/Path.inc?rev=203143&r1=203142&r2=203143&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Windows/Path.inc (original)
+++ llvm/trunk/lib/Support/Windows/Path.inc Thu Mar 6 13:07:35 2014
@@ -177,25 +177,6 @@ error_code create_hard_link(const Twine
return error_code::success();
}
-error_code create_symbolic_link(const Twine &to, const Twine &from) {
- // Get arguments.
- SmallString<128> from_storage;
- SmallString<128> to_storage;
- StringRef f = from.toStringRef(from_storage);
- StringRef t = to.toStringRef(to_storage);
-
- // Convert to utf-16.
- SmallVector<wchar_t, 128> wide_from;
- SmallVector<wchar_t, 128> wide_to;
- if (error_code ec = UTF8ToUTF16(f, wide_from)) return ec;
- if (error_code ec = UTF8ToUTF16(t, wide_to)) return ec;
-
- if (!::CreateSymbolicLinkW(wide_from.begin(), wide_to.begin(), NULL))
- return windows_error(::GetLastError());
-
- return error_code::success();
-}
-
error_code remove(const Twine &path, bool IgnoreNonExisting) {
SmallString<128> path_storage;
SmallVector<wchar_t, 128> path_utf16;
More information about the llvm-commits
mailing list