Fixed bfstream test compilation.

[stg.git] / include / stg / user_traff.h

diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h
index f186d00a5a66f75dc4d160b0f5492b82ab441db5..1b9e2035ce9e8466457bf4c2857ff61cf1451367 100644 (file)
--- a/include/stg/user_traff.h
+++ b/include/stg/user_traff.h
@@ -27,12 +27,13 @@
 #ifndef USER_TRAFF_H
 #define USER_TRAFF_H
 
-#include <iostream>
-#include <vector>
-
+#include "resetable.h"
 #include "const.h"
 #include "os_int.h"
 
+#include <iostream>
+#include <vector>
+
 enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD};
 
 class DIR_TRAFF
@@ -43,12 +44,11 @@ public:
     typedef std::vector<uint64_t> 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 +57,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 +78,7 @@ public:
     typedef std::vector<ValueType> ContainerType;
     typedef ContainerType::size_type IndexType;
 
+    DIR_TRAFF_RES() : traff(DIR_NUM) {}
     DIR_TRAFF_RES(const DIR_TRAFF & ts)
         : traff(ts.size())
     {
@@ -95,6 +87,14 @@ public:
     }
     const ValueType & operator[](IndexType idx) const { return traff[idx]; }
     ValueType & operator[](IndexType idx) { return traff[idx]; }
+    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;