diff options
| author | alpine <[email protected]> | 2020-06-18 22:19:30 +0200 |
|---|---|---|
| committer | alpine <[email protected]> | 2020-06-18 22:19:30 +0200 |
| commit | c880bb35ac9b0744be38a66b6e8860464fe304ed (patch) | |
| tree | e81ebc8fd5dc9614534bafaeb9e39a089738a94d /server/src/util | |
| parent | Finished session id on client and server. (diff) | |
| download | loader-c880bb35ac9b0744be38a66b6e8860464fe304ed.tar.xz loader-c880bb35ac9b0744be38a66b6e8860464fe304ed.zip | |
Changed clang format style.
Diffstat (limited to 'server/src/util')
| -rw-r--r-- | server/src/util/commands.h | 26 | ||||
| -rw-r--r-- | server/src/util/events.h | 31 | ||||
| -rw-r--r-- | server/src/util/io.cpp | 53 | ||||
| -rw-r--r-- | server/src/util/io.h | 8 |
4 files changed, 61 insertions, 57 deletions
diff --git a/server/src/util/commands.h b/server/src/util/commands.h index 1e5ae0f..547a78c 100644 --- a/server/src/util/commands.h +++ b/server/src/util/commands.h @@ -1,21 +1,19 @@ #pragma once class commands { - using func = std::function<void()>; - std::unordered_map<std::string_view, func> m_cmds; + using func = std::function<void()>; + std::unordered_map<std::string_view, func> m_cmds; - public: - bool parse_input(const std::string_view str) { - auto it = m_cmds.find(str); - if (it != m_cmds.end()) { - it->second(); - return true; +public: + bool parse_input(const std::string_view str) + { + auto it = m_cmds.find(str); + if(it != m_cmds.end()) { + it->second(); + return true; + } + return false; } - return false; - } - void add(const std::string_view cmd, const func &cb) { - - m_cmds[cmd] = cb; - } + void add(const std::string_view cmd, const func& cb) { m_cmds[cmd] = cb; } }; diff --git a/server/src/util/events.h b/server/src/util/events.h index e6f053d..766cc26 100644 --- a/server/src/util/events.h +++ b/server/src/util/events.h @@ -1,24 +1,27 @@ #pragma once -template <typename... Args> +template<typename... Args> class event { - using func_type = std::function<void(Args...)>; + using func_type = std::function<void(Args...)>; - std::mutex event_lock; - std::list<func_type> m_funcs; + std::mutex event_lock; + std::list<func_type> m_funcs; - public: - void add(const func_type& func) { - std::lock_guard<std::mutex> lock(event_lock); +public: + void add(const func_type& func) + { + std::lock_guard<std::mutex> lock(event_lock); - m_funcs.emplace_back(std::move(func)); - } + m_funcs.emplace_back(std::move(func)); + } - void call(Args... params) { - std::lock_guard<std::mutex> lock(event_lock); + void call(Args... params) + { + std::lock_guard<std::mutex> lock(event_lock); - for (auto& func : m_funcs) { - if (func) func(std::forward<Args>(params)...); + for(auto& func : m_funcs) { + if(func) + func(std::forward<Args>(params)...); + } } - } }; diff --git a/server/src/util/io.cpp b/server/src/util/io.cpp index f2da690..9779fc8 100644 --- a/server/src/util/io.cpp +++ b/server/src/util/io.cpp @@ -3,41 +3,44 @@ std::shared_ptr<spdlog::logger> io::logger; -void io::init(const bool &to_file) { - auto sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>(); - sink->set_pattern("[%R][%^%l%$] %v"); +void io::init(const bool& to_file) +{ + auto sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>(); + sink->set_pattern("[%R][%^%l%$] %v"); - auto file_sink = - std::make_shared<spdlog::sinks::basic_file_sink_mt>("server.log", true); + auto file_sink = + std::make_shared<spdlog::sinks::basic_file_sink_mt>("server.log", true); - std::vector<spdlog::sink_ptr> log_sinks; - log_sinks.emplace_back(sink); + std::vector<spdlog::sink_ptr> log_sinks; + log_sinks.emplace_back(sink); - if (to_file) log_sinks.emplace_back(file_sink); + if(to_file) + log_sinks.emplace_back(file_sink); - logger = std::make_shared<spdlog::logger>("server", log_sinks.begin(), - log_sinks.end()); - spdlog::register_logger(logger); + logger = + std::make_shared<spdlog::logger>("server", log_sinks.begin(), log_sinks.end()); + spdlog::register_logger(logger); - spdlog::flush_every(std::chrono::seconds(1)); + spdlog::flush_every(std::chrono::seconds(1)); } -void io::read_file(const std::string_view name, std::vector<char> &out) { - std::ifstream file(name.data()); - if (!file.good()) { - io::logger->error("failed to load {}.", name.data()); - return; - } +void io::read_file(const std::string_view name, std::vector<char>& out) +{ + std::ifstream file(name.data()); + if(!file.good()) { + io::logger->error("failed to load {}.", name.data()); + return; + } - file.unsetf(std::ios::skipws); + file.unsetf(std::ios::skipws); - file.seekg(0, std::ios::end); - const size_t size = file.tellg(); - file.seekg(0, std::ios::beg); + file.seekg(0, std::ios::end); + const size_t size = file.tellg(); + file.seekg(0, std::ios::beg); - out.resize(size); + out.resize(size); - file.read(out.data(), size); + file.read(out.data(), size); - file.close(); + file.close(); } diff --git a/server/src/util/io.h b/server/src/util/io.h index 7f6e3a8..e8ef3f0 100644 --- a/server/src/util/io.h +++ b/server/src/util/io.h @@ -1,8 +1,8 @@ #pragma once namespace io { -extern std::shared_ptr<spdlog::logger> logger; + extern std::shared_ptr<spdlog::logger> logger; -void init(const bool &to_file); -void read_file(const std::string_view name, std::vector<char> &out); -}; // namespace io + void init(const bool& to_file); + void read_file(const std::string_view name, std::vector<char>& out); +}; // namespace io |