mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-04 12:09:01 +08:00
e79f0dc532
I added benchmarks to measure how fast the parallel remove_all code was
-- it turns out, about 3x slower than stdfs::remove_all. Since this was
the case, I removed all of the parallelism and rewrote it serially, and
ended up about 30% faster than stdfs::remove_all (in addition to
supporting symlinks).
In addition, I did the following three orthogonal changes:
- simplified the work queue, basing it on Billy O'Neal's idea
- Fix warnings on older versions of compilers in tests, by splitting
the pragmas out of pch.h.
- Ran clang-format on some files
In fixing up remove_all, the following changes were made:
- On Windows, regular symlinks and directory symlinks are distinct;
as an example, to remove directory symlinks (and junctions, for that
matter), one must use RemoveDirectory. Only on Windows, I added new
`file_type` and `file_status` types, with `file_type` including a new
`directory_symlink` enumerator, and `file_status` being exactly the
same as the old one except using the new `file_type`. On Unix, I
didn't make that change since they don't make a distinction.
- I added new `symlink_status` and `status` functions which use the
new `file_status` on Windows.
- I made `Filesystem::exists` call `fs::exists(status(p))`, as opposed
to the old version which called `stdfs::exists` directly.
- Added benchmarks to `vcpkg-test/files.cpp`. They test the
performance of `remove_all` on small directories (~20 files), with
symlinks and without, and on large directories (~2000 files), with
symlinks and without.
69 lines
2.8 KiB
C++
69 lines
2.8 KiB
C++
#include <vcpkg-test/catch.h>
|
|
#include <vcpkg/pragmas.h>
|
|
|
|
#include <vcpkg/base/files.h>
|
|
#include <vcpkg/statusparagraph.h>
|
|
|
|
#include <memory>
|
|
|
|
#define CHECK_EC(ec) \
|
|
do \
|
|
{ \
|
|
if (ec) \
|
|
{ \
|
|
FAIL(ec.message()); \
|
|
} \
|
|
} while (0)
|
|
|
|
namespace vcpkg::Test
|
|
{
|
|
std::unique_ptr<vcpkg::StatusParagraph> make_status_pgh(const char* name,
|
|
const char* depends = "",
|
|
const char* default_features = "",
|
|
const char* triplet = "x86-windows");
|
|
|
|
std::unique_ptr<vcpkg::StatusParagraph> make_status_feature_pgh(const char* name,
|
|
const char* feature,
|
|
const char* depends = "",
|
|
const char* triplet = "x86-windows");
|
|
|
|
vcpkg::PackageSpec unsafe_pspec(std::string name, vcpkg::Triplet t = vcpkg::Triplet::X86_WINDOWS);
|
|
|
|
template<class T, class S>
|
|
T&& unwrap(vcpkg::ExpectedT<T, S>&& p)
|
|
{
|
|
REQUIRE(p.has_value());
|
|
return std::move(*p.get());
|
|
}
|
|
|
|
template<class T>
|
|
T&& unwrap(vcpkg::Optional<T>&& opt)
|
|
{
|
|
REQUIRE(opt.has_value());
|
|
return std::move(*opt.get());
|
|
}
|
|
|
|
struct AllowSymlinks
|
|
{
|
|
enum Tag : bool
|
|
{
|
|
No = false,
|
|
Yes = true,
|
|
} tag;
|
|
|
|
constexpr AllowSymlinks(Tag tag) noexcept : tag(tag) {}
|
|
|
|
constexpr explicit AllowSymlinks(bool b) noexcept : tag(b ? Yes : No) {}
|
|
|
|
constexpr operator bool() const noexcept { return tag == Yes; }
|
|
};
|
|
|
|
AllowSymlinks can_create_symlinks() noexcept;
|
|
|
|
const fs::path& base_temporary_directory() noexcept;
|
|
|
|
void create_symlink(const fs::path& file, const fs::path& target, std::error_code& ec);
|
|
|
|
void create_directory_symlink(const fs::path& file, const fs::path& target, std::error_code& ec);
|
|
}
|