From 6f89c7ba8530c37f1f5a6048406cb18c40e5a458 Mon Sep 17 00:00:00 2001 From: Ladislav Zezula Date: Mon, 16 Jan 2023 06:46:34 +0100 Subject: Fixed bug, refactor TLogHelper.cpp --- test/TLogHelper.cpp | 722 ++++++++++++++++++++++++++++------------------------ 1 file changed, 384 insertions(+), 338 deletions(-) (limited to 'test/TLogHelper.cpp') diff --git a/test/TLogHelper.cpp b/test/TLogHelper.cpp index 3a82368..cdfa692 100644 --- a/test/TLogHelper.cpp +++ b/test/TLogHelper.cpp @@ -6,457 +6,503 @@ /*---------------------------------------------------------------------------*/ /* Date Ver Who Comment */ /* -------- ---- --- ------- */ -/* 26.11.13 1.00 Lad The first version of TLogHelper.cpp */ +/* 26.11.13 1.00 Lad Created */ /*****************************************************************************/ //----------------------------------------------------------------------------- -// Definition of the TLogHelper class - -class TLogHelper -{ - public: - - TLogHelper(const char * szNewMainTitle = NULL, const TCHAR * szNewSubTitle1 = NULL, const TCHAR * szNewSubTitle2 = NULL); - ~TLogHelper(); - -#if defined(UNICODE) || defined(UNICODE) - // TCHAR-based functions. They are only needed on UNICODE builds. - // On ANSI builds is TCHAR = char, so we don't need them at all - int PrintWithClreol(const TCHAR * szFormat, va_list argList, bool bPrintPrefix, bool bPrintLastError, bool bPrintEndOfLine); - void PrintProgress(const TCHAR * szFormat, ...); - void PrintMessage(const TCHAR * szFormat, ...); - int PrintErrorVa(const TCHAR * szFormat, ...); - int PrintError(const TCHAR * szFormat, const TCHAR * szFileName = NULL); -#endif // defined(UNICODE) || defined(UNICODE) - - // ANSI functions - DWORD PrintWithClreol(const char * szFormat, va_list argList, bool bPrintPrefix, bool bPrintLastError, bool bPrintEndOfLine); - void PrintProgress(const char * szFormat, ...); - void PrintMessage(const char * szFormat, ...); - DWORD PrintErrorVa(const char * szFormat, ...); - DWORD PrintError(const char * szFormat, const char * szFileName = NULL); - - // Print final verdict - DWORD PrintVerdict(DWORD dwErrCode = ERROR_SUCCESS); - - const char * UserString; - unsigned int UserCount; - unsigned int UserTotal; - bool bDontPrintResult; - - protected: +// String replacements for format strings -#if defined(UNICODE) || defined(UNICODE) - TCHAR * CopyFormatCharacter(TCHAR * szBuffer, const TCHAR *& szFormat); +#if defined(STORMLIB_WINDOWS) || defined(CASCLIB_PLATFORM_WINDOWS) +#define TEST_PLATFORM_WINDOWS #endif - char * CopyFormatCharacter(char * szBuffer, const char *& szFormat); - int GetConsoleWidth(); - - const char * szMainTitle; // Title of the text (usually name) - const TCHAR * szSubTitle1; // Title of the text (can be name of the tested file) - const TCHAR * szSubTitle2; // Title of the text (can be name of the tested file) - size_t nTextLength; // Length of the previous progress message - bool bMessagePrinted; -}; - -//----------------------------------------------------------------------------- -// String replacements for format strings #ifdef _MSC_VER -#define I64u_t _T("%I64u") -#define I64u_a "%I64u" -#define I64X_t _T("%I64X") -#define I64X_a "%I64X" +#define fmt_I64u_t _T("%I64u") +#define fmt_I64u_a "%I64u" +#define fmt_I64X_t _T("%I64X") +#define fmt_I64X_a "%I64X" #else -#define I64u_t _T("%llu") -#define I64u_a "%llu" -#define I64X_t _T("%llX") -#define I64X_a "%llX" +#define fmt_I64u_t _T("%llu") +#define fmt_I64u_a "%llu" +#define fmt_I64X_t _T("%llX") +#define fmt_I64X_a "%llX" #endif -//----------------------------------------------------------------------------- -// Constructor and destructor +#ifdef __STORMLIB_SELF__ +#define TEST_MIN STORMLIB_MIN +#else +#define TEST_MIN CASCLIB_MIN +#endif +//----------------------------------------------------------------------------- +// Local functions -TLogHelper::TLogHelper(const char * szNewMainTitle, const TCHAR * szNewSubTitle1, const TCHAR * szNewSubTitle2) +inline DWORD TestInterlockedIncrement(DWORD * PtrValue) { - TCHAR szMainTitleT[0x80]; - - UserString = ""; - UserCount = 1; - UserTotal = 1; +#ifdef TEST_PLATFORM_WINDOWS + return (DWORD)InterlockedIncrement((LONG *)(PtrValue)); +#elif defined(__GNUC__) + return __sync_add_and_fetch(PtrValue, 1); +#else +#define INTERLOCKED_NOT_SUPPORTED + return ++(*PtrValue); +#endif +} - // Fill the test line structure - szMainTitle = szNewMainTitle; - szSubTitle1 = szNewSubTitle1; - szSubTitle2 = szNewSubTitle2; - nTextLength = 0; - bMessagePrinted = false; - bDontPrintResult = false; +inline DWORD Test_GetLastError() +{ +#if defined(CASCLIB_PLATFORM_WINDOWS) + return GetCascError(); +#else + return GetLastError(); +#endif +} - // Copy the UNICODE main title - StringCopy(szMainTitleT, _countof(szMainTitleT), szMainTitle); +void TestStrCopy(char * szTarget, size_t cchTarget, const char * szSource, size_t cchSource = -1) +{ + size_t cchToCopy; - // Print the initial information - if(szMainTitle != NULL) + if(cchTarget > 0) { - if(szSubTitle1 != NULL && szSubTitle2 != NULL) - _tprintf(_T("Running %s (%s+%s) ..."), szMainTitleT, szSubTitle1, szSubTitle2); - else if(szSubTitle1 != NULL) - _tprintf(_T("Running %s (%s) ..."), szMainTitleT, szSubTitle1); - else - _tprintf(_T("Running %s ..."), szMainTitleT); + // Make sure we know the length + if(cchSource == -1) + cchSource = strlen(szSource); + cchToCopy = TEST_MIN((cchTarget - 1), cchSource); + + // Copy the string + memcpy(szTarget, szSource, cchToCopy); + szTarget[cchToCopy] = 0; } } -TLogHelper::~TLogHelper() +void TestStrCopy(char * szTarget, size_t cchTarget, const wchar_t * szSource, size_t cchSource = -1) { - // Print a verdict, if no verdict was printed yet - if(bMessagePrinted == false) - { - PrintVerdict(ERROR_SUCCESS); - } + size_t cchToCopy; -#if defined(_MSC_VER) && defined(_DEBUG) - if(_CrtDumpMemoryLeaks()) + if(cchTarget > 0) { - PrintMessage(_T("Memory leak(s) detected.\n")); + // Make sure we know the length + if(cchSource == -1) + cchSource = wcslen(szSource); + cchToCopy = TEST_MIN((cchTarget - 1), cchSource); + + wcstombs(szTarget, szSource, cchToCopy); + szTarget[cchToCopy] = 0; } -#endif // _MSC_VER } -//----------------------------------------------------------------------------- -// TCHAR-based functions. They are only needed on UNICODE builds. -// On ANSI builds is TCHAR = char, so we don't need them at all - -#if defined(UNICODE) || defined(UNICODE) -int TLogHelper::PrintWithClreol(const TCHAR * szFormat, va_list argList, bool bPrintPrefix, bool bPrintLastError, bool bPrintEndOfLine) +wchar_t * CopyFormatCharacter(wchar_t * szBuffer, const wchar_t *& szFormat) { - TCHAR szFormatBuff[0x200]; - TCHAR szMessage[0x200]; - TCHAR * szBuffer = szFormatBuff; - int nRemainingWidth; - int nConsoleWidth = GetConsoleWidth(); - int nLength = 0; - int nError = GetLastError(); - - // Always start the buffer with '\r' - *szBuffer++ = '\r'; - - // Print the prefix, if needed - if(szMainTitle != NULL && bPrintPrefix) - { - while(szMainTitle[nLength] != 0) - *szBuffer++ = szMainTitle[nLength++]; - - *szBuffer++ = ':'; - *szBuffer++ = ' '; - } + static const wchar_t * szStringFormat = _T("%s"); + static const wchar_t * szUint64Format = fmt_I64u_t; - // Copy the message format itself. Replace %s with "%s", unless it's (%s) - if(szFormat != NULL) + // String format + if(szFormat[0] == '%') { - while(szFormat[0] != 0) + if(szFormat[1] == 's') { - szBuffer = CopyFormatCharacter(szBuffer, szFormat); + _tcscpy(szBuffer, szStringFormat); + szFormat += 2; + return szBuffer + _tcslen(szStringFormat); } - } - // Append the last error - if(bPrintLastError) - { - nLength = _stprintf(szBuffer, _T(" (error code: %u)"), nError); - szBuffer += nLength; + // Replace %I64u with the proper platform-dependent suffix + if(szFormat[1] == 'I' && szFormat[2] == '6' && szFormat[3] == '4' && szFormat[4] == 'u') + { + _tcscpy(szBuffer, szUint64Format); + szFormat += 5; + return szBuffer + _tcslen(szUint64Format); + } } - // Create the result string - szBuffer[0] = 0; - nLength = _vstprintf(szMessage, szFormatBuff, argList); - szBuffer = szMessage + nLength; + // Copy the character as-is + *szBuffer++ = *szFormat++; + return szBuffer; +} - // Shall we pad the string? - if(nLength < nConsoleWidth) +char * CopyFormatCharacter(char * szBuffer, const char *& szFormat) +{ + static const char * szStringFormat = "\"%s\""; + static const char * szUint64Format = fmt_I64u_a; + + // String format + if(szFormat[0] == '%') { - // Calculate the remaining width - nRemainingWidth = nConsoleWidth - nLength - 1; + if(szFormat[1] == 's') + { + TestStrCopy(szBuffer, 32, szStringFormat); + szFormat += 2; + return szBuffer + strlen(szStringFormat); + } - // Pad the string with spaces to fill it up to the end of the line - for(int i = 0; i < nRemainingWidth; i++) - *szBuffer++ = 0x20; + // Replace %I64u with the proper platform-dependent suffix + if(szFormat[1] == 'I' && szFormat[2] == '6' && szFormat[3] == '4' && szFormat[4] == 'u') + { + TestStrCopy(szBuffer, 32, szUint64Format); + szFormat += 5; + return szBuffer + strlen(szUint64Format); + } } - // Put the newline, if requested - *szBuffer++ = bPrintEndOfLine ? '\n' : 0; - *szBuffer = 0; - - // Remember if we printed a message - if(bPrintEndOfLine) - bMessagePrinted = true; + // Copy the character as-is + *szBuffer++ = *szFormat++; + return szBuffer; +} - // Spit out the text in one single printf - _tprintf(_T("%s"), szMessage); - return nError; +size_t TestStrPrintfV(char * buffer, size_t nCount, const char * format, va_list argList) +{ + return vsnprintf(buffer, nCount, format, argList); } -void TLogHelper::PrintProgress(const TCHAR * szFormat, ...) +size_t TestStrPrintf(char * buffer, size_t nCount, const char * format, ...) { va_list argList; + size_t length; - va_start(argList, szFormat); - PrintWithClreol(szFormat, argList, true, false, false); + // Start the argument list + va_start(argList, format); + length = TestStrPrintfV(buffer, nCount, format, argList); va_end(argList); + + return length; } -void TLogHelper::PrintMessage(const TCHAR * szFormat, ...) +size_t TestStrPrintfV(wchar_t * buffer, size_t nCount, const wchar_t * format, va_list argList) { - va_list argList; - - va_start(argList, szFormat); - PrintWithClreol(szFormat, argList, true, false, true); - va_end(argList); +#ifdef TEST_PLATFORM_WINDOWS + return _vsnwprintf(buffer, nCount, format, argList); +#else + return vswprintf(buffer, nCount, format, argList); +#endif } -int TLogHelper::PrintErrorVa(const TCHAR * szFormat, ...) +size_t TestStrPrintf(wchar_t * buffer, size_t nCount, const wchar_t * format, ...) { va_list argList; - int nResult; + size_t length; - va_start(argList, szFormat); - nResult = PrintWithClreol(szFormat, argList, true, true, true); + // Start the argument list + va_start(argList, format); + length = TestStrPrintfV(buffer, nCount, format, argList); va_end(argList); - return nResult; + return length; } -int TLogHelper::PrintError(const TCHAR * szFormat, const TCHAR * szFileName) -{ - return PrintErrorVa(szFormat, szFileName); -} -#endif // defined(UNICODE) || defined(UNICODE) - //----------------------------------------------------------------------------- -// ANSI functions +// Definition of the TLogHelper class -DWORD TLogHelper::PrintWithClreol(const char * szFormat, va_list argList, bool bPrintPrefix, bool bPrintLastError, bool bPrintEndOfLine) +class TLogHelper { - char szFormatBuff[0x200]; - char szMessage[0x200]; - char * szBuffer = szFormatBuff; - int nRemainingWidth; - int nConsoleWidth = GetConsoleWidth(); - int nLength = 0; - DWORD dwErrCode = GetLastError(); - - // Always start the buffer with '\r' - *szBuffer++ = '\r'; - - // Print the prefix, if needed - if(szMainTitle != NULL && bPrintPrefix) - { - while(szMainTitle[nLength] != 0) - *szBuffer++ = (char)szMainTitle[nLength++]; + public: - *szBuffer++ = ':'; - *szBuffer++ = ' '; - } + // + // Constructor and destructor + // - // Copy the message format itself. Replace %s with "%s", unless it's (%s) - if(szFormat != NULL) + TLogHelper(const char * szNewMainTitle = NULL, const TCHAR * szNewSubTitle1 = NULL, const TCHAR * szNewSubTitle2 = NULL) { - while(szFormat[0] != 0) + TCHAR szMainTitleT[0x80]; + + // Fill the variables + memset(this, 0, sizeof(TLogHelper)); + + UserString = ""; + UserCount = 1; + UserTotal = 1; + + // Fill the test line structure + szMainTitle = szNewMainTitle; + szSubTitle1 = szNewSubTitle1; + szSubTitle2 = szNewSubTitle2; + + // Copy the UNICODE main title + StringCopy(szMainTitleT, _countof(szMainTitleT), szMainTitle); + + // Print the initial information + if(szNewMainTitle != NULL) { - szBuffer = CopyFormatCharacter(szBuffer, szFormat); + if(szSubTitle1 != NULL && szSubTitle2 != NULL) + nPrevPrinted = _tprintf(_T("Running %s (%s+%s) ..."), szMainTitleT, szSubTitle1, szSubTitle2); + else if(szSubTitle1 != NULL) + nPrevPrinted = _tprintf(_T("Running %s (%s) ..."), szMainTitleT, szSubTitle1); + else + nPrevPrinted = _tprintf(_T("Running %s ..."), szMainTitleT); } } - // Append the last error - if(bPrintLastError) + TLogHelper::~TLogHelper() { - nLength = sprintf(szBuffer, " (error code: %u)", dwErrCode); - szBuffer += nLength; + // Print a verdict, if no verdict was printed yet + if(bMessagePrinted == false) + { + PrintVerdict(ERROR_SUCCESS); + } + + + printf("\n"); } - // Create the result string - szBuffer[0] = 0; - nLength = vsprintf(szMessage, szFormatBuff, argList); + // + // Measurement of elapsed time + // - // Shall we pad the string? - szBuffer = szMessage + nLength; - if(nLength < nConsoleWidth) + bool TimeElapsed(DWORD Milliseconds) { - // Calculate the remaining width - nRemainingWidth = nConsoleWidth - nLength - 1; + bool bTimeElapsed = false; + +#ifdef TEST_PLATFORM_WINDOWS + if(GetTickCount() > (TickCount + Milliseconds)) + { + TickCount = GetTickCount(); + if(TestInterlockedIncrement(&TimeTrigger) == 1) + { + bTimeElapsed = true; + } + } - // Pad the string with spaces to fill it up to the end of the line - for(int i = 0; i < nRemainingWidth; i++) - *szBuffer++ = 0x20; +#endif + return bTimeElapsed; } - // Put the newline, if requested - *szBuffer++ = bPrintEndOfLine ? '\n' : '\r'; - *szBuffer = 0; + // + // Printing functions + // - // Remember if we printed a message - if(bPrintEndOfLine) - bMessagePrinted = true; + template + DWORD PrintWithClreol(const XCHAR * szFormat, va_list argList, bool bPrintPrefix, bool bPrintLastError, bool bPrintEndOfLine) + { + char * szBufferPtr; + char * szBufferEnd; + size_t nNewPrinted; + size_t nLength = 0; + DWORD dwErrCode = Test_GetLastError(); + XCHAR szMessage[0x200]; + char szBuffer[0x200]; + + // Always start the buffer with '\r' + szBufferEnd = szBuffer + _countof(szBuffer); + szBufferPtr = szBuffer; + *szBufferPtr++ = '\r'; + + // Print the prefix, if needed + if(szMainTitle != NULL && bPrintPrefix) + { + while(szMainTitle[nLength] != 0) + *szBufferPtr++ = szMainTitle[nLength++]; - // Spit out the text in one single printf - printf("%s", szMessage); - return dwErrCode; -} + *szBufferPtr++ = ':'; + *szBufferPtr++ = ' '; + } -void TLogHelper::PrintProgress(const char * szFormat, ...) -{ - va_list argList; + // Construct the message + nLength = TestStrPrintfV(szMessage, _countof(szMessage), szFormat, argList); + TestStrCopy(szBufferPtr, (szBufferEnd - szBufferPtr), szMessage); + szBufferPtr += nLength; - va_start(argList, szFormat); - PrintWithClreol(szFormat, argList, true, false, false); - va_end(argList); -} + // Append the last error + if(bPrintLastError) + { + nLength = TestStrPrintf(szBufferPtr, (szBufferEnd - szBufferPtr), " (error code: %u)", dwErrCode); + szBufferPtr += nLength; + } -void TLogHelper::PrintMessage(const char * szFormat, ...) -{ - va_list argList; + // Remember how much did we print + nNewPrinted = (szBufferPtr - szBuffer); - va_start(argList, szFormat); - PrintWithClreol(szFormat, argList, true, false, true); - va_end(argList); -} + // Shall we pad the string? + if((nLength = (szBufferPtr - szBuffer - 1)) < nPrevPrinted) + { + size_t nPadding = nPrevPrinted - nLength; -DWORD TLogHelper::PrintErrorVa(const char * szFormat, ...) -{ - va_list argList; - DWORD dwErrCode; + if((size_t)(nLength + nPadding) > (size_t)(szBufferEnd - szBufferPtr)) + nPadding = (szBufferEnd - szBufferPtr); - va_start(argList, szFormat); - dwErrCode = PrintWithClreol(szFormat, argList, true, true, true); - va_end(argList); + memset(szBufferPtr, ' ', nPadding); + szBufferPtr += nPadding; + } - return dwErrCode; -} + // Shall we add new line? + if((bPrintEndOfLine != false) && (szBufferPtr < szBufferEnd)) + *szBufferPtr++ = '\n'; + *szBufferPtr = 0; -DWORD TLogHelper::PrintError(const char * szFormat, const char * szFileName) -{ - return PrintErrorVa(szFormat, szFileName); -} + // Remember if we printed a message + if(bPrintEndOfLine != false) + { + bMessagePrinted = true; + nPrevPrinted = 0; + } + else + { + nPrevPrinted = nNewPrinted; + } -//----------------------------------------------------------------------------- -// Print final verdict + // Finally print the message + printf("%s", szBuffer); + nMessageCounter++; + return dwErrCode; + } -DWORD TLogHelper::PrintVerdict(DWORD dwErrCode) -{ - LPCTSTR szSaveSubTitle1 = szSubTitle1; - LPCTSTR szSaveSubTitle2 = szSubTitle2; - TCHAR szSaveMainTitle[0x80]; - - // Set both to NULL so they won't be printed - StringCopy(szSaveMainTitle, _countof(szSaveMainTitle), szMainTitle); - szSubTitle1 = NULL; - szSubTitle2 = NULL; - szMainTitle = NULL; - - // Print the final information - if(szSaveMainTitle[0] != 0) + template + void PrintProgress(const XCHAR * szFormat, ...) { - if(bDontPrintResult == false) - { - LPCTSTR szVerdict = (dwErrCode == ERROR_SUCCESS) ? _T("succeeded") : _T("failed"); + va_list argList; - if(szSaveSubTitle1 != NULL && szSaveSubTitle2 != NULL) - PrintMessage(_T("%s (%s+%s) %s."), szSaveMainTitle, szSaveSubTitle1, szSaveSubTitle2, szVerdict); - else if(szSaveSubTitle1 != NULL) - PrintMessage(_T("%s (%s) %s."), szSaveMainTitle, szSaveSubTitle1, szVerdict); - else - PrintMessage(_T("%s %s."), szSaveMainTitle, szVerdict); - } - else + // Always reset the time trigger + TimeTrigger = 0; + + // Only print progress when the cooldown is ready + if(ProgressReady()) { - PrintProgress(" "); - printf("\r"); + va_start(argList, szFormat); + PrintWithClreol(szFormat, argList, true, false, false); + va_end(argList); } } - // Return the error code so the caller can pass it fuhrter - return dwErrCode; -} + template + void PrintMessage(const XCHAR * szFormat, ...) + { + va_list argList; -//----------------------------------------------------------------------------- -// Protected functions + va_start(argList, szFormat); + PrintWithClreol(szFormat, argList, true, false, true); + va_end(argList); + } -#ifdef _UNICODE -TCHAR * TLogHelper::CopyFormatCharacter(TCHAR * szBuffer, const TCHAR *& szFormat) -{ -// static LPCTSTR szStringFormat = _T("\"%s\""); - static LPCTSTR szStringFormat = _T("%s"); - static LPCTSTR szUint64Format = I64u_t; + void PrintTotalTime() + { + DWORD TotalTime = SetEndTime(); - // String format - if(szFormat[0] == '%') + if(TotalTime != 0) + PrintMessage("TotalTime: %u.%u second(s)", (TotalTime / 1000), (TotalTime % 1000)); + PrintMessage("Work complete."); + } + + template + int PrintErrorVa(const XCHAR * szFormat, ...) { - if(szFormat[1] == 's') - { - _tcscpy(szBuffer, szStringFormat); - szFormat += 2; - return szBuffer + _tcslen(szStringFormat); - } + va_list argList; + int nResult; - // Replace %I64u with the proper platform-dependent suffix - if(szFormat[1] == 'I' && szFormat[2] == '6' && szFormat[3] == '4' && szFormat[4] == 'u') + va_start(argList, szFormat); + nResult = PrintWithClreol(szFormat, argList, true, true, true); + va_end(argList); + + return nResult; + } + + template + int PrintError(const XCHAR * szFormat, const XCHAR * szFileName = NULL) + { + return PrintErrorVa(szFormat, szFileName); + } + + // Print final verdict + DWORD PrintVerdict(DWORD dwErrCode = ERROR_SUCCESS) + { + LPCTSTR szSaveSubTitle1 = szSubTitle1; + LPCTSTR szSaveSubTitle2 = szSubTitle2; + TCHAR szSaveMainTitle[0x80]; + + // Set both to NULL so they won't be printed + StringCopy(szSaveMainTitle, _countof(szSaveMainTitle), szMainTitle); + szSubTitle1 = NULL; + szSubTitle2 = NULL; + szMainTitle = NULL; + + // Print the final information + if(szSaveMainTitle[0] != 0) { - _tcscpy(szBuffer, szUint64Format); - szFormat += 5; - return szBuffer + _tcslen(szUint64Format); + if(DontPrintResult == false) + { + LPCTSTR szVerdict = (dwErrCode == ERROR_SUCCESS) ? _T("succeeded") : _T("failed"); + + if(szSaveSubTitle1 != NULL && szSaveSubTitle2 != NULL) + PrintMessage(_T("%s (%s+%s) %s."), szSaveMainTitle, szSaveSubTitle1, szSaveSubTitle2, szVerdict); + else if(szSaveSubTitle1 != NULL) + PrintMessage(_T("%s (%s) %s."), szSaveMainTitle, szSaveSubTitle1, szVerdict); + else + PrintMessage(_T("%s %s."), szSaveMainTitle, szVerdict); + } + else + { + PrintProgress(" "); + printf("\r"); + } } + + // Return the error code so the caller can pass it fuhrter + return dwErrCode; } - // Copy the character as-is - *szBuffer++ = *szFormat++; - return szBuffer; -} -#endif + // + // Time functions + // -char * TLogHelper::CopyFormatCharacter(char * szBuffer, const char *& szFormat) -{ - static const char * szStringFormat = "\"%s\""; - static const char * szUint64Format = I64u_a; + ULONGLONG GetCurrentThreadTime() + { +#ifdef _WIN32 + ULONGLONG TempTime = 0; - // String format - if(szFormat[0] == '%') + GetSystemTimeAsFileTime((LPFILETIME)(&TempTime)); + return ((TempTime) / 10 / 1000); + + //ULONGLONG KernelTime = 0; + //ULONGLONG UserTime = 0; + //ULONGLONG TempTime = 0; + + //GetThreadTimes(GetCurrentThread(), (LPFILETIME)&TempTime, (LPFILETIME)&TempTime, (LPFILETIME)&KernelTime, (LPFILETIME)&UserTime); + //return ((KernelTime + UserTime) / 10 / 1000); +#else + return time(NULL) * 1000; +#endif + } + + bool ProgressReady() { - if(szFormat[1] == 's') - { - strcpy(szBuffer, szStringFormat); - szFormat += 2; - return szBuffer + strlen(szStringFormat); - } + time_t dwTickCount = time(NULL); + bool bResult = false; - // Replace %I64u with the proper platform-dependent suffix - if(szFormat[1] == 'I' && szFormat[2] == '6' && szFormat[3] == '4' && szFormat[4] == 'u') + if(dwTickCount > dwPrevTickCount) { - strcpy(szBuffer, szUint64Format); - szFormat += 5; - return szBuffer + strlen(szUint64Format); + dwPrevTickCount = dwTickCount; + bResult = true; } + + return bResult; } - // Copy the character as-is - *szBuffer++ = *szFormat++; - return szBuffer; -} + ULONGLONG SetStartTime() + { + StartTime = GetCurrentThreadTime(); + return StartTime; + } -int TLogHelper::GetConsoleWidth() -{ -#ifdef STORMLIB_WINDOWS + DWORD SetEndTime() + { + EndTime = GetCurrentThreadTime(); + return (DWORD)(EndTime - StartTime); + } - CONSOLE_SCREEN_BUFFER_INFO ScreenInfo; - GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &ScreenInfo); - return (int)(ScreenInfo.srWindow.Right - ScreenInfo.srWindow.Left); + ULONGLONG StartTime; // Start time of an operation, in milliseconds + ULONGLONG EndTime; // End time of an operation, in milliseconds + const char * UserString; + unsigned int UserCount; + unsigned int UserTotal; + DWORD TickCount; + DWORD TimeTrigger; // For triggering elapsed timers + DWORD DontPrintResult:1; // If true, supress printing result from the destructor -#else - // On non-Windows platforms, we assume that width of the console line - // is 80 characters - return 120; + protected: -#endif -} + const char * szMainTitle; // Title of the text (usually name) + const TCHAR * szSubTitle1; // Title of the text (can be name of the tested file) + const TCHAR * szSubTitle2; // Title of the text (can be name of the tested file) + size_t nMessageCounter; + size_t nPrevPrinted; // Length of the previously printed message + time_t dwPrevTickCount; + bool bMessagePrinted; +}; -- cgit v1.2.3