Restructure libs.

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

diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h
index 1b9e2035ce9e8466457bf4c2857ff61cf1451367..5abcee3389c0ea15c312966ee6031e8cf0557180 100644 (file)
--- a/include/stg/user_traff.h
+++ b/include/stg/user_traff.h
@@ -29,10 +29,10 @@
 
 #include "resetable.h"
 #include "const.h"
 
 #include "resetable.h"
 #include "const.h"

-#include "os_int.h"

 
 #include <iostream>
 #include <vector>
 
 #include <iostream>
 #include <vector>

+#include <cstdint>

 
 enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD};
 
 
 enum TRAFF_DIRECTION {TRAFF_UPLOAD, TRAFF_DOWNLOAD};
 


@@ -45,12 +45,16 @@ public:
     typedef ContainerType::size_type IndexType;
 
     DIR_TRAFF() : traff(DIR_NUM) {}
     typedef ContainerType::size_type IndexType;
 
     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]; }
     IndexType size() const { return traff.size(); }
 
     const uint64_t & operator[](IndexType idx) const { return traff[idx]; }
     uint64_t & operator[](IndexType idx) { return traff[idx]; }
     IndexType size() const { return traff.size(); }
 

+    void Reset()
+    {
+    for (IndexType i = 0; i < traff.size(); ++i)
+        traff[i] = 0;
+    }
+

 private:
     ContainerType traff;
 };
 private:
     ContainerType traff;
 };


@@ -74,19 +78,27 @@ return o;
 class DIR_TRAFF_RES
 {
 public:
 class DIR_TRAFF_RES
 {
 public:

+    typedef RESETABLE<uint64_t> value_type;

     typedef RESETABLE<uint64_t> ValueType;
     typedef std::vector<ValueType> ContainerType;
     typedef ContainerType::size_type IndexType;
 
     DIR_TRAFF_RES() : traff(DIR_NUM) {}
     typedef RESETABLE<uint64_t> ValueType;
     typedef std::vector<ValueType> ContainerType;
     typedef ContainerType::size_type IndexType;
 
     DIR_TRAFF_RES() : traff(DIR_NUM) {}

-    DIR_TRAFF_RES(const DIR_TRAFF & ts)
+    explicit DIR_TRAFF_RES(const DIR_TRAFF & ts)

         : traff(ts.size())
     {
     for (IndexType i = 0; i < ts.size(); ++i)
         traff[i] = ts[i];
     }
         : 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]; }
     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;
     DIR_TRAFF GetData() const
     {
     DIR_TRAFF res;