archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.3' into PHP-8.4

Browse source 
* PHP-8.3:
  Track heap->real_size for USE_TRACKED_ALLOC
This commit is contained in:
Ilija Tovilo 2025-06-20 14:51:20 +02:00
commit 0ee73ccbe5
No known key found for this signature in database
GPG key ID: 115CEA7A713E12E9
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Zend/zend_alloc.c
View file

@ -2411,6 +2411,7 @@ ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
} }
#if ZEND_MM_STAT #if ZEND_MM_STAT
heap->size = 0; heap->size = 0;
heap->real_size = 0;
#endif #endif
} }
@ -2977,6 +2978,7 @@ static void *tracked_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
tracked_add(heap, ptr, size); tracked_add(heap, ptr, size);
#if ZEND_MM_STAT #if ZEND_MM_STAT
heap->size += size; heap->size += size;
heap->real_size = heap->size;
#endif #endif
return ptr; return ptr;
} }
@ -2990,6 +2992,7 @@ static void tracked_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) {
zval *size_zv = tracked_get_size_zv(heap, ptr); zval *size_zv = tracked_get_size_zv(heap, ptr);
#if ZEND_MM_STAT #if ZEND_MM_STAT
heap->size -= Z_LVAL_P(size_zv); heap->size -= Z_LVAL_P(size_zv);
heap->real_size = heap->size;
#endif #endif
zend_hash_del_bucket(heap->tracked_allocs, (Bucket *) size_zv); zend_hash_del_bucket(heap->tracked_allocs, (Bucket *) size_zv);
free(ptr); free(ptr);
@ -3017,6 +3020,7 @@ static void *tracked_realloc(void *ptr, size_t new_size ZEND_FILE_LINE_DC ZEND_F
tracked_add(heap, ptr, new_size); tracked_add(heap, ptr, new_size);
#if ZEND_MM_STAT #if ZEND_MM_STAT
heap->size += new_size - old_size; heap->size += new_size - old_size;
heap->real_size = heap->size;
#endif #endif
return ptr; return ptr;
} }