提交 b20a21e2 编写于 作者: L liuwei1031

fix comments of PR 15529, test=develop

上级 56a5039e
...@@ -356,7 +356,7 @@ void MemInfo::Minus(const size_t &size) { ...@@ -356,7 +356,7 @@ void MemInfo::Minus(const size_t &size) {
usage_ -= size; usage_ -= size;
} }
uint64_t MemInfo::GetPeakUsage() { return peak_usage_; } uint64_t MemInfo::GetPeakUsage() const { return peak_usage_; }
LegacyMemMonitor::~LegacyMemMonitor() { LegacyMemMonitor::~LegacyMemMonitor() {
for (auto &item : gpu_mem_info_) delete item.second; for (auto &item : gpu_mem_info_) delete item.second;
...@@ -380,10 +380,10 @@ void LegacyMemMonitor::Minus(const int &device, const size_t &size) { ...@@ -380,10 +380,10 @@ void LegacyMemMonitor::Minus(const int &device, const size_t &size) {
gpu_mem_info_[device]->Minus(size); gpu_mem_info_[device]->Minus(size);
} }
uint64_t LegacyMemMonitor::GetMemUsage(const int &device) { uint64_t LegacyMemMonitor::GetMemUsage(const int &device) const {
return gpu_mem_info_.find(device) == gpu_mem_info_.end() return gpu_mem_info_.find(device) == gpu_mem_info_.end()
? 0 ? 0
: gpu_mem_info_[device]->GetPeakUsage(); : gpu_mem_info_.find(device)->second->GetPeakUsage();
} }
void LegacyMemMonitor::PrintMemUsage() { void LegacyMemMonitor::PrintMemUsage() {
......
...@@ -27,20 +27,20 @@ namespace allocation { ...@@ -27,20 +27,20 @@ namespace allocation {
class MemInfo { class MemInfo {
public: public:
MemInfo() : usage_(0), peak_usage_(0) {} MemInfo() : usage_(0), peak_usage_(0) {}
MemInfo(const MemInfo &) = delete;
MemInfo &operator=(const MemInfo &) = delete;
// return a flag to indicate current operation will create a peak point or not // return a flag to indicate current operation will create a peak point or not
bool Add(const size_t &); bool Add(const size_t &);
void Minus(const size_t &); void Minus(const size_t &);
uint64_t GetPeakUsage(); uint64_t GetPeakUsage() const;
private: private:
/* current memory usage*/ /* current memory usage*/
uint64_t usage_; uint64_t usage_;
uint64_t peak_usage_; uint64_t peak_usage_;
std::mutex mutex_; std::mutex mutex_;
DISABLE_COPY_AND_ASSIGN(MemInfo);
}; };
class LegacyMemMonitor { class LegacyMemMonitor {
...@@ -56,11 +56,11 @@ class LegacyMemMonitor { ...@@ -56,11 +56,11 @@ class LegacyMemMonitor {
void Add(const int &, const size_t &); void Add(const int &, const size_t &);
void Minus(const int &, const size_t &); void Minus(const int &, const size_t &);
uint64_t GetMemUsage(const int &); uint64_t GetMemUsage(const int &) const;
void PrintMemUsage(); void PrintMemUsage();
protected: private:
MemUsage gpu_mem_info_; MemUsage gpu_mem_info_;
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册