com php-src: Save a stat() call by calling sapi_module.get _stat(): ZendAccelerator.c
| From: | Dmitry Stogov | Date: | Tue, 05 Mar 2013 08:17:18 +0000 |
| Subject: | com php-src: Save a stat() call by calling sapi_module.get _stat(): ZendAccelerator.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71486@lists.php.net to get a copy of this message | ||
Commit: 9c5039eabb54bbdd45376c7c79d83bc6e2fd71ba
Author: Dmitry Stogov <dmitry@zend.com> Tue, 5 Mar 2013 12:17:18 +0400
Parents: 8f991588b973637ddc9ca0e8e82afe41ba3f04ce
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9c5039eabb54bbdd45376c7c79d83bc6e2fd71ba
Log:
Save a stat() call by calling sapi_module.get_stat()
Changed paths:
M ZendAccelerator.c
Diff:
diff --git a/ZendAccelerator.c b/ZendAccelerator.c
index 7f1c8f8..e0576b8 100644
--- a/ZendAccelerator.c
+++ b/ZendAccelerator.c
@@ -699,6 +699,17 @@ static accel_time_t zend_get_file_handle_timestamp(zend_file_handle
*file_handle
{
struct stat statbuf;
+ if (sapi_module.get_stat &&
+ !EG(opline_ptr) &&
+ file_handle->filename == SG(request_info).path_translated) {
+
+ struct stat *tmpbuf = sapi_module.get_stat(TSRMLS_C);
+
+ if (tmpbuf) {
+ return tmpbuf->st_mtime;
+ }
+ }
+
#ifdef ZEND_WIN32
accel_time_t res;
@@ -782,6 +793,8 @@ static accel_time_t zend_get_file_handle_timestamp(zend_file_handle *file_handle
static inline int do_validate_timestamps(zend_persistent_script *persistent_script,
zend_file_handle *file_handle TSRMLS_DC)
{
zend_file_handle ps_handle;
+ char actualpath [MAXPATHLEN + 1];
+ char *full_path_ptr = NULL;
/** check that the persistant script is indeed the same file we cached
* (if part of the path is a symlink than it possible that the user will change it)
@@ -792,22 +805,29 @@ static inline int do_validate_timestamps(zend_persistent_script
*persistent_scri
return FAILURE;
}
} else {
- char actualpath [MAXPATHLEN + 1];
- char *full_path_ptr;
-
full_path_ptr = VCWD_REALPATH(file_handle->filename, actualpath);
if (full_path_ptr && strcmp(persistent_script->full_path, full_path_ptr) != 0) {
return FAILURE;
}
+ file_handle->opened_path = full_path_ptr;
}
if (persistent_script->timestamp == 0) {
+ if (full_path_ptr) {
+ file_handle->opened_path = NULL;
+ }
return FAILURE;
}
if (zend_get_file_handle_timestamp(file_handle TSRMLS_CC) == persistent_script->timestamp) {
+ if (full_path_ptr) {
+ file_handle->opened_path = NULL;
+ }
return SUCCESS;
}
+ if (full_path_ptr) {
+ file_handle->opened_path = NULL;
+ }
ps_handle.type = ZEND_HANDLE_FILENAME;
ps_handle.filename = persistent_script->full_path;