Changeset 237

Timestamp:

07/24/06 14:49:43 (4 years ago)

Author:

bart

Message:

• Make clean routine support dir hashing. Again, this should be tested on win32!
• Use a define for the magic string in the eAccelerator file headers
• Bump up version to 0.9.5-rc1
• Put -O2 back on for -rc1

Location:

eaccelerator/trunk

Files:

• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• cache.c (modified) (2 diffs)
• ea_info.c (modified) (4 diffs)
• eaccelerator.c (modified) (2 diffs)
• eaccelerator.h (modified) (1 diff)
• eaccelerator_version.h (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-07-24  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Make clean routine support dir hashing. Again, this should be tested
+          on win32!
+        * Use a define for the magic string in the eAccelerator file headers
+        * Bump up version to 0.9.5-rc1
+        * Put -O2 back on for -rc1
+
 2006-07-23  Hans Rakers <hans at parse dot nl>
         * Fix for ticket #47 and #63, related to problems restoring empty

eaccelerator/trunk/Makefile.in

@@ -3 +3 @@
 LTLIBRARY_SHARED_NAME = eaccelerator.la
 
-EXTRA_CFLAGS = -O2 
+EXTRA_CFLAGS = -O2 -g -Wall 
 
 include $(top_srcdir)/build/dynlib.mk

eaccelerator/trunk/cache.c

@@ -270 +270 @@
                 mm_file_header hdr;
                 EACCELERATOR_FLOCK(f, LOCK_EX);
-                strncpy(hdr.magic, "EACCELERATOR", 8);
+                strncpy(hdr.magic, EA_MAGIC, 8);
                 hdr.eaccelerator_version = binary_eaccelerator_version;
                 hdr.zend_version = binary_zend_version;
@@ -392 +392 @@
 
             EACCELERATOR_FLOCK(f, LOCK_SH);
-            if (read(f, &hdr, sizeof(hdr)) != sizeof(hdr) || strncmp(hdr.magic, "EACCELERATOR", 8) != 0 || 
+            if (read(f, &hdr, sizeof(hdr)) != sizeof(hdr) || strncmp(hdr.magic, EA_MAGIC, 8) != 0 || 
                     hdr.eaccelerator_version != binary_eaccelerator_version || hdr.zend_version != binary_zend_version 
                     || hdr.php_version != binary_php_version) {

eaccelerator/trunk/ea_info.c

@@ -107 +107 @@
                 closedir (dp);
         } else {
-                ea_debug_error("eAccelerator: Could not open cachedir %s\n", dir);
+                ea_debug_error("[%s] Could not open cachedir %s\n", EACCELERATOR_EXTENSION_NAME, dir);
         }
 }
@@ -118 +118 @@
   
     memcpy(path, dir, dirlen);
-    strcpy(path + dirlen++, "\\*");
+    strcpy(path + dirlen++, "\\eaccelerator*");
 
     hFind = FindFirstFile(path, &wfd);
@@ -127 +127 @@
                                 clear_filecache(path);
                         } else if (!DeleteFile(path)) {
-                                zend_error(E_CORE_WARNING, "Can't delete file %s: error %d", path, GetLastError());
+                                ea_debug_error("[%s] Can't delete file %s: error %d\n", EACCELERATOR_EXTENSION_NAME, path, GetLastError());
+                        }
+                } while (FindNextFile(hFind, &wfd));
+        }
+    FindClose (hFind);
+}
+#endif
+/* }}} */
+
+/* {{{  clean_file: check if the given file is expired */
+static inline void clean_file(char *file, time_t t) 
+{
+        int f;
+
+        if ((f = open(file, O_RDONLY | O_BINARY)) > 0) {
+                mm_file_header hdr;
+                EACCELERATOR_FLOCK (f, LOCK_SH);
+                if (read(f, &hdr, sizeof(hdr)) != sizeof(hdr) 
+                                || strncmp (hdr.magic, EA_MAGIC,        8) != 0 
+                                || (hdr.mtime != 0 && hdr.mtime < t)) {
+                        EACCELERATOR_FLOCK (f, LOCK_UN);
+                        close (f);
+                        unlink (file);
+                } else {
+                        EACCELERATOR_FLOCK (f, LOCK_UN);
+                        close (f);
+                }
+        }
+}
+/* }}} */
+
+/* {{{ clean_filecache(): Helper function for eaccelerator_clean, it will remove all expired entries from the user cache */
+static void clean_filecache(const char* dir, time_t t)
+#ifndef ZEND_WIN32
+{
+        DIR *dp;
+        struct dirent *entry;
+        char s[MAXPATHLEN];
+        struct stat dirstat;
+        
+        if ((dp = opendir(dir)) != NULL) {
+                while ((entry = readdir(dp)) != NULL) {
+                        strncpy(s, dir, MAXPATHLEN - 1);
+                        strlcat(s, "/", MAXPATHLEN);
+                        strlcat(s, entry->d_name, MAXPATHLEN);
+                        if (strstr(entry->d_name, "eaccelerator-user") == entry->d_name) {
+                                clean_file(s, t);
+                        }
+                        if (stat(s, &dirstat) != -1) {
+                                if (strcmp(entry->d_name, ".") == 0)
+                                        continue;
+                                if (strcmp(entry->d_name, "..") == 0)
+                                        continue;
+                                if (S_ISDIR(dirstat.st_mode)) {
+                                        clean_filecache(s, t);
+                                }
+                        }
+                }
+                closedir (dp);
+        } else {
+                ea_debug_error("[%s] Could not open cachedir %s\n", EACCELERATOR_EXTENSION_NAME, dir);
+        }
+}
+#else
+{
+        HANDLE  hFind;
+    WIN32_FIND_DATA wfd;
+    char path[MAXPATHLEN];
+    size_t dirlen = strlen(dir);
+  
+    memcpy(path, dir, dirlen);
+    strcpy(path + dirlen++, "\\eaccelerator-user*");
+
+    hFind = FindFirstFile(path, &wfd);
+        if (hFind == INVALID_HANDLE_VALUE) {
+                do {
+                        strcpy(path + dirlen, wfd.cFileName);
+                        if (FILE_ATTRIBUTE_DIRECTORY & wfd.dwFileAttributes) {
+                                clear_filecache(path);
+                        } else {
+                                clean_file(path, t);
                         }
                 } while (FindNextFile(hFind, &wfd));
@@ -202 +282 @@
 
         /* Remove expired keys (session data, content) from disk cache */
-#ifndef ZEND_WIN32
-        /* clear file cache */
-        {
-                DIR *dp;
-                struct dirent *entry;
-                char s[MAXPATHLEN];
-
-                if ((dp = opendir (EAG (cache_dir))) != NULL) {
-                        while ((entry = readdir (dp)) != NULL) {
-                                if (strstr(entry->d_name, "eaccelerator-user") == entry->d_name) {
-                                        int f;
-                                        strncpy (s, EAG (cache_dir), MAXPATHLEN - 1);
-                                        strlcat (s, "/", MAXPATHLEN);
-                                        strlcat (s, entry->d_name, MAXPATHLEN);
-                                        if ((f = open (s, O_RDONLY | O_BINARY)) > 0) {
-                                                mm_file_header hdr;
-                                                EACCELERATOR_FLOCK (f, LOCK_SH);
-                                                if (read (f, &hdr, sizeof (hdr)) != sizeof (hdr) 
-                                || strncmp (hdr.magic, "EACCELERATOR",  8) != 0 || (hdr.mtime != 0 && hdr.mtime < t)) {
-                                                        EACCELERATOR_FLOCK (f, LOCK_UN);
-                                                        close (f);
-                                                        unlink (s);
-                                                } else {
-                                                        EACCELERATOR_FLOCK (f, LOCK_UN);
-                                                        close (f);
-                                                }
-                                        }
-                                }
-                        }
-                        closedir (dp);
-                }
-        }
-#else
-        {
-                HANDLE hList;
-                TCHAR szDir[MAXPATHLEN];
-                WIN32_FIND_DATA FileData;
-                char s[MAXPATHLEN];
-
-                snprintf (szDir, MAXPATHLEN, "%s\\eaccelerator-user*", EAG (cache_dir));
-
-                if ((hList = FindFirstFile (szDir, &FileData)) != INVALID_HANDLE_VALUE) {
-                        do {
-                                int f;
-                                strncpy (s, EAG (cache_dir), MAXPATHLEN - 1);
-                                strlcat (s, "\\", MAXPATHLEN);
-                                strlcat (s, FileData.cFileName, MAXPATHLEN);
-                                if ((f = open (s, O_RDONLY | O_BINARY)) > 0) {
-                                        mm_file_header hdr;
-                                        EACCELERATOR_FLOCK (f, LOCK_SH);
-                                        if (read (f, &hdr, sizeof (hdr)) != sizeof (hdr) 
-                            || strncmp (hdr.magic, "EACCELERATOR", 8) != 0 || (hdr.mtime != 0 && hdr.mtime < t)) {
-                                                EACCELERATOR_FLOCK (f, LOCK_UN);
-                                                close (f);
-                                                unlink (s);
-                                        } else {
-                                                EACCELERATOR_FLOCK (f, LOCK_UN);
-                                                close (f);
-                                        }
-                                }
-                        }
-                        while (FindNextFile (hList, &FileData));
-                }
-                FindClose (hList);
-        }
-#endif
+        clean_filecache(EAG(cache_dir), t);
+
         /* Remove expired keys (session data, content) from shared memory */
         eaccelerator_gc (TSRMLS_C);

eaccelerator/trunk/eaccelerator.c

@@ -634 +634 @@
       return NULL;
     }
-    if (strncmp(hdr.magic,"EACCELERATOR",8) != 0 ||
+    if (strncmp(hdr.magic, EA_MAGIC, 8) != 0 ||
         hdr.eaccelerator_version != binary_eaccelerator_version ||
         hdr.zend_version != binary_zend_version ||
@@ -732 +732 @@
   if (f > 0) {
     EACCELERATOR_FLOCK(f, LOCK_EX);
-    strncpy(hdr.magic, "EACCELERATOR", 8);
+    strncpy(hdr.magic, EA_MAGIC, 8);
     hdr.eaccelerator_version = binary_eaccelerator_version;
     hdr.zend_version    = binary_zend_version;

eaccelerator/trunk/eaccelerator.h

@@ -486 +486 @@
 #define EACCELERATOR_LOADER_EXTENSION_NAME "eLoader"
 
+#define EA_MAGIC "EACCELERATOR"
+
 #define EA_ENCODER_VERSION   0x00000004
 #define EA_ENCODER_END       0x00

eaccelerator/trunk/eaccelerator_version.h

@@ -1 +1 @@
 #ifndef EACCELERATOR_VERSION
-#define EACCELERATOR_VERSION "0.9.5-beta2"
+#define EACCELERATOR_VERSION "0.9.5-rc1"
 #endif