Changeset 964 in svn

Timestamp:

2012-07-13T02:40:55Z (4 years ago)

Author:

Xuefer

Message:

fixed #264, #284: FILE DIR handling for moved/hardlinked files (set "xcache.experimental = on" to eanble this fix)

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• NEWS (modified) (1 diff)
• processor/processor.m4 (modified) (1 diff)
• xcache.c (modified) (6 diffs)
• xcache.h (modified) (2 diffs)

trunk/ChangeLog

@@ -9 +9 @@
  * fixed #283: XCache admin APIs (admin page) cause SEGV if XCache failed to initize
  * fixed possible re-include a file by mixing include/include_once
+ * fixed #264, #284: __FILE__ __DIR__ handling for moved/hardlinked files (set "xcache.experimental = on" to eanble this fix)
 
 2.0.0 2012-04-20

trunk/NEWS

@@ -4 +4 @@
  * admin/ config changed. please update accordingly
  * PHP 5.3.14 is unstable. Please upgrade to new version. You have been warned
+ * fixed __FILE__ __DIR__ handling for moved/hardlinked files (set "xcache.experimental = on" to eanble this fix)
 
 2.0.0 2012-04-20

trunk/processor/processor.m4

@@ -1165 +1165 @@
     PROCESS(time_t, file_mtime)
     PROCESS(size_t, file_size)
-#ifdef HAVE_INODE
     PROCESS(int, file_device)
     PROCESS(int, file_inode)
-#endif
 
     PROCESS(int, filepath_len)

trunk/xcache.c

@@ -189 +189 @@
     switch (type) {
         case XC_TYPE_PHP:
-#ifdef HAVE_INODE
             {
                 const xc_entry_php_t *php_entry1 = (const xc_entry_php_t *) entry1;
                 const xc_entry_php_t *php_entry2 = (const xc_entry_php_t *) entry2;
-                if (php_entry1->file_inode) {
-                    return php_entry1->file_inode == php_entry2->file_inode
-                        && php_entry1->file_device == php_entry2->file_device;
+                if (php_entry1->file_inode && php_entry2->file_inode) {
+                    zend_bool inodeIsSame = php_entry1->file_inode == php_entry2->file_inode
+                                         && php_entry1->file_device == php_entry2->file_device;
+                    if (XG(experimental)) {
+                        /* new experimental behavior: quick check by inode, first */
+                        if (!inodeIsSame) {
+                            return 0;
+                        }
+
+                        /* and then opened_path compare */
+                    }
+                    else {
+                        /* old behavior: inode check only */
+                        return inodeIsSame;
+                    }
                 }
             }
-#endif
+
             assert(IS_ABSOLUTE_PATH(entry1->name.str.val, entry1->name.str.len));
             assert(IS_ABSOLUTE_PATH(entry2->name.str.val, entry2->name.str.len));
 
-            if (entry1->name.str.len != entry2->name.str.len) {
-                return 0;
-            }
-            return memcmp(entry1->name.str.val, entry2->name.str.val, entry1->name.str.len + 1) == 0;
+            return entry1->name.str.len == entry2->name.str.len
+                && memcmp(entry1->name.str.val, entry2->name.str.val, entry1->name.str.len + 1) == 0;
 
         case XC_TYPE_VAR:
@@ -212 +221 @@
                 return 0;
             }
-            else if (entry1->name_type == IS_UNICODE) {
-                if (entry1->name.ustr.len != entry2->name.ustr.len) {
-                    return 0;
-                }
-                return memcmp(entry1->name.ustr.val, entry2->name.ustr.val, (entry1->name.ustr.len + 1) * sizeof(UChar)) == 0;
-            }
-            else
-#endif
-            {
-                if (entry1->name.str.len != entry2->name.str.len) {
-                    return 0;
-                }
-                return memcmp(entry1->name.str.val, entry2->name.str.val, entry1->name.str.len + 1) == 0;
-            }
+
+            if (entry1->name_type == IS_UNICODE) {
+                return entry1->name.ustr.len == entry2->name.ustr.len
+                    && memcmp(entry1->name.ustr.val, entry2->name.ustr.val, (entry1->name.ustr.len + 1) * sizeof(UChar)) == 0;
+            }
+#endif
+            return entry1->name.str.len == entry2->name.str.len
+                && memcmp(entry1->name.str.val, entry2->name.str.val, entry1->name.str.len + 1) == 0;
             break;
 
@@ -693 +696 @@
             add_assoc_long_ex(ei, ZEND_STRS("file_mtime"),    entry_php->file_mtime);
             add_assoc_long_ex(ei, ZEND_STRS("file_size"),     entry_php->file_size);
-#ifdef HAVE_INODE
             add_assoc_long_ex(ei, ZEND_STRS("file_device"),   entry_php->file_device);
             add_assoc_long_ex(ei, ZEND_STRS("file_inode"),    entry_php->file_inode);
-#endif
 
 #ifdef HAVE_XCACHE_CONSTANT
@@ -1154 +1155 @@
         compiler->new_entry.file_mtime   = buf.st_mtime;
         compiler->new_entry.file_size    = buf.st_size;
-#ifdef HAVE_INODE
         compiler->new_entry.file_device  = buf.st_dev;
         compiler->new_entry.file_inode   = buf.st_ino;
-#endif
     }
     else {
@@ -1164 +1163 @@
         compiler->new_entry.file_mtime   = 0;
         compiler->new_entry.file_size    = 0;
-#ifdef HAVE_INODE
         compiler->new_entry.file_device  = 0;
         compiler->new_entry.file_inode   = 0;
-#endif
     }
 
     {
         xc_hash_value_t basename_hash_value;
-        if (
-            xc_php_hcache.size > 1
-#ifdef HAVE_INODE
-            || !compiler->new_entry.file_inode
-#endif
-            )
-        {
+        if (xc_php_hcache.size > 1
+         || !compiler->new_entry.file_inode) {
             const char *filename_end = compiler->filename + compiler->filename_len;
             const char *basename = filename_end - 1;
@@ -1194 +1186 @@
         compiler->entry_hash.cacheid = xc_php_hcache.size > 1 ? xc_hash_fold(basename_hash_value, &xc_php_hcache) : 0;
         compiler->entry_hash.entryslotid = xc_hash_fold(
-#ifdef HAVE_INODE
                 compiler->new_entry.file_inode
                 ? HASH(compiler->new_entry.file_device + compiler->new_entry.file_inode)
-                :
-#endif
-                basename_hash_value
+                : basename_hash_value
                 , &xc_php_hentry);
     }

trunk/xcache.h

@@ -23 +23 @@
 #include "lock.h"
 
-#define HAVE_INODE
 #if !defined(ZEND_ENGINE_2_4) && (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 4 || PHP_MAJOR_VERSION > 5)
 #   define ZEND_ENGINE_2_4
@@ -434 +433 @@
     time_t file_mtime;
     size_t file_size;
-#ifdef HAVE_INODE
     int file_device;
     int file_inode;
-#endif
 
     int    filepath_len;