Changeset 207

Timestamp:

05/08/06 00:41:55 (4 years ago)

Author:

bart

Message:

• Added directory hashing for md5 and inode based keys based on a patch

from <mattias at efterfesten.com>, default is 2 levels deep.

• Renamed some left over MM based names to EA.
• Increased default hash size for user and script to 512 for extra

performance.

Location:

eaccelerator/trunk

Files:

• ChangeLog (modified) (1 diff)
• cache.c (modified) (5 diffs)
• config.m4 (modified) (1 diff)
• ea_dasm.c (modified) (1 diff)
• ea_info.c (modified) (3 diffs)
• eaccelerator.c (modified) (11 diffs)
• eaccelerator.h (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-05-07  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Added directory hashing for md5 and inode based keys based on a patch
+          from <mattias at efterfesten.com>, default is 2 levels deep.
+        * Renamed some left over MM based names to EA.
+        * Increased default hash size for user and script to 512 for extra 
+          performance.
+
 2006-05-04  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
 

eaccelerator/trunk/cache.c

@@ -298 +298 @@
              * storing to shared memory 
              */
-            slot = q->hv & MM_USER_HASH_MAX;
+            slot = q->hv & EA_USER_HASH_MAX;
             hv = q->hv;
             EACCELERATOR_LOCK_RW();
@@ -337 +337 @@
     xkey = build_key(key, key_len, &xlen TSRMLS_CC);
     hv = hash_mm(xkey, xlen);
-    slot = hv & MM_USER_HASH_MAX;
+    slot = hv & EA_USER_HASH_MAX;
 
     if (eaccelerator_mm_instance != NULL && (where == eaccelerator_shm_and_disk 
@@ -533 +533 @@
                 where == eaccelerator_shm || where == eaccelerator_shm_only)) {
         hv = hash_mm(xkey, xlen);
-        slot = hv & MM_USER_HASH_MAX;
+        slot = hv & EA_USER_HASH_MAX;
 
         EACCELERATOR_UNPROTECT();
@@ -574 +574 @@
     EACCELERATOR_UNPROTECT();
     EACCELERATOR_LOCK_RW();
-    for (i = 0; i < MM_USER_HASH_SIZE; i++) {
+    for (i = 0; i < EA_USER_HASH_SIZE; i++) {
         mm_user_cache_entry **p = &eaccelerator_mm_instance->user_hash[i];
         while (*p != NULL) {
@@ -618 +618 @@
     array_init(return_value);
 
-    for (i = 0; i < MM_USER_HASH_SIZE; ++i) {
+    for (i = 0; i < EA_USER_HASH_SIZE; ++i) {
         p = eaccelerator_mm_instance->user_hash[i];
         while(p != NULL) {

eaccelerator/trunk/config.m4

@@ -66 +66 @@
 
 AC_ARG_WITH(eaccelerator-info,
-[  --without-eaccelerator-info                Do not compile the eAccelerator information functions],[
+[  --without-eaccelerator-info              Do not compile the eAccelerator information functions],[
   eaccelerator_info=$withval
 ],[

eaccelerator/trunk/ea_dasm.c

@@ -514 +514 @@
                 EACCELERATOR_LOCK_RD();
                 EACCELERATOR_PROTECT();
-                for (slot = 0; slot < MM_HASH_SIZE; slot++) {
+                for (slot = 0; slot < EA_HASH_SIZE; slot++) {
                         p = eaccelerator_mm_instance->hash[slot];
                         while (p != NULL) {

eaccelerator/trunk/ea_info.c

@@ -227 +227 @@
         EACCELERATOR_UNPROTECT ();
         EACCELERATOR_LOCK_RW ();
-        for (i = 0; i < MM_HASH_SIZE; i++) {
+        for (i = 0; i < EA_HASH_SIZE; i++) {
                 p = eaccelerator_mm_instance->hash[i];
                 while (p != NULL) {
@@ -244 +244 @@
                 eaccelerator_mm_instance->hash[i] = NULL;
         }
-        for (i = 0; i < MM_USER_HASH_SIZE; i++) {
+        for (i = 0; i < EA_USER_HASH_SIZE; i++) {
                 mm_user_cache_entry *p = eaccelerator_mm_instance->user_hash[i];
                 while (p != NULL) {
@@ -379 +379 @@
     array_init(return_value);
     
-    for (i = 0; i < MM_HASH_SIZE; i++) {
+    for (i = 0; i < EA_HASH_SIZE; i++) {
         p = eaccelerator_mm_instance->hash[i];
         while (p != NULL) {

eaccelerator/trunk/eaccelerator.c

@@ -144 +144 @@
   hv = hash_mm(key, strlen(key));
 #endif
-  slot = hv & MM_HASH_MAX;
+  slot = hv & EA_HASH_MAX;
 
   EACCELERATOR_LOCK_RW();
@@ -207 +207 @@
   unsigned int slot;
 #ifdef EACCELERATOR_USE_INODE
-  slot = (x->st_dev + x->st_ino) & MM_HASH_MAX;
+  slot = (x->st_dev + x->st_ino) & EA_HASH_MAX;
 #else
   x->hv = hash_mm(x->realfilename, strlen(x->realfilename));
-  slot = x->hv & MM_HASH_MAX;
+  slot = x->hv & EA_HASH_MAX;
 #endif
 
@@ -368 +368 @@
 */
 
+static char num2hex[] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
+
 #ifdef EACCELERATOR_USE_INODE
 static int eaccelerator_inode_key(char* s, dev_t dev, ino_t ino TSRMLS_DC) {
-  int n;
-  strncpy(s, EAG(cache_dir), MAXPATHLEN-1);
-  strlcat(s, "/eaccelerator-", MAXPATHLEN-1);
+  int n, i;
+  snprintf(s, MAXPATHLEN-1, "%s/", EAG(cache_dir));
   n = strlen(s);
+  for (i = 1; i <= EACCELERATOR_HASH_LEVEL && n < MAXPATHLEN - 1; i++) {
+    s[n++] = num2hex[(ino >> (i*4)) & 0xf];
+    s[n++] = '/';
+  }
+  s[n] = 0;
+  strlcat(s, "eaccelerator-", MAXPATHLEN-1);
+  n += sizeof("eaccelerator-") - 1;
   while (dev > 0) {
     if (n >= MAXPATHLEN) return 0;
@@ -399 +407 @@
   PHP_MD5_CTX context;
   unsigned char digest[16];
+  int i;
+  int n;
 
   md5str[0] = '\0';
@@ -405 +415 @@
   PHP_MD5Final(digest, &context);
   make_digest(md5str, digest);
-  snprintf(s, MAXPATHLEN-1, "%s%s%s", EAG(cache_dir), prefix, md5str);
+  snprintf(s, MAXPATHLEN-1, "%s/", EAG(cache_dir));
+  n = strlen(s);
+  for (i = 0; i < EACCELERATOR_HASH_LEVEL && n < MAXPATHLEN - 1; i++) {
+    s[n++] = md5str[i];
+    s[n++] = '/';
+  }
+  s[n] = 0;
+  snprintf(s, MAXPATHLEN-1, "%s%s%s", s, prefix, md5str);
   return 1;
 #else
@@ -437 +454 @@
   EACCELERATOR_LOCK_RW();
   eaccelerator_mm_instance->last_prune = t;
-  for (i = 0; i < MM_HASH_SIZE; i++) {
+  for (i = 0; i < EA_HASH_SIZE; i++) {
     mm_cache_entry **p = &eaccelerator_mm_instance->hash[i];
     while (*p != NULL) {
@@ -588 +605 @@
 /******************************************************************************/
 /* Cache file functions.                                                                                                          */
-/* TODO: create cache subdirectories -> speed improvement highly used servers */
 /******************************************************************************/
 
@@ -729 +745 @@
     EACCELERATOR_FLOCK(f, LOCK_UN);
     close(f);
+  } else {
+    ea_debug_log("EACCELERATOR: Open for write failed for \"%s\": %s\n", s, strerror(errno));
   }
   return ret;
@@ -1965 +1983 @@
 }
 
+static void make_hash_dirs(char *fullpath, int lvl) {
+  int i, j;
+  int n = strlen(fullpath);
+  mode_t old_umask = umask(0);
+  
+  if (lvl < 1)
+    return;
+  if (fullpath[n-1] != '/')
+    fullpath[n++] = '/';
+  
+  for (j = 0; j < 16; j++) {
+    fullpath[n] = num2hex[j];       
+    fullpath[n+1] = 0;
+    mkdir(fullpath, 0777);
+    make_hash_dirs(fullpath, lvl-1);
+  }
+  fullpath[n+2] = 0;
+  umask(old_umask);
+}
+
+
 PHP_MINIT_FUNCTION(eaccelerator) {
+  char fullpath[MAXPATHLEN];
+
   if (type == MODULE_PERSISTENT) {
 #ifndef ZEND_WIN32
     if (strcmp(sapi_module.name,"apache") == 0) {
-      /* Is the parent process - init */
-/*
-      sleep(1);
-      if (getppid() != 1) {
-*/
       if (getpid() != getpgrp()) {
         return SUCCESS;
@@ -1980 +2016 @@
 #endif
 #ifdef WITH_EACCELERATOR_LOADER
-    if (zend_hash_exists(&module_registry, EACCELERATOR_LOADER_EXTENSION_NAME, sizeof(EACCELERATOR_LOADER_EXTENSION_NAME))) {
-      zend_error(E_CORE_WARNING,"Extension \"%s\" is not need with \"%s\". Remove it from php.ini\n", EACCELERATOR_LOADER_EXTENSION_NAME, EACCELERATOR_EXTENSION_NAME);
-      zend_hash_del(&module_registry, EACCELERATOR_LOADER_EXTENSION_NAME, sizeof(EACCELERATOR_LOADER_EXTENSION_NAME));
+    if (zend_hash_exists(&module_registry, EACCELERATOR_LOADER_EXTENSION_NAME, 
+                sizeof(EACCELERATOR_LOADER_EXTENSION_NAME))) {
+      zend_error(E_CORE_WARNING,"Extension \"%s\" is not need with \"%s\". Remove it from php.ini\n", 
+              EACCELERATOR_LOADER_EXTENSION_NAME, EACCELERATOR_EXTENSION_NAME);
+      zend_hash_del(&module_registry, EACCELERATOR_LOADER_EXTENSION_NAME, 
+              sizeof(EACCELERATOR_LOADER_EXTENSION_NAME));
     }
 #endif
@@ -2006 +2045 @@
 
   ea_debug_init(TSRMLS_C);
+
+  snprintf(fullpath, MAXPATHLEN-1, "%s/", EAG(cache_dir));
+  make_hash_dirs(fullpath, EACCELERATOR_HASH_LEVEL);
 
   if (type == MODULE_PERSISTENT &&

eaccelerator/trunk/eaccelerator.h

@@ -148 +148 @@
 #define EACCELERATOR_UNBLOCK_INTERRUPTIONS() HANDLE_UNBLOCK_INTERRUPTIONS()
 
-#define MM_HASH_SIZE      256
-#define MM_USER_HASH_SIZE 256
-#define MM_HASH_MAX       (MM_HASH_SIZE-1)
-#define MM_USER_HASH_MAX  (MM_USER_HASH_SIZE-1)
+#define EACCELERATOR_HASH_LEVEL 2
+#define EA_HASH_SIZE      512
+#define EA_USER_HASH_SIZE 512
+
+#define EA_HASH_MAX       (EA_HASH_SIZE-1)
+#define EA_USER_HASH_MAX  (EA_USER_HASH_SIZE-1)
 
 #define eaccelerator_malloc(size)        mm_malloc_lock(eaccelerator_mm_instance->mm, size)
@@ -339 +341 @@
         mm_lock_entry *locks;
 
-        mm_cache_entry *hash[MM_HASH_SIZE];
-        mm_user_cache_entry *user_hash[MM_USER_HASH_SIZE];
+        mm_cache_entry *hash[EA_HASH_SIZE];
+        mm_user_cache_entry *user_hash[EA_USER_HASH_SIZE];
 } eaccelerator_mm;