equal
deleted
inserted
replaced
|
1 --- php-5.3.10/Zend/zend_objects.c_orig Sun Jan 1 05:15:04 2012 |
|
2 +++ php-5.3.10/Zend/zend_objects.c Wed Feb 8 11:25:25 2012 |
|
3 @@ -25,6 +25,7 @@ |
|
4 #include "zend_API.h" |
|
5 #include "zend_interfaces.h" |
|
6 #include "zend_exceptions.h" |
|
7 +#include "zend_dtrace.h" |
|
8 |
|
9 ZEND_API void zend_object_std_init(zend_object *object, zend_class_entry *ce TSRMLS_DC) |
|
10 { |
|
11 @@ -51,6 +52,16 @@ |
|
12 { |
|
13 zend_function *destructor = object ? object->ce->destructor : NULL; |
|
14 |
|
15 +#ifdef HAVE_DTRACE |
|
16 + if (DTRACE_OBJECT_DESTROY_ENABLED()) { |
|
17 + char *filename; |
|
18 + int lineno; |
|
19 + |
|
20 + filename = dtrace_get_executed_filename(TSRMLS_C); |
|
21 + lineno = zend_get_executed_lineno(TSRMLS_C); |
|
22 + DTRACE_OBJECT_DESTROY(object->ce->name, filename, lineno); |
|
23 + } |
|
24 +#endif /* HAVE_DTRACE */ |
|
25 if (destructor) { |
|
26 zval *old_exception; |
|
27 zval *obj; |