xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、合并master与2021.1

Browse Source
This commit is contained in:
xiejunjie
2021-12-03 11:25:35 +08:00
parent dc07b8879b
commit 4bd7d1b80b
981 changed files with 384342 additions and 6470 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/LOGGER.CPP
+35 -10
View File
@@ -1,9 +1,10 @@
#include "stdafx.h"
#include "Logger.h"
#include <atltime.h>
void CLogger::SendAtTime(const char* buffer)
#include <sys/timeb.h>
void CLogger::SendAtTime(const TCHAR* buffer)
{
EnterCriticalSection(&m_lockLogger);
if (!m_File)
{
m_File = _wfsopen(m_FileName, _T("at"), _SH_DENYWR);
@@ -12,12 +13,14 @@ void CLogger::SendAtTime(const char* buffer)
{
CTime _cTime=CTime::GetCurrentTime();
CString csTime=_cTime.Format("[%m/%d %H:%M] ");
_ftprintf(m_File,_T("%s\r\n"), csTime);
fprintf(m_File,"%s", buffer);
_ftprintf(m_File,_T("%s"), csTime);
_ftprintf(m_File, _T("%s\r\n"), buffer);
}
LeaveCriticalSection(&m_lockLogger);
}
void CLogger::Send(LPCTSTR format, ...)
{
EnterCriticalSection(&m_lockLogger);
if (!m_File)
{
m_File = _wfsopen(m_FileName, _T("at"), _SH_DENYWR);
@@ -30,9 +33,11 @@ void CLogger::Send(LPCTSTR format, ...)
{
_ftprintf(m_File, m_Str);
}
LeaveCriticalSection(&m_lockLogger);
}
void CLogger::SendAndFlush(LPCTSTR format, ...)
{
EnterCriticalSection(&m_lockLogger);
int length = 0;
va_list list;
@@ -47,12 +52,18 @@ void CLogger::SendAndFlush(LPCTSTR format, ...)
if(m_FileName.GetLength() > 0)
m_File = _wfsopen(m_FileName, _T("at"), _SH_DENYWR);
}
LeaveCriticalSection(&m_lockLogger);
}
void CLogger::SendAndFlushWithTime(LPCTSTR format, ...)
{
EnterCriticalSection(&m_lockLogger);
if (!IsEnabledLog)
{
return;
}
if (!m_File)
{
m_File = _wfsopen(m_FileName, _T("at"), _SH_DENYWR);
m_File = _wfsopen(m_FileName, _T("at"), _SH_DENYNO);
}
if(m_File)
{
@@ -61,15 +72,28 @@ void CLogger::SendAndFlushWithTime(LPCTSTR format, ...)
va_start(list, format);
length = vswprintf_s(m_Str2,5000, format, list);
CTime _cTime=CTime::GetCurrentTime();
CString csTime=_cTime.Format("[%m/%d %H:%M:%S] ");
_ftprintf(m_File, _T("%s"), csTime);
_ftprintf(m_File, m_Str2);
fclose(m_File);
m_File = NULL;
CString csTime=_cTime.Format("[%m/%d %H:%M:%S");
struct _timeb timebuffer;
_ftime64_s(&timebuffer);
if (m_File)
{
_ftprintf(m_File, _T("%s:%03d] "), csTime, timebuffer.millitm);
}
if (m_File)
{
_ftprintf(m_File, m_Str2);
}
if (m_File)
{
fclose(m_File);
m_File = NULL;
}
}
LeaveCriticalSection(&m_lockLogger);
}
void CLogger::SendAndFlushPerMode(LPCTSTR format, ...)
{
EnterCriticalSection(&m_lockLogger);
int length = 0;
va_list list;
@@ -84,4 +108,5 @@ void CLogger::SendAndFlushPerMode(LPCTSTR format, ...)
if(m_FileName.GetLength() > 0)
m_File = _wfsopen(m_FileName, _T("at"), _SH_DENYWR);
}
LeaveCriticalSection(&m_lockLogger);
}