From: Maxim Mamontov Date: Tue, 8 Oct 2013 15:51:17 +0000 (+0300) Subject: Pre-allocate DIR_TRAFF container with DIR_NUM items. X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/6b783a3154c0e105e8480057844cf11d482ac279 Pre-allocate DIR_TRAFF container with DIR_NUM items. --- diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h index f186d00a..133cb54c 100644 --- a/include/stg/user_traff.h +++ b/include/stg/user_traff.h @@ -43,12 +43,11 @@ public: typedef std::vector ContainerType; typedef ContainerType::size_type IndexType; - DIR_TRAFF() {} + DIR_TRAFF() : traff(DIR_NUM) {} DIR_TRAFF(const DIR_TRAFF & ts) : traff(ts.traff) {} DIR_TRAFF & operator=(const DIR_TRAFF & ts) { traff = ts.traff; return *this; } const uint64_t & operator[](IndexType idx) const { return traff[idx]; } uint64_t & operator[](IndexType idx) { return traff[idx]; } - DIR_TRAFF operator+(const DIR_TRAFF & ts); IndexType size() const { return traff.size(); } private: @@ -57,19 +56,10 @@ private: //----------------------------------------------------------------------------- inline -DIR_TRAFF DIR_TRAFF::operator+(const DIR_TRAFF & ts) -{ -for (IndexType i = 0; i < DIR_NUM; i++) - { - traff[i] = traff[i] + ts.traff[i]; - } -return *this; -} -//----------------------------------------------------------------------------- -inline std::ostream & operator<<(std::ostream & o, const DIR_TRAFF & traff) +std::ostream & operator<<(std::ostream & o, const DIR_TRAFF & traff) { bool first = true; -for (DIR_TRAFF::IndexType i = 0; i < DIR_NUM; ++i) +for (DIR_TRAFF::IndexType i = 0; i < traff.size(); ++i) { if (first) first = false; @@ -87,6 +77,7 @@ public: typedef std::vector ContainerType; typedef ContainerType::size_type IndexType; + DIR_TRAFF_RES() : traff(DIR_NUM) {} DIR_TRAFF_RES(const DIR_TRAFF & ts) : traff(ts.size()) {