wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7444 from miyazakh/trackmem_exclusion

Browse Source 
Exclusively tracking mem properties
This commit is contained in:
Sean Parkinson
2024-04-23 11:08:42 +10:00
committed by GitHub
parent eb125851cd dab6726e58
commit c3d9fb61a8
1 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wolfssl/wolfcrypt/mem_track.h
View File

@@ -177,19 +177,23 @@ static WC_INLINE void* TrackMalloc(size_t sz)
(void)line; (void)line;
#endif #endif
#endif #endif
#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
if (pthread_mutex_lock(&memLock) == 0)
{
#endif
#ifdef DO_MEM_STATS #ifdef DO_MEM_STATS
ourMemStats.totalAllocs++; ourMemStats.totalAllocs++;
ourMemStats.totalBytes += sz; ourMemStats.totalBytes += sz;
ourMemStats.currentBytes += sz; ourMemStats.currentBytes += sz;
#ifdef WOLFSSL_TRACK_MEMORY_VERBOSE #ifdef WOLFSSL_TRACK_MEMORY_VERBOSE
if (ourMemStats.peakAllocsTripOdometer < ourMemStats.totalAllocs - if (ourMemStats.peakAllocsTripOdometer < ourMemStats.totalAllocs -
ourMemStats.totalDeallocs) { ourMemStats.totalDeallocs) {
ourMemStats.peakAllocsTripOdometer = ourMemStats.totalAllocs - ourMemStats.peakAllocsTripOdometer = ourMemStats.totalAllocs -
ourMemStats.totalDeallocs; ourMemStats.totalDeallocs;
} }
if (ourMemStats.peakBytesTripOdometer < ourMemStats.currentBytes) if (ourMemStats.peakBytesTripOdometer < ourMemStats.currentBytes)
#endif #endif
{ {
#ifdef WOLFSSL_TRACK_MEMORY_VERBOSE #ifdef WOLFSSL_TRACK_MEMORY_VERBOSE
ourMemStats.peakBytesTripOdometer = ourMemStats.currentBytes; ourMemStats.peakBytesTripOdometer = ourMemStats.currentBytes;
@@ -197,10 +201,10 @@ static WC_INLINE void* TrackMalloc(size_t sz)
if (ourMemStats.currentBytes > ourMemStats.peakBytes) if (ourMemStats.currentBytes > ourMemStats.peakBytes)
ourMemStats.peakBytes = ourMemStats.currentBytes; ourMemStats.peakBytes = ourMemStats.currentBytes;
} }
#endif /* DO_MEM_STATS */ #endif /* DO_MEM_STATS */
#ifdef DO_MEM_LIST #ifdef DO_MEM_LIST
if (pthread_mutex_lock(&memLock) == 0) {
#ifdef WOLFSSL_DEBUG_MEMORY #ifdef WOLFSSL_DEBUG_MEMORY
header->func = func; header->func = func;
header->line = line; header->line = line;
@@ -218,7 +222,8 @@ static WC_INLINE void* TrackMalloc(size_t sz)
} }
ourMemList.tail = header; /* add to the end either way */ ourMemList.tail = header; /* add to the end either way */
ourMemList.count++; ourMemList.count++;
#endif
#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
pthread_mutex_unlock(&memLock); pthread_mutex_unlock(&memLock);
} }
#endif /* DO_MEM_LIST */ #endif /* DO_MEM_LIST */
@@ -245,7 +250,7 @@ static WC_INLINE void TrackFree(void* ptr)
header = &mt->u.hint; header = &mt->u.hint;
sz = header->thisSize; sz = header->thisSize;
#ifdef DO_MEM_LIST #if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
if (pthread_mutex_lock(&memLock) == 0) if (pthread_mutex_lock(&memLock) == 0)
{ {
#endif #endif
@@ -277,7 +282,9 @@ static WC_INLINE void TrackFree(void* ptr)
prev->next = next; prev->next = next;
} }
ourMemList.count--; ourMemList.count--;
#endif
#if defined(DO_MEM_LIST) || defined(DO_MEM_STATS)
pthread_mutex_unlock(&memLock); pthread_mutex_unlock(&memLock);
} }
#endif #endif