Skip to content

Commit 39e8ff7

Browse files
committed
centralize the std::execution backend namespace alias
1 parent cee6504 commit 39e8ff7

20 files changed

Lines changed: 37 additions & 34 deletions

‎bin/ublkctl.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <utility>
2121
#include <variant>
2222

23-
namespace ex = condy::detail::ex;
23+
namespace ex = ublk::detail::ex;
2424

2525
struct AddCmd {
2626
uint32_t dev_id = -1;

‎examples/loop.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <ublk.hpp>
2727
#include <unistd.h>
2828

29-
namespace ex = condy::detail::ex;
29+
namespace ex = ublk::detail::ex;
3030

3131
namespace {
3232

‎examples/nop.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <ublk.hpp>
2121
#include <unistd.h>
2222

23-
namespace ex = condy::detail::ex;
23+
namespace ex = ublk::detail::ex;
2424

2525
void prep_dev_info(ublksrv_ctrl_dev_info &info, uint32_t dev_id,
2626
uint64_t flags) noexcept {

‎include/ublk/detail/control.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#pragma once
77

8+
#include "ublk/detail/execution.hpp"
89
#include "ublk/detail/path.hpp"
910
#include "ublk/detail/retry.hpp"
1011
#include "ublk/detail/task.hpp"
@@ -16,8 +17,6 @@
1617
namespace ublk {
1718
namespace detail {
1819

19-
namespace ex = condy::detail::ex;
20-
2120
struct control_get_dev_info_t {
2221
template <typename Sched, typename Alloc>
2322
ex::task<void, TaskEnv<Sched, Alloc>> invoke(int fd, uint32_t dev_id,

‎include/ublk/detail/daemon.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#pragma once
88

99
#include "ublk/detail/control.hpp"
10+
#include "ublk/detail/execution.hpp"
1011
#include "ublk/detail/io.hpp"
1112
#include "ublk/detail/io_loop.hpp"
1213
#include "ublk/detail/shm.hpp"
@@ -20,8 +21,6 @@
2021
namespace ublk {
2122
namespace detail {
2223

23-
namespace ex = condy::detail::ex;
24-
2524
inline bool need_recovery(const ublksrv_ctrl_dev_info *info) noexcept {
2625
return info->state == UBLK_S_DEV_QUIESCED ||
2726
info->state == UBLK_S_DEV_FAIL_IO;

‎include/ublk/detail/execution.hpp‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/**
2+
* @file execution.hpp
3+
* @brief The std::execution backend namespace used by ublk-cpp.
4+
*/
5+
6+
#pragma once
7+
8+
#include <condy.hpp>
9+
10+
namespace ublk {
11+
namespace detail {
12+
13+
namespace ex = condy::detail::ex;
14+
15+
} // namespace detail
16+
} // namespace ublk

‎include/ublk/detail/io.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#pragma once
88

9+
#include "ublk/detail/execution.hpp"
910
#include "ublk/detail/queue.hpp"
1011
#include "ublk/detail/task.hpp"
1112
#include "ublk/handler.hpp"
@@ -16,8 +17,6 @@
1617
namespace ublk {
1718
namespace detail {
1819

19-
namespace ex = condy::detail::ex;
20-
2120
struct io_run_dev_t {
2221
template <typename Sched, typename Alloc, IoHandler Handler>
2322
ex::task<void, TaskEnv<Sched, Alloc>>

‎include/ublk/detail/queue.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#pragma once
77

8+
#include "ublk/detail/execution.hpp"
89
#include "ublk/detail/task.hpp"
910
#include "ublk/detail/utils.hpp"
1011
#include "ublk/handler.hpp"
@@ -24,8 +25,6 @@
2425
namespace ublk {
2526
namespace detail {
2627

27-
namespace ex = condy::detail::ex;
28-
2928
inline bool need_alloc_buf(uint64_t flags) noexcept {
3029
return !(flags & (UBLK_F_SUPPORT_ZERO_COPY | UBLK_F_USER_COPY));
3130
}

‎include/ublk/detail/retry.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma once
22

3+
#include "ublk/detail/execution.hpp"
34
#include "ublk/detail/task.hpp"
45
#include <condy.hpp>
56
#include <cstddef>
@@ -9,8 +10,6 @@
910
namespace ublk {
1011
namespace detail {
1112

12-
namespace ex = condy::detail::ex;
13-
1413
template <typename Sched, typename Alloc, typename Fn>
1514
inline ex::task<bool, TaskEnv<Sched, Alloc>> retry(Fn fn, size_t max_retry,
1615
int64_t sleep_ms) {

‎include/ublk/detail/shm.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#pragma once
88

99
#include "ublk/detail/control.hpp"
10+
#include "ublk/detail/execution.hpp"
1011
#include "ublk/detail/task.hpp"
1112
#include "ublk/handler.hpp"
1213
#include <condy.hpp>
@@ -19,8 +20,6 @@
1920
namespace ublk {
2021
namespace detail {
2122

22-
namespace ex = condy::detail::ex;
23-
2423
template <typename Sched, typename Alloc, typename Session>
2524
inline ex::task<void, TaskEnv<Sched, Alloc>>
2625
shm_session(int client_fd, Session session, ex::counting_scope &scope) {

0 commit comments

Comments
 (0)