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() << " "<time<<" "<<(*itr)->cpu; + } } }