X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8c6fa3fbaccc22127280bf77a48fab5a3ee0716e..90b793eb07dc190eeb1144a1da079de760d17c36:/include/stg/user_traff.h?ds=sidebyside diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h index 3ca9768e..af5a0b64 100644 --- a/include/stg/user_traff.h +++ b/include/stg/user_traff.h @@ -18,98 +18,85 @@ * Author : Boris Mikhailenko */ -/* - $Revision: 1.7 $ - $Date: 2010/10/07 19:48:52 $ - $Author: faust $ - */ +#pragma once -#ifndef USER_TRAFF_H -#define USER_TRAFF_H - -#include "resetable.h" #include "const.h" -#include "os_int.h" -#include +#include #include +#include +#include + +namespace STG +{ -enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD}; +enum TraffDirection {TRAFF_UPLOAD, TRAFF_DOWNLOAD}; -class DIR_TRAFF +class DirTraff { - friend std::ostream & operator<< (std::ostream & o, const DIR_TRAFF & traff); + friend std::ostream& operator<< (std::ostream& stream, const DirTraff& traff); -public: - typedef std::vector ContainerType; - typedef ContainerType::size_type IndexType; + public: + using ContainerType = std::vector; + using IndexType = ContainerType::size_type; - DIR_TRAFF() : traff(DIR_NUM) {} - const uint64_t & operator[](IndexType idx) const { return traff[idx]; } - uint64_t & operator[](IndexType idx) { return traff[idx]; } - IndexType size() const { return traff.size(); } + DirTraff() noexcept : traff(DIR_NUM) {} + const uint64_t & operator[](IndexType idx) const noexcept { return traff[idx]; } + uint64_t & operator[](IndexType idx) noexcept { return traff[idx]; } + IndexType size() const noexcept { return traff.size(); } - void Reset() - { - for (IndexType i = 0; i < traff.size(); ++i) - traff[i] = 0; - } + void reset() noexcept + { + for (IndexType i = 0; i < traff.size(); ++i) + traff[i] = 0; + } -private: - ContainerType traff; + private: + ContainerType traff; }; //----------------------------------------------------------------------------- inline -std::ostream & operator<<(std::ostream & o, const DIR_TRAFF & traff) +std::ostream& operator<<(std::ostream& stream, const DirTraff& traff) { -bool first = true; -for (DIR_TRAFF::IndexType i = 0; i < traff.size(); ++i) + bool first = true; + for (DirTraff::IndexType i = 0; i < traff.size(); ++i) { - if (first) - first = false; - else - o << ","; - o << traff[i]; + if (first) + first = false; + else + stream << ","; + stream << traff[i]; } -return o; + return stream; } -class DIR_TRAFF_RES +class DirTraffOpt { -public: - typedef RESETABLE value_type; - typedef RESETABLE ValueType; - typedef std::vector ContainerType; - typedef ContainerType::size_type IndexType; - - DIR_TRAFF_RES() : traff(DIR_NUM) {} - explicit DIR_TRAFF_RES(const DIR_TRAFF & ts) - : traff(ts.size()) - { - for (IndexType i = 0; i < ts.size(); ++i) - traff[i] = ts[i]; - } - DIR_TRAFF_RES & operator=(const DIR_TRAFF & ts) - { - for (IndexType i = 0; i < ts.size(); ++i) - traff[i] = ts[i]; - return *this; - } - const ValueType & operator[](IndexType idx) const { return traff[idx]; } - ValueType & operator[](IndexType idx) { return traff[idx]; } - IndexType size() const { return traff.size(); } - DIR_TRAFF GetData() const - { - DIR_TRAFF res; - for (IndexType i = 0; i < traff.size(); ++i) - if (!traff[i].empty()) - res[i] = traff[i].data(); - return res; - } - -private: - ContainerType traff; + public: + using ValueType = std::optional; + using ContainerType = std::vector; + using IndexType = ContainerType::size_type; + + DirTraffOpt() noexcept: traff(DIR_NUM) {} + explicit DirTraffOpt(const DirTraff & ts) noexcept + : traff(ts.size()) + { + for (IndexType i = 0; i < ts.size(); ++i) + traff[i] = ts[i]; + } + DirTraffOpt& operator=(const DirTraff& ts) noexcept + { + for (IndexType i = 0; i < ts.size(); ++i) + traff[i] = ts[i]; + return *this; + } + const ValueType & operator[](IndexType idx) const noexcept { return traff[idx]; } + ValueType & operator[](IndexType idx) noexcept { return traff[idx]; } + IndexType size() const noexcept { return traff.size(); } + + private: + ContainerType traff; }; -#endif +}