GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 23:05:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

statx is not supported.

Browse Source
This commit is contained in:
Vojtech Bubnik 2021-03-15 15:21:59 +01:00
parent 8e16b24ef4
commit 961625ae6b
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/libslic3r/utils.cpp
View File

@ -426,7 +426,8 @@ std::error_code rename_file(const std::string &from, const std::string &to)
#ifdef __linux__ #ifdef __linux__
// Copied from boost::filesystem, to support copying a file to a weird filesystem, which does not support changing file attributes, // Copied from boost::filesystem, to support copying a file to a weird filesystem, which does not support changing file attributes,
// for example ChromeOS Linux integration or FlashAIR WebDAV. // for example ChromeOS Linux integration or FlashAIR WebDAV.
// Copied and simplified from boost::filesystem::detail::copy_file() with option = overwrite_if_exists and with just the Linux path kept. // Copied and simplified from boost::filesystem::detail::copy_file() with option = overwrite_if_exists and with just the Linux path kept,
// and only features supported by Linux 3.10 (on our build server with CentOS 7) are kept, namely sendfile with ranges and statx() are not supported.
bool copy_file_linux(const boost::filesystem::path &from, const boost::filesystem::path &to, boost::system::error_code &ec) bool copy_file_linux(const boost::filesystem::path &from, const boost::filesystem::path &to, boost::system::error_code &ec)
{ {
using namespace boost::filesystem; using namespace boost::filesystem;
@ -458,19 +459,12 @@ bool copy_file_linux(const boost::filesystem::path &from, const boost::filesyste
break; break;
} }
unsigned int statx_data_mask = STATX_TYPE | STATX_MODE | STATX_INO | STATX_SIZE; struct ::stat from_stat;
if (::fstat(infile.fd, &from_stat) != 0) {
struct ::statx from_stat; fail_errno:
if (statx(infile.fd, "", AT_EMPTY_PATH | AT_NO_AUTOMOUNT, statx_data_mask, &from_stat) < 0) { err = errno;
fail_errno: goto fail;
err = errno; }
goto fail;
}
if ((from_stat.stx_mask & statx_data_mask) != statx_data_mask) {
err = ENOSYS;
goto fail;
}
const mode_t from_mode = from_stat.stx_mode; const mode_t from_mode = from_stat.stx_mode;
if (!S_ISREG(from_mode)) { if (!S_ISREG(from_mode)) {
@ -494,23 +488,17 @@ bool copy_file_linux(const boost::filesystem::path &from, const boost::filesyste
break; break;
} }
statx_data_mask = STATX_TYPE | STATX_MODE | STATX_INO; struct ::stat to_stat;
struct ::statx to_stat; if (::fstat(outfile.fd, &to_stat) != 0)
if (statx(outfile.fd, "", AT_EMPTY_PATH | AT_NO_AUTOMOUNT, statx_data_mask, &to_stat) < 0)
goto fail_errno; goto fail_errno;
if ((to_stat.stx_mask & statx_data_mask) != statx_data_mask) {
err = ENOSYS;
goto fail;
}
to_mode = to_stat.stx_mode; to_mode = to_stat.stx_mode;
if (!S_ISREG(to_mode)) { if (!S_ISREG(to_mode)) {
err = ENOSYS; err = ENOSYS;
goto fail; goto fail;
} }
if (from_stat.stx_dev_major == to_stat.stx_dev_major && from_stat.stx_dev_minor == to_stat.stx_dev_minor && from_stat.stx_ino == to_stat.stx_ino) { if (from_stat.st_dev == to_stat.st_dev && from_stat.st_ino == to_stat.st_ino) {
err = EEXIST; err = EEXIST;
goto fail; goto fail;
} }
@ -518,7 +506,8 @@ bool copy_file_linux(const boost::filesystem::path &from, const boost::filesyste
//! copy_file implementation that uses sendfile loop. Requires sendfile to support file descriptors. //! copy_file implementation that uses sendfile loop. Requires sendfile to support file descriptors.
//FIXME Vojtech: This is a copy loop valid for Linux 2.6.33 and newer. //FIXME Vojtech: This is a copy loop valid for Linux 2.6.33 and newer.
// copy_file_data_copy_file_range() supports cross-filesystem copying since 5.3, but Vojtech did not want to polute this // copy_file_data_copy_file_range() supports cross-filesystem copying since 5.3, but Vojtech did not want to polute this
// function with that, we don't think the performance gain is worth it for the types of files we are copying. // function with that, we don't think the performance gain is worth it for the types of files we are copying,
// and our build server based on CentOS 7 with Linux 3.10 does not support that anyways.
{ {
// sendfile will not send more than this amount of data in one call // sendfile will not send more than this amount of data in one call
BOOST_CONSTEXPR_OR_CONST std::size_t max_send_size = 0x7ffff000u; BOOST_CONSTEXPR_OR_CONST std::size_t max_send_size = 0x7ffff000u;