From d42d5f133034633914309b8dc54cae7046f44663 Mon Sep 17 00:00:00 2001
From: zcy <290198252@qq.com>
Date: Tue, 29 Mar 2022 23:51:51 +0800
Subject: [PATCH] no message

---
 general/src/function/cpu_usage.cpp         | 2 +-
 test/src/test_cpu_usage/test_cpu_usage.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/general/src/function/cpu_usage.cpp b/general/src/function/cpu_usage.cpp
index aac7ae2..96173cf 100644
--- a/general/src/function/cpu_usage.cpp
+++ b/general/src/function/cpu_usage.cpp
@@ -233,7 +233,7 @@ int CProcessMonitor::StartLog(uint64_t milisecond){
 			WORD wSecond = stTime.wSecond;
 			CString m_date;
 			//m_date字符串即为当前时间。如：2010年4月23日 11:12:45
-			m_date.Format("%4d年%2d月%2d日 %2d:%2d:%2d", wYear, wMonth, wDay, wHour, wMinute, wSecond);
+			m_date.Format("%4d-%2d-%2d  %2d:%2d:%2d", wYear, wMonth, wDay, wHour, wMinute, wSecond);
 			USES_CONVERSION;
 			std::string strS(m_date); //CString-->std::string
 			ProcessStatus *p = new ProcessStatus;
diff --git a/test/src/test_cpu_usage/test_cpu_usage.cpp b/test/src/test_cpu_usage/test_cpu_usage.cpp
index 1e5de2a..a63141c 100644
--- a/test/src/test_cpu_usage/test_cpu_usage.cpp
+++ b/test/src/test_cpu_usage/test_cpu_usage.cpp
@@ -13,8 +13,10 @@ int main(int argc,char **argv){
         usage1.GetMemoryUsage(&pmem,&vmem);
         std::cout<<"cpu usage is "<< usage1.GetCpuUsage() << " "<<pmem <<
              "byte "<< vmem  <<"byte seq "<< usage1.m_logs.size() << std::endl;
-        
         Sleep(1000);
+        for(auto itr = usage1.m_logs.begin();itr != usage1.m_logs.end();itr++){
+            std::cout<<(*itr)->time<<" "<<(*itr)->cpu;
+        }
     }
 }