Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit baafc33

Browse files
small cleanup
1 parent 3454b5c commit baafc33

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

‎Zend/zend_alloc.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2269,11 +2269,8 @@ void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
22692269
zend_mm_chunk *p;
22702270
zend_mm_huge_list *list;
22712271

2272-
if (full == false) {
2273-
zend_mm_observers_shutdown(heap);
2274-
}
2275-
22762272
#if ZEND_MM_CUSTOM
2273+
zend_mm_observers_shutdown(heap);
22772274
if (heap->use_custom_heap & ~ZEND_MM_CUSTOM_HEAP_OBSERVED) {
22782275
if (heap->custom_heap.std._malloc == tracked_malloc) {
22792276
if (silent) {
@@ -2983,7 +2980,6 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
29832980
#ifdef ZTS
29842981
static void alloc_globals_dtor(zend_alloc_globals *alloc_globals)
29852982
{
2986-
zend_mm_observers_shutdown(alloc_globals->mm_heap);
29872983
zend_mm_shutdown(alloc_globals->mm_heap, 1, 1);
29882984
}
29892985
#endif
@@ -3173,7 +3169,7 @@ ZEND_API bool zend_mm_observer_unregister(zend_mm_heap *heap, zend_mm_observer *
31733169

31743170
/*
31753171
* This function will shutdown the observers for the current heap and free
3176-
* memory
3172+
* memory, it is called in `zend_mm_shutdown()`
31773173
*/
31783174
void zend_mm_observers_shutdown(zend_mm_heap *heap)
31793175
{

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /