Merge branch 'scylladb:master' into master

scylladb · Jan 10, 2025 · c8edab2 · c8edab2
2 parents df73c5d + 11d1701
commit c8edab2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 43 deletions.
diff --git a/include/seastar/core/dpdk_rte.hh b/include/seastar/core/dpdk_rte.hh
@@ -20,6 +20,7 @@
 #ifdef SEASTAR_HAVE_DPDK
 
 #include <bitset>
+#include <optional>
 #include <rte_config.h>
 #include <rte_ethdev.h>
 #include <rte_version.h>

diff --git a/include/seastar/core/file.hh b/include/seastar/core/file.hh
@@ -462,20 +462,6 @@ public:
     ///         if the operation has failed
     future<int> fcntl_short(int op, uintptr_t arg = 0UL) noexcept;
 
-    /// Set a lifetime hint for the open file descriptor corresponding to seastar::file
-    ///
-    /// Write lifetime  hints  can be used to inform the kernel about the relative
-    /// expected lifetime of writes on a given inode or via open file descriptor.
-    /// An application may use the different hint values to separate writes into different
-    /// write classes, so that multiple users or applications running on a single storage back-end
-    /// can aggregate their I/O  patterns in a consistent manner.
-    /// Refer fcntl(2) man page for more details on write lifetime hints.
-    ///
-    /// \param hint the hint value of the stream
-    /// \return future indicating success or failure
-    [[deprecated("This API was removed from the kernel")]]
-    future<> set_file_lifetime_hint(uint64_t hint) noexcept;
-
     /// Set a lifetime hint for the inode corresponding to seastar::file
     ///
     /// Write lifetime  hints  can be used to inform the kernel about the relative
@@ -489,20 +475,6 @@ public:
     /// \return future indicating success or failure
     future<> set_inode_lifetime_hint(uint64_t hint) noexcept;
 
-    /// Get the lifetime hint of the open file descriptor of seastar::file which was set by
-    /// \ref set_file_lifetime_hint()
-    ///
-    /// Write lifetime  hints  can be used to inform the kernel about the relative
-    /// expected lifetime of writes on a given inode or via open file descriptor.
-    /// An application may use the different hint values to separate writes into different
-    /// write classes, so that multiple users or applications running on a single storage back-end
-    /// can aggregate their I/O  patterns in a consistent manner.
-    /// Refer fcntl(2) man page for more details on write lifetime hints.
-    ///
-    /// \return the hint value of the open file descriptor
-    [[deprecated("This API was removed from the kernel")]]
-    future<uint64_t> get_file_lifetime_hint() noexcept;
-
     /// Get the lifetime hint of the inode of seastar::file which was set by
     /// \ref set_inode_lifetime_hint()
     ///

diff --git a/pkgconfig/seastar-testing.pc.in b/pkgconfig/seastar-testing.pc.in
@@ -9,7 +9,7 @@ Version: @PROJECT_VERSION@
 
 # Dependencies.
 boost_cflags=-I$<JOIN:@Boost_INCLUDE_DIRS@, -I>
-boost_unit_test_libs=@Boost_UNIT_TEST_FRAMEWORK_LIBRARY@
+boost_unit_test_libs=$<TARGET_PROPERTY:Boost::unit_test_framework,LOCATION>
 
 # Us.
 seastar_testing_cflags=

diff --git a/pkgconfig/seastar.pc.in b/pkgconfig/seastar.pc.in
@@ -18,8 +18,8 @@ boost_system_libs=@Boost_SYSTEM_LIBRARY@
 
 # Dependencies.
 boost_cflags=-I$<JOIN:@Boost_INCLUDE_DIRS@, -I>
-boost_program_options_libs=@Boost_PROGRAM_OPTIONS_LIBRARY@
-boost_thread_libs=${boost_system_libs} @Boost_THREAD_LIBRARY@
+boost_program_options_libs=$<TARGET_PROPERTY:Boost::program_options,LOCATION>
+boost_thread_libs=${boost_system_libs} $<TARGET_PROPERTY:Boost::thread,LOCATION>
 c_ares_cflags=-I$<JOIN:@c-ares_INCLUDE_DIRS@, -I>
 c_ares_libs=$<JOIN:@c-ares_LIBRARIES@, >
 fmt_cflags=-I$<JOIN:$<TARGET_PROPERTY:fmt::fmt,INTERFACE_INCLUDE_DIRECTORIES>, -I>

diff --git a/src/core/file.cc b/src/core/file.cc
@@ -1186,10 +1186,6 @@ future<> file::set_lifetime_hint_impl(int op, uint64_t hint) noexcept {
     });
 }
 
-future<> file::set_file_lifetime_hint(uint64_t hint) noexcept {
-    return set_lifetime_hint_impl(F_SET_FILE_RW_HINT, hint);
-}
-
 future<> file::set_inode_lifetime_hint(uint64_t hint) noexcept {
     return set_lifetime_hint_impl(F_SET_RW_HINT, hint);
 }
@@ -1210,10 +1206,6 @@ future<uint64_t> file::get_lifetime_hint_impl(int op) noexcept {
     });
 }
 
-future<uint64_t> file::get_file_lifetime_hint() noexcept {
-    return get_lifetime_hint_impl(F_GET_FILE_RW_HINT);
-}
-
 future<uint64_t> file::get_inode_lifetime_hint() noexcept {
     return get_lifetime_hint_impl(F_GET_RW_HINT);
 }

diff --git a/src/net/ip.cc b/src/net/ip.cc
@@ -41,7 +41,7 @@ namespace net {
 
 ipv4_address::ipv4_address(const std::string& addr) {
     boost::system::error_code ec;
-    auto ipv4 = boost::asio::ip::address_v4::from_string(addr, ec);
+    auto ipv4 = boost::asio::ip::make_address_v4(addr, ec);
     if (ec) {
         throw std::runtime_error(
             fmt::format("Wrong format for IPv4 address {}. Please ensure it's in dotted-decimal format", addr));

diff --git a/src/net/net.cc b/src/net/net.cc
@@ -57,17 +57,17 @@ ipv4_addr::ipv4_addr(const std::string &addr) {
     std::vector<std::string> items;
     boost::split(items, addr, boost::is_any_of(":"));
     if (items.size() == 1) {
-        ip = boost::asio::ip::address_v4::from_string(addr).to_ulong();
+        ip = boost::asio::ip::make_address_v4(addr).to_ulong();
         port = 0;
     } else if (items.size() == 2) {
-        ip = boost::asio::ip::address_v4::from_string(items[0]).to_ulong();
+        ip = boost::asio::ip::make_address_v4(items[0]).to_ulong();
         port = std::stoul(items[1]);
     } else {
         throw std::invalid_argument("invalid format: " + addr);
     }
 }
 
-ipv4_addr::ipv4_addr(const std::string &addr, uint16_t port_) : ip(boost::asio::ip::address_v4::from_string(addr).to_ulong()), port(port_) {}
+ipv4_addr::ipv4_addr(const std::string &addr, uint16_t port_) : ip(boost::asio::ip::make_address_v4(addr).to_ulong()), port(port_) {}
 
 ipv4_addr::ipv4_addr(const net::inet_address& a, uint16_t port)
     : ipv4_addr(::in_addr(a), port)