CCriticalSection using wxWidgets instead of Windows OS calls

git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@19 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
s_nakamoto
2009-10-29 05:55:56 +00:00
parent dd519206a6
commit dc73b326f9
3 changed files with 35 additions and 22 deletions

View File

@@ -13,14 +13,14 @@ bool fPrintToConsole = false;
// Init openssl library multithreading support
static HANDLE* lock_cs;
static wxMutex** ppmutexOpenSSL;
void win32_locking_callback(int mode, int type, const char* file, int line)
void win32_locking_callback(int mode, int i, const char* file, int line)
{
if (mode & CRYPTO_LOCK)
WaitForSingleObject(lock_cs[type], INFINITE);
ppmutexOpenSSL[i]->Lock();
else
ReleaseMutex(lock_cs[type]);
ppmutexOpenSSL[i]->Unlock();
}
// Init
@@ -30,9 +30,9 @@ public:
CInit()
{
// Init openssl library multithreading support
lock_cs = (HANDLE*)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(HANDLE));
ppmutexOpenSSL = (wxMutex**)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(wxMutex*));
for (int i = 0; i < CRYPTO_num_locks(); i++)
lock_cs[i] = CreateMutex(NULL,FALSE,NULL);
ppmutexOpenSSL[i] = new wxMutex();
CRYPTO_set_locking_callback(win32_locking_callback);
// Seed random number generator with screen scrape and other hardware sources
@@ -46,8 +46,8 @@ public:
// Shutdown openssl library multithreading support
CRYPTO_set_locking_callback(NULL);
for (int i =0 ; i < CRYPTO_num_locks(); i++)
CloseHandle(lock_cs[i]);
OPENSSL_free(lock_cs);
delete ppmutexOpenSSL[i];
OPENSSL_free(ppmutexOpenSSL);
}
}
instance_of_cinit;
@@ -55,6 +55,10 @@ instance_of_cinit;
void RandAddSeed()
{
// Seed with CPU performance counter