author | Craig Mohrman <craig.mohrman@oracle.com> |
Tue, 16 Jun 2015 14:11:47 -0700 | |
changeset 4494 | f5b717124172 |
parent 846 | fe258446a1ae |
permissions | -rw-r--r-- |
846
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
1 |
--- php-5.3.10/Zend/zend_API.c_orig Sun Jan 1 05:15:04 2012 |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
2 |
+++ php-5.3.10/Zend/zend_API.c Wed Feb 8 11:25:25 2012 |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
@@ -27,11 +27,16 @@ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
4 |
#include "zend_constants.h" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
#include "zend_exceptions.h" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
6 |
#include "zend_closures.h" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
7 |
+#include "zend_dtrace.h" |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
8 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
9 |
#ifdef HAVE_STDARG_H |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
10 |
#include <stdarg.h> |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
11 |
#endif |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
12 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
13 |
+#ifdef HAVE_DTRACE |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
14 |
+extern char* dtrace_get_executed_filename(TSRMLS_D); |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
15 |
+#endif |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
16 |
+ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
17 |
/* these variables are true statics/globals, and have to be mutex'ed on every access */ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
18 |
static int module_count=0; |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
19 |
ZEND_API HashTable module_registry; |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
20 |
@@ -1073,6 +1078,17 @@ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
21 |
zend_error(E_ERROR, "Cannot instantiate %s %s", what, class_type->name); |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
22 |
} |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
23 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
24 |
+#ifdef HAVE_DTRACE |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
25 |
+ if (DTRACE_OBJECT_CREATE_ENABLED()) { |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
26 |
+ char *filename; |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
27 |
+ int lineno; |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
28 |
+ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
29 |
+ filename = dtrace_get_executed_filename(TSRMLS_C); |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
30 |
+ lineno = zend_get_executed_lineno(TSRMLS_C); |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
31 |
+ DTRACE_OBJECT_CREATE(class_type->name, filename, lineno); |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
32 |
+ } |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
33 |
+#endif /* HAVE_DTRACE */ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
34 |
+ |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
35 |
zend_update_class_constants(class_type TSRMLS_CC); |
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
36 |
|
fe258446a1ae
6714149 integrate PHP 5.3 within OpenSolaris
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
37 |
Z_TYPE_P(arg) = IS_OBJECT; |