Skip to content

Commit f96610f

Browse files
trowskitrowski
committed
Treat address as string in tests
1 parent 091c982 commit f96610f

File tree

7 files changed

+100
-100
lines changed

7 files changed

+100
-100
lines changed

‎ext/zend_test/test.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ static void observer_set_user_opcode_handler(const char *opcode_names, user_opco
401401
static void fiber_address_observer(zend_fiber *from, zend_fiber *to)
402402
{
403403
if (ZT_G(observer_fiber_switch)) {
404-
php_printf("<!-- switching from fiber %lx to %lx -->\n", (uintptr_t) from, (uintptr_t) to);
404+
php_printf("<!-- switching from fiber %p to %p -->\n", from, to);
405405
}
406406
}
407407

@@ -410,11 +410,11 @@ static void fiber_enter_observer(zend_fiber *from, zend_fiber *to)
410410
if (ZT_G(observer_fiber_switch)) {
411411
if (to) {
412412
if (to->status == ZEND_FIBER_STATUS_INIT) {
413-
php_printf("<init '%lx'>\n", (uintptr_t) to);
413+
php_printf("<init '%p'>\n", to);
414414
} else if (to->status == ZEND_FIBER_STATUS_RUNNING && (!from || from->status == ZEND_FIBER_STATUS_RUNNING)) {
415-
php_printf("<resume '%lx'>\n", (uintptr_t) to);
415+
php_printf("<resume '%p'>\n", to);
416416
} else if (to->status == ZEND_FIBER_STATUS_SHUTDOWN) {
417-
php_printf("<destroying '%lx'>\n", (uintptr_t) to);
417+
php_printf("<destroying '%p'>\n", to);
418418
}
419419
}
420420
}
@@ -425,13 +425,13 @@ static void fiber_suspend_observer(zend_fiber *from, zend_fiber *to)
425425
if (ZT_G(observer_fiber_switch)) {
426426
if (from) {
427427
if (from->status == ZEND_FIBER_STATUS_SUSPENDED) {
428-
php_printf("<suspend '%lx'>\n", (uintptr_t) from);
428+
php_printf("<suspend '%p'>\n", from);
429429
} else if (from->status == ZEND_FIBER_STATUS_RETURNED) {
430-
php_printf("<returned '%lx'>\n", (uintptr_t) from);
430+
php_printf("<returned '%p'>\n", from);
431431
} else if (from->status == ZEND_FIBER_STATUS_THREW) {
432-
php_printf("<threw '%lx'>\n", (uintptr_t) from);
432+
php_printf("<threw '%p'>\n", from);
433433
} else if (from->status == ZEND_FIBER_STATUS_SHUTDOWN) {
434-
php_printf("<destroyed '%lx'>\n", (uintptr_t) from);
434+
php_printf("<destroyed '%p'>\n", from);
435435
}
436436
}
437437
}

‎ext/zend_test/tests/observer_fiber_01.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ $fiber->resume();
1818
?>
1919
--EXPECTF--
2020
<!-- init '%sobserver_fiber_01.php' -->
21-
<!-- switching from fiber 0 to %x -->
22-
<init '%x'>
21+
<!-- switching from fiber 0 to %s -->
22+
<init '%s'>
2323
<!-- init {closure}() -->
24-
<!-- switching from fiber %x to 0 -->
25-
<suspend '%x'>
26-
<!-- switching from fiber 0 to %x -->
27-
<resume '%x'>
28-
<!-- switching from fiber %x to 0 -->
29-
<returned '%x'>
24+
<!-- switching from fiber %s to 0 -->
25+
<suspend '%s'>
26+
<!-- switching from fiber 0 to %s -->
27+
<resume '%s'>
28+
<!-- switching from fiber %s to 0 -->
29+
<returned '%s'>

‎ext/zend_test/tests/observer_fiber_02.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ $fiber->start();
1717
?>
1818
--EXPECTF--
1919
<!-- init '%sobserver_fiber_02.php' -->
20-
<!-- switching from fiber 0 to %x -->
21-
<init '%x'>
20+
<!-- switching from fiber 0 to %s -->
21+
<init '%s'>
2222
<!-- init {closure}() -->
23-
<!-- switching from fiber %x to 0 -->
24-
<suspend '%x'>
25-
<!-- switching from fiber 0 to %x -->
26-
<destroying '%x'>
27-
<!-- switching from fiber %x to 0 -->
28-
<destroyed '%x'>
23+
<!-- switching from fiber %s to 0 -->
24+
<suspend '%s'>
25+
<!-- switching from fiber 0 to %s -->
26+
<destroying '%s'>
27+
<!-- switching from fiber %s to 0 -->
28+
<destroyed '%s'>

‎ext/zend_test/tests/observer_fiber_03.phpt

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -40,38 +40,38 @@ $fiber->resume();
4040
?>
4141
--EXPECTF--
4242
<!-- init '%sobserver_fiber_03.php' -->
43-
<!-- switching from fiber 0 to %x -->
44-
<init '%x'>
43+
<!-- switching from fiber 0 to %s -->
44+
<init '%s'>
4545
<!-- init {closure}() -->
46-
<!-- switching from fiber %x to 0 -->
47-
<suspend '%x'>
48-
<!-- switching from fiber 0 to %x -->
49-
<resume '%x'>
46+
<!-- switching from fiber %s to 0 -->
47+
<suspend '%s'>
48+
<!-- switching from fiber 0 to %s -->
49+
<resume '%s'>
5050
int(1)
51-
<!-- switching from fiber %x to %x -->
52-
<init '%x'>
51+
<!-- switching from fiber %s to %s -->
52+
<init '%s'>
5353
<!-- init {closure}() -->
54-
<!-- switching from fiber %x to %x -->
55-
<suspend '%x'>
56-
<!-- switching from fiber %x to 0 -->
57-
<suspend '%x'>
58-
<!-- switching from fiber 0 to %x -->
59-
<resume '%x'>
54+
<!-- switching from fiber %s to %s -->
55+
<suspend '%s'>
56+
<!-- switching from fiber %s to 0 -->
57+
<suspend '%s'>
58+
<!-- switching from fiber 0 to %s -->
59+
<resume '%s'>
6060
int(2)
61-
<!-- switching from fiber %x to %x -->
62-
<resume '%x'>
61+
<!-- switching from fiber %s to %s -->
62+
<resume '%s'>
6363
int(3)
64-
<!-- switching from fiber %x to %x -->
65-
<suspend '%x'>
66-
<!-- switching from fiber %x to 0 -->
67-
<suspend '%x'>
68-
<!-- switching from fiber 0 to %x -->
69-
<resume '%x'>
64+
<!-- switching from fiber %s to %s -->
65+
<suspend '%s'>
66+
<!-- switching from fiber %s to 0 -->
67+
<suspend '%s'>
68+
<!-- switching from fiber 0 to %s -->
69+
<resume '%s'>
7070
int(4)
71-
<!-- switching from fiber %x to %x -->
72-
<resume '%x'>
71+
<!-- switching from fiber %s to %s -->
72+
<resume '%s'>
7373
int(5)
74-
<!-- switching from fiber %x to %x -->
75-
<returned '%x'>
76-
<!-- switching from fiber %x to 0 -->
77-
<returned '%x'>
74+
<!-- switching from fiber %s to %s -->
75+
<returned '%s'>
76+
<!-- switching from fiber %s to 0 -->
77+
<returned '%s'>

‎ext/zend_test/tests/observer_fiber_04.phpt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,25 @@ $fiber->resume();
2727
?>
2828
--EXPECTF--
2929
<!-- init '%sobserver_fiber_04.php' -->
30-
<!-- switching from fiber 0 to %x -->
31-
<init '%x'>
30+
<!-- switching from fiber 0 to %s -->
31+
<init '%s'>
3232
<!-- init {closure}() -->
33-
<!-- switching from fiber %x to 0 -->
34-
<suspend '%x'>
35-
<!-- switching from fiber 0 to %x -->
36-
<resume '%x'>
37-
<!-- switching from fiber %x to %x -->
38-
<init '%x'>
33+
<!-- switching from fiber %s to 0 -->
34+
<suspend '%s'>
35+
<!-- switching from fiber 0 to %s -->
36+
<resume '%s'>
37+
<!-- switching from fiber %s to %s -->
38+
<init '%s'>
3939
<!-- init {closure}() -->
40-
<!-- switching from fiber %x to %x -->
41-
<suspend '%x'>
42-
<!-- switching from fiber %x to 0 -->
43-
<suspend '%x'>
44-
<!-- switching from fiber 0 to %x -->
45-
<resume '%x'>
46-
<!-- switching from fiber %x to %x -->
47-
<destroying '%x'>
48-
<!-- switching from fiber %x to %x -->
49-
<destroyed '%x'>
50-
<!-- switching from fiber %x to 0 -->
51-
<returned '%x'>
40+
<!-- switching from fiber %s to %s -->
41+
<suspend '%s'>
42+
<!-- switching from fiber %s to 0 -->
43+
<suspend '%s'>
44+
<!-- switching from fiber 0 to %s -->
45+
<resume '%s'>
46+
<!-- switching from fiber %s to %s -->
47+
<destroying '%s'>
48+
<!-- switching from fiber %s to %s -->
49+
<destroyed '%s'>
50+
<!-- switching from fiber %s to 0 -->
51+
<returned '%s'>

‎ext/zend_test/tests/observer_fiber_05.phpt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ $fiber->resume();
2626
?>
2727
--EXPECTF--
2828
<!-- init '%sobserver_fiber_05.php' -->
29-
<!-- switching from fiber 0 to %x -->
30-
<init '%x'>
29+
<!-- switching from fiber 0 to %s -->
30+
<init '%s'>
3131
<!-- init {closure}() -->
32-
<!-- switching from fiber %x to 0 -->
33-
<suspend '%x'>
34-
<!-- switching from fiber 0 to %x -->
35-
<resume '%x'>
36-
<!-- switching from fiber %x to %x -->
37-
<init '%x'>
32+
<!-- switching from fiber %s to 0 -->
33+
<suspend '%s'>
34+
<!-- switching from fiber 0 to %s -->
35+
<resume '%s'>
36+
<!-- switching from fiber %s to %s -->
37+
<init '%s'>
3838
<!-- init {closure}() -->
39-
<!-- switching from fiber %x to %x -->
40-
<suspend '%x'>
41-
<!-- switching from fiber %x to 0 -->
42-
<suspend '%x'>
43-
<!-- switching from fiber 0 to %x -->
44-
<destroying '%x'>
45-
<!-- switching from fiber %x to 0 -->
46-
<destroyed '%x'>
47-
<!-- switching from fiber 0 to %x -->
48-
<destroying '%x'>
49-
<!-- switching from fiber %x to 0 -->
50-
<destroyed '%x'>
39+
<!-- switching from fiber %s to %s -->
40+
<suspend '%s'>
41+
<!-- switching from fiber %s to 0 -->
42+
<suspend '%s'>
43+
<!-- switching from fiber 0 to %s -->
44+
<destroying '%s'>
45+
<!-- switching from fiber %s to 0 -->
46+
<destroyed '%s'>
47+
<!-- switching from fiber 0 to %s -->
48+
<destroying '%s'>
49+
<!-- switching from fiber %s to 0 -->
50+
<destroyed '%s'>

‎ext/zend_test/tests/observer_fiber_06.phpt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ try {
2323
?>
2424
--EXPECTF--
2525
<!-- init '%sobserver_fiber_06.php' -->
26-
<!-- switching from fiber 0 to %x -->
27-
<init '%x'>
26+
<!-- switching from fiber 0 to %s -->
27+
<init '%s'>
2828
<!-- init {closure}() -->
29-
<!-- switching from fiber %x to 0 -->
30-
<suspend '%x'>
31-
<!-- switching from fiber 0 to %x -->
32-
<resume '%x'>
33-
<!-- switching from fiber %x to 0 -->
34-
<threw '%x'>
29+
<!-- switching from fiber %s to 0 -->
30+
<suspend '%s'>
31+
<!-- switching from fiber 0 to %s -->
32+
<resume '%s'>
33+
<!-- switching from fiber %s to 0 -->
34+
<threw '%s'>

0 commit comments

Comments
 (0)