Replace boost::scoped_ptr with std::unique_ptr.

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

diff --git a/include/stg/user_traff.h b/include/stg/user_traff.h
index f186d00a5a66f75dc4d160b0f5492b82ab441db5..5abcee3389c0ea15c312966ee6031e8cf0557180 100644 (file)
--- a/include/stg/user_traff.h
+++ b/include/stg/user_traff.h
@@ -27,11 +27,12 @@
 #ifndef USER_TRAFF_H
 #define USER_TRAFF_H
 
 #ifndef USER_TRAFF_H
 #define USER_TRAFF_H
 

+#include "resetable.h"
+#include "const.h"
+

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

-
-#include "const.h"
-#include "os_int.h"
+#include <cstdint>

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


@@ -43,33 +44,27 @@ public:
     typedef std::vector<uint64_t> ContainerType;
     typedef ContainerType::size_type IndexType;
 
     typedef std::vector<uint64_t> ContainerType;
     typedef ContainerType::size_type IndexType;
 

-    DIR_TRAFF() {}
-    DIR_TRAFF(const DIR_TRAFF & ts) : traff(ts.traff) {}
-    DIR_TRAFF & operator=(const DIR_TRAFF & ts) { traff = ts.traff; return *this; }
+    DIR_TRAFF() : traff(DIR_NUM) {}

     const uint64_t & operator[](IndexType idx) const { return traff[idx]; }
     uint64_t & operator[](IndexType idx) { return traff[idx]; }
     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(); }
 
     IndexType size() const { return traff.size(); }
 

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

 private:
     ContainerType traff;
 };
 
 //-----------------------------------------------------------------------------
 inline
 private:
     ContainerType traff;
 };
 
 //-----------------------------------------------------------------------------
 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;
 {
 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;
     {
     if (first)
         first = false;


@@ -83,18 +78,35 @@ 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;
 
     typedef RESETABLE<uint64_t> ValueType;
     typedef std::vector<ValueType> ContainerType;
     typedef ContainerType::size_type IndexType;
 

-    DIR_TRAFF_RES(const DIR_TRAFF & ts)
+    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];
     }
         : 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;
+    for (IndexType i = 0; i < traff.size(); ++i)
+        if (!traff[i].empty())
+            res[i] = traff[i].data();
+    return res;
+    }

 
 private:
     ContainerType traff;
 
 private:
     ContainerType traff;