Skip to content

Commit 94a342a

Browse files
trflynn89trflynn89
committed
Move task system to fly::task namespace
1 parent 0a7316b commit 94a342a

37 files changed

+168
-138
lines changed

‎fly/config/config_manager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace fly {
1313

1414
//==================================================================================================
1515
std::shared_ptr<ConfigManager> ConfigManager::create(
16-
std::shared_ptr<SequencedTaskRunner> task_runner,
16+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
1717
ConfigFileType file_type,
1818
std::filesystem::path path)
1919
{
@@ -22,7 +22,7 @@ std::shared_ptr<ConfigManager> ConfigManager::create(
2222
struct ConfigManagerImpl final : public ConfigManager
2323
{
2424
ConfigManagerImpl(
25-
std::shared_ptr<SequencedTaskRunner> task_runner,
25+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
2626
ConfigFileType file_type,
2727
std::filesystem::path path) noexcept :
2828
ConfigManager(std::move(task_runner), file_type, std::move(path))
@@ -37,7 +37,7 @@ std::shared_ptr<ConfigManager> ConfigManager::create(
3737

3838
//==================================================================================================
3939
ConfigManager::ConfigManager(
40-
std::shared_ptr<SequencedTaskRunner> task_runner,
40+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
4141
ConfigFileType file_type,
4242
std::filesystem::path path) noexcept :
4343
m_task_runner(std::move(task_runner)),

‎fly/config/config_manager.hpp

+7-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@
1212
#include <string>
1313
#include <type_traits>
1414

15+
namespace fly::task {
16+
class SequencedTaskRunner;
17+
} // namespace fly::task
18+
1519
namespace fly {
1620

1721
class Parser;
1822
class PathMonitor;
19-
class SequencedTaskRunner;
2023

2124
/**
2225
* Class to create and manage a set of configurations.
@@ -51,7 +54,7 @@ class ConfigManager : public std::enable_shared_from_this<ConfigManager>
5154
* @return The created configuration manager.
5255
*/
5356
static std::shared_ptr<ConfigManager> create(
54-
std::shared_ptr<SequencedTaskRunner> task_runner,
57+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
5558
ConfigFileType file_type,
5659
std::filesystem::path path);
5760

@@ -86,7 +89,7 @@ class ConfigManager : public std::enable_shared_from_this<ConfigManager>
8689
* @param path Path to the configuration file.
8790
*/
8891
ConfigManager(
89-
std::shared_ptr<SequencedTaskRunner> task_runner,
92+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
9093
ConfigFileType file_type,
9194
std::filesystem::path path) noexcept;
9295

@@ -102,7 +105,7 @@ class ConfigManager : public std::enable_shared_from_this<ConfigManager>
102105
*/
103106
void update_config();
104107

105-
std::shared_ptr<SequencedTaskRunner> m_task_runner;
108+
std::shared_ptr<fly::task::SequencedTaskRunner> m_task_runner;
106109

107110
std::shared_ptr<PathMonitor> m_monitor;
108111
std::unique_ptr<Parser> m_parser;

‎fly/logger/logger.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace fly {
1414
//==================================================================================================
1515
Logger::Logger(
1616
std::string name,
17-
std::shared_ptr<SequencedTaskRunner> task_runner,
17+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
1818
std::shared_ptr<LoggerConfig> config,
1919
std::unique_ptr<LogSink> &&sink) noexcept :
2020
m_name(std::move(name)),
@@ -43,7 +43,7 @@ std::shared_ptr<Logger> Logger::create_logger(
4343
//==================================================================================================
4444
std::shared_ptr<Logger> Logger::create_logger(
4545
std::string name,
46-
std::shared_ptr<SequencedTaskRunner> task_runner,
46+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
4747
std::shared_ptr<LoggerConfig> logger_config,
4848
std::unique_ptr<LogSink> &&sink)
4949
{
@@ -53,7 +53,7 @@ std::shared_ptr<Logger> Logger::create_logger(
5353
{
5454
LoggerImpl(
5555
std::string &&name,
56-
std::shared_ptr<SequencedTaskRunner> &&task_runner,
56+
std::shared_ptr<fly::task::SequencedTaskRunner> &&task_runner,
5757
std::shared_ptr<LoggerConfig> &&logger_config,
5858
std::unique_ptr<LogSink> &&sink) noexcept :
5959
Logger(
@@ -97,7 +97,7 @@ std::shared_ptr<Logger> Logger::create_file_logger(
9797
//==================================================================================================
9898
std::shared_ptr<Logger> Logger::create_file_logger(
9999
std::string name,
100-
std::shared_ptr<SequencedTaskRunner> task_runner,
100+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
101101
std::shared_ptr<LoggerConfig> logger_config,
102102
std::shared_ptr<CoderConfig> coder_config,
103103
std::filesystem::path logger_directory)
@@ -124,7 +124,7 @@ Logger::create_console_logger(std::string name, std::shared_ptr<LoggerConfig> lo
124124
//==================================================================================================
125125
std::shared_ptr<Logger> Logger::create_console_logger(
126126
std::string name,
127-
std::shared_ptr<SequencedTaskRunner> task_runner,
127+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
128128
std::shared_ptr<LoggerConfig> logger_config)
129129
{
130130
auto sink = std::make_unique<detail::ConsoleSink>();

‎fly/logger/logger.hpp

+9-6
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,14 @@ namespace fly::detail {
103103
class Registry;
104104
} // namespace fly::detail
105105

106+
namespace fly::task {
107+
class SequencedTaskRunner;
108+
} // namespace fly::task
109+
106110
namespace fly {
107111

108112
class CoderConfig;
109113
class LoggerConfig;
110-
class SequencedTaskRunner;
111114
class LogSink;
112115

113116
/**
@@ -170,7 +173,7 @@ class Logger : public std::enable_shared_from_this<Logger>
170173
*/
171174
static std::shared_ptr<Logger> create_logger(
172175
std::string name,
173-
std::shared_ptr<SequencedTaskRunner> task_runner,
176+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
174177
std::shared_ptr<LoggerConfig> logger_config,
175178
std::unique_ptr<LogSink> &&sink);
176179

@@ -203,7 +206,7 @@ class Logger : public std::enable_shared_from_this<Logger>
203206
*/
204207
static std::shared_ptr<Logger> create_file_logger(
205208
std::string name,
206-
std::shared_ptr<SequencedTaskRunner> task_runner,
209+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
207210
std::shared_ptr<LoggerConfig> logger_config,
208211
std::shared_ptr<CoderConfig> coder_config,
209212
std::filesystem::path logger_directory);
@@ -230,7 +233,7 @@ class Logger : public std::enable_shared_from_this<Logger>
230233
*/
231234
static std::shared_ptr<Logger> create_console_logger(
232235
std::string name,
233-
std::shared_ptr<SequencedTaskRunner> task_runner,
236+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
234237
std::shared_ptr<LoggerConfig> logger_config);
235238

236239
/**
@@ -441,7 +444,7 @@ class Logger : public std::enable_shared_from_this<Logger>
441444
*/
442445
Logger(
443446
std::string name,
444-
std::shared_ptr<SequencedTaskRunner> task_runner,
447+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
445448
std::shared_ptr<LoggerConfig> config,
446449
std::unique_ptr<LogSink> &&sink) noexcept;
447450

@@ -483,7 +486,7 @@ class Logger : public std::enable_shared_from_this<Logger>
483486
std::shared_ptr<LoggerConfig> m_config;
484487
std::unique_ptr<LogSink> m_sink;
485488

486-
std::shared_ptr<SequencedTaskRunner> m_task_runner;
489+
std::shared_ptr<fly::task::SequencedTaskRunner> m_task_runner;
487490
std::atomic_bool m_last_task_failed {true};
488491

489492
const std::chrono::steady_clock::time_point m_start_time;

‎fly/net/socket/socket_service.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ namespace fly::net {
1010

1111
//==================================================================================================
1212
std::shared_ptr<SocketService> SocketService::create(
13-
std::shared_ptr<fly::SequencedTaskRunner> task_runner,
13+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
1414
std::shared_ptr<NetworkConfig> config)
1515
{
1616
// SocketService has a private constructor, thus cannot be used with std::make_shared. This
1717
// class is used to expose the private constructor locally.
1818
struct SocketServiceImpl final : public SocketService
1919
{
2020
SocketServiceImpl(
21-
std::shared_ptr<fly::SequencedTaskRunner> task_runner,
21+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
2222
std::shared_ptr<NetworkConfig> config) noexcept :
2323
SocketService(std::move(task_runner), std::move(config))
2424
{
@@ -30,7 +30,7 @@ std::shared_ptr<SocketService> SocketService::create(
3030

3131
//==================================================================================================
3232
SocketService::SocketService(
33-
std::shared_ptr<fly::SequencedTaskRunner> task_runner,
33+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
3434
std::shared_ptr<NetworkConfig> config) noexcept :
3535
m_task_runner(std::move(task_runner)),
3636
m_config(std::move(config))

‎fly/net/socket/socket_service.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#include <memory>
77
#include <vector>
88

9-
namespace fly {
9+
namespace fly::task {
1010
class SequencedTaskRunner;
11-
} // namespace fly
11+
} // namespace fly::task
1212

1313
namespace fly::net {
1414

@@ -38,7 +38,7 @@ class SocketService : public std::enable_shared_from_this<SocketService>
3838
* @return The created socket service.
3939
*/
4040
static std::shared_ptr<SocketService> create(
41-
std::shared_ptr<fly::SequencedTaskRunner> task_runner,
41+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
4242
std::shared_ptr<NetworkConfig> config);
4343

4444
/**
@@ -117,7 +117,7 @@ class SocketService : public std::enable_shared_from_this<SocketService>
117117
* @param task_runner Task runner for posting socket service tasks onto.
118118
*/
119119
SocketService(
120-
std::shared_ptr<fly::SequencedTaskRunner> task_runner,
120+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
121121
std::shared_ptr<NetworkConfig> config) noexcept;
122122

123123
/**
@@ -166,7 +166,7 @@ class SocketService : public std::enable_shared_from_this<SocketService>
166166
*/
167167
void poll();
168168

169-
std::shared_ptr<fly::SequencedTaskRunner> m_task_runner;
169+
std::shared_ptr<fly::task::SequencedTaskRunner> m_task_runner;
170170

171171
std::shared_ptr<NetworkConfig> m_config;
172172

‎fly/path/mac/path_monitor_impl.hpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@
1111
#include <memory>
1212
#include <vector>
1313

14+
namespace fly::task {
15+
class SequencedTaskRunner;
16+
} // namespace fly::task
17+
1418
namespace fly {
1519

1620
class PathConfig;
17-
class SequencedTaskRunner;
1821

1922
/**
2023
* macOS implementation of the PathMonitor interface. Uses the Apple File System Events API to
@@ -32,7 +35,7 @@ class PathMonitorImpl : public PathMonitor
3235
* Constructor. Creates the dispatch queue used to handle path events.
3336
*/
3437
PathMonitorImpl(
35-
std::shared_ptr<SequencedTaskRunner> task_runner,
38+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
3639
std::shared_ptr<PathConfig> config) noexcept;
3740

3841
/**

‎fly/path/mac/path_monitor_impl.mm

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ino_t get_inode_id(const std::filesystem::path &path)
3737

3838
//==================================================================================================
3939
PathMonitorImpl::PathMonitorImpl(
40-
std::shared_ptr<SequencedTaskRunner> task_runner,
40+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
4141
std::shared_ptr<PathConfig> config) noexcept :
4242
PathMonitor(std::move(task_runner), std::move(config)),
4343
m_context(std::make_unique<FSEventStreamContext>()),

‎fly/path/nix/path_monitor_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ namespace {
2222

2323
//==================================================================================================
2424
PathMonitorImpl::PathMonitorImpl(
25-
std::shared_ptr<SequencedTaskRunner> task_runner,
25+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
2626
std::shared_ptr<PathConfig> config) noexcept :
2727
PathMonitor(std::move(task_runner), std::move(config)),
2828
m_monitor_descriptor(::inotify_init1(s_init_flags))

‎fly/path/nix/path_monitor_impl.hpp

+5-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,13 @@
1010
#include <filesystem>
1111
#include <memory>
1212

13+
namespace fly::task {
14+
class SequencedTaskRunner;
15+
} // namespace fly::task
16+
1317
namespace fly {
1418

1519
class PathConfig;
16-
class SequencedTaskRunner;
1720

1821
/**
1922
* Linux implementation of the PathMonitor interface. Uses the inotify API to detect path changes.
@@ -28,7 +31,7 @@ class PathMonitorImpl : public PathMonitor
2831
* Constructor. Create the path monitor's inotify handle.
2932
*/
3033
PathMonitorImpl(
31-
std::shared_ptr<SequencedTaskRunner> task_runner,
34+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
3235
std::shared_ptr<PathConfig> config) noexcept;
3336

3437
/**

‎fly/path/path_monitor.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace fly {
1313

1414
//==================================================================================================
1515
std::shared_ptr<PathMonitor> PathMonitor::create(
16-
std::shared_ptr<SequencedTaskRunner> task_runner,
16+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
1717
std::shared_ptr<PathConfig> config)
1818
{
1919
auto path_monitor =
@@ -23,7 +23,7 @@ std::shared_ptr<PathMonitor> PathMonitor::create(
2323

2424
//==================================================================================================
2525
PathMonitor::PathMonitor(
26-
std::shared_ptr<SequencedTaskRunner> task_runner,
26+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
2727
std::shared_ptr<PathConfig> config) noexcept :
2828
m_task_runner(std::move(task_runner)),
2929
m_config(std::move(config))

‎fly/path/path_monitor.hpp

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,14 @@
77
#include <memory>
88
#include <mutex>
99

10+
namespace fly::task {
11+
class SequencedTaskRunner;
12+
} // namespace fly::task
13+
1014
namespace fly {
1115

1216
class PathConfig;
1317
class PathMonitorTask;
14-
class SequencedTaskRunner;
1518

1619
/**
1720
* Virtual interface to monitor a local path. Provides monitoring of either all files or
@@ -48,8 +51,9 @@ class PathMonitor : public std::enable_shared_from_this<PathMonitor>
4851
*
4952
* @return The created path monitor.
5053
*/
51-
static std::shared_ptr<PathMonitor>
52-
create(std::shared_ptr<SequencedTaskRunner> task_runner, std::shared_ptr<PathConfig> config);
54+
static std::shared_ptr<PathMonitor> create(
55+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
56+
std::shared_ptr<PathConfig> config);
5357

5458
/**
5559
* Destructor. Remove all paths from the path monitor.
@@ -138,7 +142,7 @@ class PathMonitor : public std::enable_shared_from_this<PathMonitor>
138142
* @param config Reference to path configuration.
139143
*/
140144
PathMonitor(
141-
std::shared_ptr<SequencedTaskRunner> task_runner,
145+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
142146
std::shared_ptr<PathConfig> config) noexcept;
143147

144148
/**
@@ -198,7 +202,7 @@ class PathMonitor : public std::enable_shared_from_this<PathMonitor>
198202
*/
199203
friend std::ostream &operator<<(std::ostream &stream, PathEvent event);
200204

201-
std::shared_ptr<SequencedTaskRunner> m_task_runner;
205+
std::shared_ptr<fly::task::SequencedTaskRunner> m_task_runner;
202206
std::shared_ptr<PathConfig> m_config;
203207
};
204208

‎fly/path/win/path_monitor_impl.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace {
2525

2626
//==================================================================================================
2727
PathMonitorImpl::PathMonitorImpl(
28-
std::shared_ptr<SequencedTaskRunner> task_runner,
28+
std::shared_ptr<fly::task::SequencedTaskRunner> task_runner,
2929
std::shared_ptr<PathConfig> config) noexcept :
3030
PathMonitor(std::move(task_runner), std::move(config))
3131
{

0 commit comments

Comments
 (0)