Changeset beefac2 in git
- Timestamp:
- 2007-05-31T03:21:02Z (13 years ago)
- Branches:
- 3.0, 3.1, 3.2, master, trunk
- Children:
- 9405bc5
- Parents:
- ed9329e
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
coverager.c
r1609bb2 rbeefac2 17 17 18 18 static char *xc_coveragedump_dir = NULL; 19 static zend_compile_file_t *o rigin_compile_file;19 static zend_compile_file_t *old_compile_file; 20 20 21 21 #if 0 … … 436 436 zend_op_array *op_array; 437 437 438 op_array = o rigin_compile_file(h, type TSRMLS_CC);438 op_array = old_compile_file(h, type TSRMLS_CC); 439 439 if (op_array) { 440 440 if (XG(coverager)) { … … 465 465 int xc_coverager_init(int module_number TSRMLS_DC) /* {{{ */ 466 466 { 467 o rigin_compile_file = zend_compile_file;467 old_compile_file = zend_compile_file; 468 468 zend_compile_file = xc_compile_file_for_coverage; 469 469 … … 485 485 void xc_coverager_destroy() /* {{{ */ 486 486 { 487 if (o rigin_compile_file == xc_compile_file_for_coverage) {488 zend_compile_file = o rigin_compile_file;487 if (old_compile_file == xc_compile_file_for_coverage) { 488 zend_compile_file = old_compile_file; 489 489 } 490 490 if (xc_coveragedump_dir) { -
xcache.c
red9329e rbeefac2 87 87 88 88 static zend_bool xc_initized = 0; 89 static zend_compile_file_t *o rigin_compile_file;89 static zend_compile_file_t *old_compile_file; 90 90 static zend_llist_element *xc_llist_zend_extension; 91 91 … … 975 975 976 976 zend_try { 977 op_array = o rigin_compile_file(h, type TSRMLS_CC);977 op_array = old_compile_file(h, type TSRMLS_CC); 978 978 } zend_catch { 979 979 catched = 1; … … 1181 1181 TRACE("type = %d\n", h->type); 1182 1182 if (!XG(cacher)) { 1183 op_array = o rigin_compile_file(h, type TSRMLS_CC);1183 op_array = old_compile_file(h, type TSRMLS_CC); 1184 1184 #ifdef HAVE_XCACHE_OPTIMIZER 1185 1185 if (XG(optimizer)) { … … 1195 1195 if (xc_entry_init_key_php(&xce, filename, opened_path_buffer TSRMLS_CC) != SUCCESS) { 1196 1196 TRACE("failed to init key for %s", filename); 1197 return o rigin_compile_file(h, type TSRMLS_CC);1197 return old_compile_file(h, type TSRMLS_CC); 1198 1198 } 1199 1199 cache = xce.cache; … … 1203 1203 if (cache->compiling) { 1204 1204 cache->clogs ++; 1205 return o rigin_compile_file(h, type TSRMLS_CC);1205 return old_compile_file(h, type TSRMLS_CC); 1206 1206 } 1207 1207 /* {{{ entry_lookup/hit/md5_init/php_lookup */ … … 1257 1257 /* gaveup */ 1258 1258 if (gaveup) { 1259 return o rigin_compile_file(h, type TSRMLS_CC);1259 return old_compile_file(h, type TSRMLS_CC); 1260 1260 } 1261 1261 /* }}} */ … … 1561 1561 xc_shm_t *shm = NULL; 1562 1562 1563 if (o rigin_compile_file) {1564 zend_compile_file = o rigin_compile_file;1565 o rigin_compile_file = NULL;1563 if (old_compile_file) { 1564 zend_compile_file = old_compile_file; 1565 old_compile_file = NULL; 1566 1566 } 1567 1567 … … 1605 1605 1606 1606 if (xc_php_size) { 1607 o rigin_compile_file = zend_compile_file;1607 old_compile_file = zend_compile_file; 1608 1608 zend_compile_file = xc_compile_file; 1609 1609
Note: See TracChangeset
for help on using the changeset viewer.