factotum/libressl-portable
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use InterlockedExchangeAdd for add

Browse Source
This commit is contained in:
Brent Cook 2019-01-01 13:50:17 -06:00
parent e508171956
commit 565258a447
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/compat/crypto_lock_win.c
View File

@ -30,8 +30,7 @@ CRYPTO_lock(int mode, int type, const char *file, int line)
if (locks[type] == NULL) { if (locks[type] == NULL) {
LPCRITICAL_SECTION lcs = malloc(sizeof(CRITICAL_SECTION)); LPCRITICAL_SECTION lcs = malloc(sizeof(CRITICAL_SECTION));
InitializeCriticalSection(lcs); InitializeCriticalSection(lcs);
if (InterlockedCompareExchangePointer((void **)&locks[type], (void *)lcs, NULL) != NULL) if (InterlockedCompareExchangePointer((void **)&locks[type], (void *)lcs, NULL) != NULL) {
{
DeleteCriticalSection(lcs); DeleteCriticalSection(lcs);
free(lcs); free(lcs);
} }
@ -47,10 +46,9 @@ int
CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
int line) int line)
{ {
int ret = 0; /*
CRYPTO_lock(CRYPTO_LOCK|CRYPTO_WRITE, type, file, line); * Windows is LLP64. sizeof(LONG) == sizeof(int) on 32-bit and 64-bit.
ret = *pointer + amount; */
*pointer = ret; int ret = InterlockedExchangeAdd((LONG *)pointer, (LONG)amount);
CRYPTO_lock(CRYPTO_UNLOCK|CRYPTO_WRITE, type, file, line); return ret + amount;
return (ret);
} }