x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG: Clarify some comments in threading

This commit is contained in:
Nukem 2015-07-14 20:35:01 -04:00
parent ddc09f5c0b
commit 2727db7408
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x64_dbg_dbg/threading.cpp
View File

@ -55,9 +55,10 @@ SectionLockerGlobal::SRWLOCKFUNCTION SectionLockerGlobal::m_ReleaseSRWLockExclus
void SectionLockerGlobal::Initialize()
{
// This is supposed to only be called once, but
// create a flag anyway
if(m_Initialized)
return;
m_Initialized = true;
// Attempt to read the SRWLock API
HMODULE hKernel32 = GetModuleHandleW(L"kernel32.dll");
@ -89,6 +90,8 @@ void SectionLockerGlobal::Initialize()
for(int i = 0; i < ARRAYSIZE(m_crLocks); i++)
InitializeCriticalSection(&m_crLocks[i]);
}
m_Initialized = true;
}
void SectionLockerGlobal::Deinitialize()
@ -116,7 +119,7 @@ void SectionLockerGlobal::Deinitialize()
EnterCriticalSection(&m_crLocks[i]);
LeaveCriticalSection(&m_crLocks[i]);
// Delete critial section
// Delete critical section
DeleteCriticalSection(&m_crLocks[i]);
memset(&m_crLocks[i], 0, sizeof(CRITICAL_SECTION));
}

22
x64_dbg_dbg/threading.h
View File

@ -21,8 +21,8 @@ void waitdeinitialize();
//
// THREAD SYNCHRONIZATION
//
// Better, but requires VISTA+
// https://msdn.microsoft.com/en-us/library/windows/desktop/aa904937%28v=vs.85%29.aspx
// Win Vista and newer: (Faster) SRW locks used
// Win 2003 and older: (Slower) Critical sections used
//
#define EXCLUSIVE_ACQUIRE(Index) SectionLocker<SectionLock::##Index, false> __ThreadLock;
#define EXCLUSIVE_REACQUIRE() __ThreadLock.Lock();
@ -47,17 +47,21 @@ enum SectionLock
LockThreads,
LockDprintf,
LockSym,
// This is defined because of a bug in the Windows 8.1 kernel;
// Calling VirtualQuery/VirtualProtect/ReadProcessMemory can and will cause
// a deadlock.
// https://bitbucket.org/mrexodia/x64_dbg/issue/247/x64-dbg-bug-string-references-function
LockWin8Workaround,
LockPluginList,
LockPluginCallbackList,
LockPluginCommandList,
LockPluginMenuList,
// This is defined because of a bug in the Windows 8.1 kernel;
// Calling VirtualQuery/VirtualProtect/ReadProcessMemory can and will cause
// a deadlock.
//
// There's also no real way to fix this with a lock. Any external program
// calling memory functions creates a deadlock too. (See: ETW Tracing)
//
// https://github.com/x64dbg/x64dbg/issues/247
LockWin8Workaround,
LockLast,
};
@ -125,7 +129,7 @@ public:
Unlock();
#ifdef _DEBUG
// TODO: Assert that the lock count is zero on destructor
// Assert that the lock count is zero on destructor
if(m_LockCount > 0)
__debugbreak();
#endif