birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/CrySystem/SystemWin32.cpp
+10 -11
View File
@@ -441,7 +441,7 @@ int CSystem::GetApplicationInstance()
{
suffix.Format("(%d)", instance);
HANDLE instanceMutex = CreateMutex(NULL, TRUE, "LumberyardApplication" + suffix);
CreateMutex(NULL, TRUE, "LumberyardApplication" + suffix);
// search for duplicates
if (GetLastError() != ERROR_ALREADY_EXISTS)
{
@@ -466,7 +466,7 @@ int CSystem::GetApplicationLogInstance([[maybe_unused]] const char* logFilePath)
{
suffix.Format("(%d)", instance);
HANDLE instanceMutex = CreateMutex(NULL, TRUE, logFilePath + suffix);
CreateMutex(NULL, TRUE, logFilePath + suffix);
if (GetLastError() != ERROR_ALREADY_EXISTS)
{
break;
@@ -589,12 +589,13 @@ void CSystem::DebugStats([[maybe_unused]] bool checkpoint, [[maybe_unused]] bool
CloseHandle (hSnapshot);
}
//////////////////////////////////////////////////////////////////////////
ILog* log = GetILog();
int totalal = 0, totalbl = 0, nolib = 0;
int nolib = 0;
#ifdef _DEBUG
ILog* log = GetILog();
int totalal = 0;
int totalbl = 0;
int extrastats[10];
#endif
@@ -704,7 +705,9 @@ void CSystem::DebugStats([[maybe_unused]] bool checkpoint, [[maybe_unused]] bool
phe.lpData = NULL;
int nCommitted = 0, nUncommitted = 0, nOverhead = 0;
int nCommittedPieces = 0, nUncommittedPieces = 0;
#if !defined(NDEBUG)
int nPrevRegionIndex = -1;
#endif
while (HeapWalk(hHeap, &phe))
{
if (phe.wFlags & PROCESS_HEAP_REGION)
@@ -743,9 +746,7 @@ void CSystem::DebugStats([[maybe_unused]] bool checkpoint, [[maybe_unused]] bool
nOverhead += phe.cbOverhead;
}
;
int nCommittedMin = min(nCommitted, nCommittedPieces);
int nCommittedMax = max(nCommitted, nCommittedPieces);
CryLogAlways("* heap %8x: %6d (or ~%6d) K in use, %6d..%6d K uncommitted, %6d K overhead (%s)\n",
handles[i], nCommittedPieces / 1024, nCommitted / 1024, nUncommittedPieces / 1024, nUncommitted / 1024, nOverhead / 1024, hinfo);
@@ -877,7 +878,6 @@ void CSystem::GetExeSizes (ICrySizer* pSizer, MemStatsPurposeEnum nPurpose)
{
// the sizes of each module group
StringToSizeMap mapGroupSize;
DWORD dwTotalModuleSize = 0;
do
{
dwProcessID = me.th32ProcessID;
@@ -1251,7 +1251,6 @@ void CSystem::LogSystemInfo()
char szProfileBuffer[128];
char szLanguageBuffer[64];
//char szCPUModel[64];
char* pChar = 0;
MEMORYSTATUSEX MemoryStatus;
MemoryStatus.dwLength = sizeof(MemoryStatus);