diff options
| author | alpine <[email protected]> | 2020-06-24 13:05:48 +0200 |
|---|---|---|
| committer | alpine <[email protected]> | 2020-06-24 13:05:48 +0200 |
| commit | 8f0130c8f74482a7d54f9bfb8763f4c6d705765c (patch) | |
| tree | e9090817a498da9ae18a58adee92f4f8ba2db03b /server/src/util | |
| parent | Changed clang format style. (diff) | |
| download | loader-8f0130c8f74482a7d54f9bfb8763f4c6d705765c.tar.xz loader-8f0130c8f74482a7d54f9bfb8763f4c6d705765c.zip | |
Added client version control.
Reverted back to google formatting.
Diffstat (limited to 'server/src/util')
| -rw-r--r-- | server/src/util/commands.h | 23 | ||||
| -rw-r--r-- | server/src/util/events.h | 31 | ||||
| -rw-r--r-- | server/src/util/io.cpp | 53 |
3 files changed, 50 insertions, 57 deletions
diff --git a/server/src/util/commands.h b/server/src/util/commands.h index 547a78c..3648df2 100644 --- a/server/src/util/commands.h +++ b/server/src/util/commands.h @@ -1,19 +1,18 @@ #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; - } - return false; + 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; + } - 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 766cc26..e6f053d 100644 --- a/server/src/util/events.h +++ b/server/src/util/events.h @@ -1,27 +1,24 @@ #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 9779fc8..aff8a53 100644 --- a/server/src/util/io.cpp +++ b/server/src/util/io.cpp @@ -3,44 +3,41 @@ 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(); } |