RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2026-07-19 23:23:38 -04:00
Code Issues Packages Projects Releases 10 Wiki Activity

Revert Implement sys::fs::copy_file using the macOS copyfile(3) API to support APFS clones.

Browse Source 
This reverts r358628 (git commit 91a06bee788262a294527b815354f380d99dfa9b)
while investigating a crash reproducer bot failure.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358634 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Adrian Prantl
2019-04-18 01:21:10 +00:00
parent c7cadf83ff
commit a6390fed2f
2 changed files with 0 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Support/Path.cpp
-2
View File
@@ -935,7 +935,6 @@ std::error_code create_directories(const Twine &Path, bool IgnoreExisting,
return create_directory(P, IgnoreExisting, Perms);
}
#ifndef __APPLE__
static std::error_code copy_file_internal(int ReadFD, int WriteFD) {
const size_t BufSize = 4096;
char *Buf = new char[BufSize];
@@ -989,7 +988,6 @@ std::error_code copy_file(const Twine &From, int ToFD) {
return EC;
}
#endif
ErrorOr<MD5::MD5Result> md5_contents(int FD) {
MD5 Hash;
lib/Support/Unix/Path.inc
-51
View File
@@ -37,7 +37,6 @@
#ifdef __APPLE__
#include <mach-o/dyld.h>
#include <sys/attr.h>
#include <copyfile.h>
#elif defined(__DragonFly__)
#include <sys/mount.h>
#endif
@@ -1114,55 +1113,5 @@ void system_temp_directory(bool ErasedOnReboot, SmallVectorImpl<char> &Result) {
} // end namespace path
namespace fs {
#ifdef __APPLE__
/// This implementation tries to perform an APFS CoW clone of the file,
/// which can be much faster and uses less space.
std::error_code copy_file(const Twine &From, const Twine &To) {
uint32_t Flag = COPYFILE_DATA;
bool IsSymlink;
if (std::error_code Error = is_symlink_file(From, IsSymlink))
return Error;
if (!IsSymlink)
if (__builtin_available(macos 10.12, *))
Flag = COPYFILE_CLONE;
int Status =
copyfile(From.str().c_str(), To.str().c_str(), /* State */ NULL, Flag);
if (Status == 0)
return std::error_code();
return std::error_code(errno, std::generic_category());
}
/// This implementation tries to perform an APFS CoW clone of the file,
/// which can be much faster and uses less space.
std::error_code copy_file(const Twine &From, int ToFD) {
uint32_t Flag = COPYFILE_DATA;
bool IsSymlink;
if (std::error_code Error = is_symlink_file(From, IsSymlink))
return Error;
int ReadFD;
if (std::error_code EC = openFileForRead(From, ReadFD, OF_None))
return EC;
if (!IsSymlink)
if (__builtin_available(macos 10.12, *))
Flag = COPYFILE_CLONE;
int Status = fcopyfile(ReadFD, ToFD, /*State*/ NULL, Flag);
close(ReadFD);
if (Status == 0)
return std::error_code();
return std::error_code(errno, std::generic_category());
}
#endif
} // end namespace fs
} // end namespace sys
} // end namespace llvm