Changeset 223

Timestamp:

06/30/06 15:49:50 (2 years ago)

Author:

hans

Message:

* Added ability to sort table columns by clicking on the table headings in the control panel
* Quick & dirty fix for eaccelerator_clear to work with the new cache dir hashing. This still needs to be done for win32.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/control.php (modified) (3 diffs)
• eaccelerator/trunk/ea_info.c (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-06-30  Hans Rakers <hans at parse dot nl>
+
+        * Added ability to sort table columns by clicking on the table
+          headings in the control panel
+        * Quick & dirty fix for eaccelerator_clear to work with the new
+          cache dir hashing. This still needs to be done for win32.
+
+          eaccelerator_clean still needs some fixing to work with the
+          dir hashing.
+
-2006-06-27  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/control.php

@@ -61 +61 @@
-/* }}} */
-
+function compare($x, $y)
+{
+  global $sortby;
+
+  if ( $x[$sortby] == $y[$sortby] )
+    return 0;
+  else if ( $x[$sortby] < $y[$sortby] )
+    return -1;
+  else
+    return 1;
+}
+
+function revcompare($x, $y)
+{
+  global $sortby;
+
+  if ( $x[$sortby] == $y[$sortby] )
+    return 0;
+  else if ( $x[$sortby] < $y[$sortby] )
+    return 1;
+  else
+    return -1;
+}
+   
-/* {{{ create_script_table */
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <tr>
-    <?php   if (function_exists('eaccelerator_dasm_file')) { ?>
@@ -79 +121 @@
-    <?php   } ?>
-            <td class="vr"><?php echo date('Y-m-d H:i', $script['mtime']); ?></td>
-
+ 
-            <td class="vr"><?php echo $script['reloads']; ?> (<?php echo $script['usecount']; ?>)</td>
-            <td class="vr"><?php echo $script['hits']; ?></td>
@@ -151 +193 @@
-        .h,th {background-color: #9999cc; font-weight: bold; color: #000000;}
-        .v,td {background-color: #cccccc; color: #000000;}
-
+ white-space: nowrap;
-        img {float: right; border: 0px;}
-        hr {width: 600px; background-color: #cccccc; border: 0px; height: 1px; color: #000000;}

eaccelerator/trunk/ea_info.c

@@ -77 +77 @@
-/* }}} */
-
+/* {{{ clear_filecache(): Helper function to eaccelerator_clear which finds diskcache entries in the hashed dirs and removes them */
+static int clear_filecache() {
+#ifndef ZEND_WIN32
+        DIR *dp;
+        struct dirent *entry;
+        char s[MAXPATHLEN];
+        char cwd[MAXPATHLEN];
+        struct stat dirstat;
+
+        if (getcwd(cwd, MAXPATHLEN)) {
+                if ((dp = opendir (".")) != NULL) {
+                        while ((entry = readdir (dp)) != NULL) {
+                                if (strstr (entry->d_name, "eaccelerator") == entry->d_name) {
+                                        strncpy (s, cwd, MAXPATHLEN - 1);
+                                        strlcat (s, "/", MAXPATHLEN);
+                                        strlcat (s, entry->d_name, MAXPATHLEN);
+                                        unlink(s);
+                                }
+                                if (stat(entry->d_name, &dirstat) != -1) {
+                                        if (strcmp(entry->d_name, ".") ==0)
+                                                continue;
+                                        if (strcmp(entry->d_name, "..") ==0)
+                                                continue;
+
+                                        if (S_ISDIR(dirstat.st_mode)) {
+                                                chdir(entry->d_name);
+                                                clear_filecache();
+                                                chdir("..");
+                                        }
+                                }
+                        }
+                        closedir (dp);
+                }
+        }
+}
+#else
+/* WIN32 TODO: rewrite this for hashed cache dirs */
+{
+        HANDLE hList;
+        TCHAR szDir[MAXPATHLEN];
+        WIN32_FIND_DATA FileData;
+        char s[MAXPATHLEN];
+
+        snprintf (szDir, MAXPATHLEN, "%s\\eaccelerator*", EAG (cache_dir));
+
+        if ((hList = FindFirstFile (szDir, &FileData)) != INVALID_HANDLE_VALUE) {
+                do {
+                        strncpy (s, EAG (cache_dir), MAXPATHLEN - 1);
+                        strlcat (s, "\\", MAXPATHLEN);
+                        strlcat (s, FileData.cFileName, MAXPATHLEN);
+                        unlink (s);
+                }
+                while (FindNextFile (hList, &FileData));
+        }
+
+                FindClose (hList);
+}
+#endif
+/* }}} */
+
-/* {{{ PHP_FUNCTION(eaccelerator_caching): enable or disable caching */
-PHP_FUNCTION(eaccelerator_caching) 
@@ -256 +316 @@
-        EACCELERATOR_UNLOCK_RW ();
-        EACCELERATOR_PROTECT ();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    RETURN_NULL();
-}