seastar: re-introduce compat::filesystem namespace

[Reverted in 307335a] Stop using boost::filesystem altogether and std::experimental::filesystem directly. Instead, define seastar::compat::filesystem as either std::filesystem, starting in C++17, or std::experimental::filesystem otherwise. Changes since c640d8f: - Base definition on c++ dialect rather than on --use-std-optional-variant-stringview - Consequently, does not modify this switch nor the respective STD_OPTIONAL_VARIANT_STRINGVIEW definition Signed-off-by: Benny Halevy <[email protected]> Message-Id: <[email protected]>
scylladb · Jan 17, 2019 · 79e846e · 79e846e
1 parent 9b8337e
commit 79e846e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/apps/iotune/iotune.cc b/apps/iotune/iotune.cc
@@ -29,7 +29,6 @@
 #include <cmath>
 #include <sys/vfs.h>
 #include <sys/sysmacros.h>
-#include <boost/filesystem.hpp>
 #include <boost/range/irange.hpp>
 #include <boost/program_options.hpp>
 #include <boost/iterator/counting_iterator.hpp>
@@ -52,7 +51,7 @@
 
 using namespace seastar;
 using namespace std::chrono_literals;
-namespace fs = std::experimental::filesystem;
+namespace fs = seastar::compat::filesystem;
 
 logger iotune_logger("iotune");
 

diff --git a/include/seastar/util/read_first_line.hh b/include/seastar/util/read_first_line.hh
@@ -1,8 +1,8 @@
-#include <experimental/filesystem>
+#include <seastar/util/std-compat.hh>
 #include <seastar/core/sstring.hh>
 
 namespace seastar {
 
-sstring read_first_line(std::experimental::filesystem::path sys_file);
+sstring read_first_line(compat::filesystem::path sys_file);
 
 }
diff --git a/include/seastar/util/std-compat.hh b/include/seastar/util/std-compat.hh
@@ -31,6 +31,12 @@
 #include <boost/variant.hpp>
 #endif
 
+#if __cplusplus >= 201703L  // C++17
+#include <filesystem>
+#else
+#include <experimental/filesystem>
+#endif
+
 namespace seastar {
 
 /// \cond internal
@@ -169,6 +175,12 @@ const U* get_if(const variant<Types...>* v) {
 
 #endif
 
+#if __cplusplus >= 201703L
+namespace filesystem = std::filesystem;
+#else
+namespace filesystem = std::experimental::filesystem;
+#endif
+
 using string_view = basic_string_view<char>;
 
 } // namespace compat

diff --git a/src/core/reactor.cc b/src/core/reactor.cc
@@ -54,7 +54,6 @@
 #include <sys/eventfd.h>
 #include <sys/poll.h>
 #include <boost/lexical_cast.hpp>
-#include <boost/filesystem.hpp>
 #include <boost/thread/barrier.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -67,7 +66,6 @@
 #include <boost/range/adaptor/map.hpp>
 #include <boost/version.hpp>
 #include <atomic>
-#include <experimental/filesystem>
 #include <dirent.h>
 #include <linux/types.h> // for xfs, below
 #include <sys/ioctl.h>
@@ -413,7 +411,7 @@ void task_histogram_add_task(const task& t) {
 }
 
 using namespace std::chrono_literals;
-namespace fs = std::experimental::filesystem;
+namespace fs = seastar::compat::filesystem;
 
 using namespace net;
 
@@ -5539,7 +5537,7 @@ void reactor::add_high_priority_task(std::unique_ptr<task>&& t) {
 static
 bool
 virtualized() {
-    return boost::filesystem::exists("/sys/hypervisor/type");
+    return fs::exists("/sys/hypervisor/type");
 }
 
 std::chrono::nanoseconds

diff --git a/src/core/resource.cc b/src/core/resource.cc
@@ -264,7 +264,7 @@ allocate_io_queues(hwloc_topology_t& topology, std::vector<cpu> cpus, unsigned n
 
 
 size_t get_cgroup_memory_limit() {
-    std::experimental::filesystem::path cgroup_memory = "/sys/fs/cgroup/memory/memory.limit_in_bytes";
+    compat::filesystem::path cgroup_memory = "/sys/fs/cgroup/memory/memory.limit_in_bytes";
 
     try {
         return boost::lexical_cast<size_t>(read_first_line(cgroup_memory));

diff --git a/src/util/read_first_line.cc b/src/util/read_first_line.cc
@@ -3,7 +3,7 @@
 
 namespace seastar {
 
-sstring read_first_line(std::experimental::filesystem::path sys_file) {
+sstring read_first_line(compat::filesystem::path sys_file) {
     auto file = file_desc::open(sys_file.string(), O_RDONLY | O_CLOEXEC);
     sstring buf;
     size_t n = 0;