Skip to content

Commit 60bc96b

Browse files
fix test
1 parent d30725e commit 60bc96b

File tree

5 files changed

+58
-24
lines changed

5 files changed

+58
-24
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
--TEST--
2+
ZendMM Observer: Observe free
3+
--EXTENSIONS--
4+
zend_test
5+
--INI--
6+
zend_test.zend_mm_observer.enabled=0
7+
opcache.enable=0
8+
--FILE--
9+
<?php
10+
$string = str_repeat("ZendMM Observer", 100);
11+
ini_set('zend_test.zend_mm_observer.enabled', 'true');
12+
unset($string);
13+
ini_set('zend_test.zend_mm_observer.enabled', 'false');
14+
?>
15+
--EXPECTREGEX--
16+
.*freed 0x\S+ of size \d+.*
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--TEST--
2+
ZendMM Observer: Observe malloc
3+
--EXTENSIONS--
4+
zend_test
5+
--INI--
6+
zend_test.zend_mm_observer.enabled=0
7+
opcache.enable=0
8+
--FILE--
9+
<?php
10+
ini_set('zend_test.zend_mm_observer.enabled', 'true');
11+
$string = str_repeat("ZendMM Observer", 100);
12+
ini_set('zend_test.zend_mm_observer.enabled', 'false');
13+
?>
14+
--EXPECTREGEX--
15+
.*malloc 0x\S+ of size \d+ \(block: \d+\).*

ext/zend_test/tests/zend_mm_observer_part_01.phpt

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
--TEST--
2+
ZendMM Observer: Observe realloc
3+
--EXTENSIONS--
4+
zend_test
5+
--INI--
6+
zend_test.zend_mm_observer.enabled=0
7+
opcache.enable=0
8+
--FILE--
9+
<?php
10+
$a = [];
11+
$a[] = 'ZendMM Observer';
12+
$a[] = 'ZendMM Observer';
13+
$a[] = 'ZendMM Observer';
14+
$a[] = 'ZendMM Observer';
15+
$a[] = 'ZendMM Observer';
16+
$a[] = 'ZendMM Observer';
17+
$a[] = 'ZendMM Observer';
18+
$a[] = 'ZendMM Observer';
19+
ini_set('zend_test.zend_mm_observer.enabled', 'true');
20+
$a[] = 'ZendMM Observer';
21+
ini_set('zend_test.zend_mm_observer.enabled', 'false');
22+
?>
23+
--EXPECTREGEX--
24+
.*realloc 0x\S+ of size \d+ \(block: \d+, former 0x\S+\)

ext/zend_test/zend_mm_observer.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ static void zend_mm_test_observer_malloc(size_t len, void *ptr ZEND_FILE_LINE_DC
2828
block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);
2929
}
3030
printf("malloc %p of size %zu (block: %zu)\n", ptr, len, block_len);
31+
fflush(stdout);
3132
}
3233

3334
static void zend_mm_test_observer_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
@@ -37,6 +38,7 @@ static void zend_mm_test_observer_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LIN
3738
block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);
3839
}
3940
printf("freed %p of size %zu\n", ptr, block_len);
41+
fflush(stdout);
4042
}
4143

4244
static void zend_mm_test_observer_realloc(void *ptr, size_t len, void *newptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
@@ -46,6 +48,7 @@ static void zend_mm_test_observer_realloc(void *ptr, size_t len, void *newptr ZE
4648
block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);
4749
}
4850
printf("realloc %p of size %zu (block: %zu, former %p)\n", newptr, len, block_len, ptr);
51+
fflush(stdout);
4952
}
5053

5154
static PHP_INI_MH(OnUpdateZendTestMMObserverEnabled)

0 commit comments

Comments
 (0)