Changeset 255

Timestamp:

07/29/06 13:04:04 (2 years ago)

Author:

bart

Message:

Move some functions around to make more of them static, this reduces the binary size and load times.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (6 diffs)
• eaccelerator/trunk/ea_restore.h (modified) (2 diffs)
• eaccelerator/trunk/ea_store.c (modified) (8 diffs)
• eaccelerator/trunk/ea_store.h (modified) (1 diff)
• eaccelerator/trunk/eaccelerator.c (modified) (2 diffs)

eaccelerator/trunk/ChangeLog

@@ -5 +5 @@
-        * Don't compile the user cache code one no feature is being compiled.
-        * A big cleanup in struct naming
+        * Move some functions around to make more of them static, this reduces
+          the binary size and load times.
-
-2006-07-29  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/ea_restore.c

@@ -158 +158 @@
-}
-
-
+static 
-{
-        zend_op *opline;
@@ -242 +242 @@
-}
-
-void fixup_class_entry(ea_class_entry * 
+static void fixup_class_entry(ea_class_entry *
-{
-        FIXUP(from->name);
@@ -271 +271 @@
-        fixup_hash(&from->function_table,
-                           (fixup_bucket_t) fixup_op_array TSRMLS_CC);
+}
+
+void eaccelerator_fixup (ea_cache_entry *p TSRMLS_DC)
+{
+        ea_fc_entry *q;
+
+        EAG (mem) = (char *) ((long) p - (long) p->next);
+        EAG (compress) = 1;
+        p->next = NULL;
+        FIXUP (p->op_array);
+        FIXUP (p->f_head);
+        FIXUP (p->c_head);
+        fixup_op_array (p->op_array TSRMLS_CC);
+        q = p->f_head;
+        while (q != NULL) {
+            FIXUP (q->fc);
+            fixup_op_array ((ea_op_array *) q->fc TSRMLS_CC);
+            FIXUP (q->next);
+            q = q->next;
+        }
+        q = p->c_head;
+        while (q != NULL) {
+            FIXUP (q->fc);
+            fixup_class_entry ((ea_class_entry *) q->fc TSRMLS_CC);
+            FIXUP (q->next);
+            q = q->next;
+        }
-}
-
@@ -642 +669 @@
-
-/* restore the parent class with the given name for the given class */
-
-
+
-{
-#ifdef ZEND_ENGINE_2
@@ -671 +697 @@
-
-#ifdef ZEND_ENGINE_2
-
+static 
-{
-        int cname_len = to->name_length;
@@ -733 +759 @@
-#endif
-
-
+static 
-{
-        zend_class_entry *old;

eaccelerator/trunk/ea_restore.h

@@ -30 +30 @@
-
-#define FIXUP(x) if((x)!=NULL) {(x) = (void*)(((char*)(x)) + ((long)(EAG(mem))));}
-void fixup_op_array(ea_op_array *from TSRMLS_DC);
-void fixup_class_entry(ea_class_entry *from TSRMLS_DC);
-void fixup_zval(zval *z TSRMLS_DC);
+void eaccelerator_fixup (ea_cache_entry * p TSRMLS_DC);
-
-void restore_zval(zval *zv TSRMLS_DC);
@@ -38 +37 @@
-void restore_function(ea_fc_entry *p TSRMLS_DC);
-zend_op_array* restore_op_array(zend_op_array *to, ea_op_array *from TSRMLS_DC);
-zend_class_entry *restore_class_entry(zend_class_entry *to, ea_class_entry *from TSRMLS_DC);
-void restore_class_parent(char *parent, int len, zend_class_entry *to TSRMLS_DC);
-#ifdef ZEND_ENGINE_2
-void restore_class_methods(zend_class_entry *to TSRMLS_DC);
-#endif
-
-dtor_func_t get_zend_destroy_property_info(TSRMLS_D);

eaccelerator/trunk/ea_store.c

@@ -79 +79 @@
-        calc_string(from->name, from->name_length + 1 TSRMLS_CC);
-}
-
-
-/* Calculate the size of a point to a class entry */
-/* not used
-static void calc_class_entry_ptr(zend_class_entry ** from TSRMLS_DC)
-{
-        calc_class_entry(*from TSRMLS_CC);
-}
-*/
-#endif
-
@@ -136 +127 @@
-
-/* Calculate the size of an op_array */
-
+static 
-{
-        zend_op *opline;
@@ -234 +225 @@
-
-/* Calculate the size of a class entry */
-
+static 
-{
-        if (from->type != ZEND_USER_CLASS) {
@@ -274 +265 @@
-/* Calculate the size of a cache entry with its given op_array and function and
-   class bucket */
-
-
+
-{
-        Bucket *b;
@@ -366 +356 @@
-}
-
-
+ 
-                                                   Bucket * start, store_bucket_t copy_bucket,
-                                                                   check_bucket_t check_bucket,
@@ -473 +463 @@
-}
-
-
+static 
-{
-        ea_op_array *to;
@@ -785 +775 @@
-#endif
-
-
+static 
-{
-        ea_class_entry *to;
@@ -883 +873 @@
-}
-
+/* Create a cache entry from the given op_array, functions and classes of a
+   script */
+ea_cache_entry *eaccelerator_store_int (char *key, int len, 
+        zend_op_array *op_array, Bucket *f, Bucket *c TSRMLS_DC)
+{
+    ea_cache_entry *p;
+    ea_fc_entry *fc;
+    ea_fc_entry *q;
+    char *x;
+
+    DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
+    DBG(ea_debug_printf, (EA_DEBUG, "[%d] eaccelerator_store_int: key='%s'\n", 
+                getpid (), key));
+
+    EAG (compress) = 1;
+    zend_hash_init (&EAG (strings), 0, NULL, NULL, 0);
+    p = (ea_cache_entry *) EAG (mem);
+    EAG (mem) += offsetof (ea_cache_entry, realfilename) + len + 1;
+
+    p->nhits = 0;
+    p->use_cnt = 0;
+    p->removed = 0;
+    p->f_head = NULL;
+    p->c_head = NULL;
+    memcpy (p->realfilename, key, len + 1);
+    x = p->realfilename;
+    zend_hash_add (&EAG (strings), key, len + 1, &x, sizeof (char *), NULL);
+
+    q = NULL;
+    while (c != NULL) {
+        DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
+        DBG(ea_debug_printf, (EA_DEBUG, 
+                    "[%d] eaccelerator_store_int:     class hashkey=", getpid ()));
+        DBG(ea_debug_binary_print, (EA_DEBUG, c->arKey, c->nKeyLength));
+
+        EACCELERATOR_ALIGN (EAG (mem));
+        fc = (ea_fc_entry *) EAG (mem);
+        EAG (mem) += offsetof (ea_fc_entry, htabkey) + c->nKeyLength;
+        memcpy (fc->htabkey, c->arKey, c->nKeyLength);
+        fc->htablen = c->nKeyLength;
+        fc->next = NULL;
+#ifdef ZEND_ENGINE_2
+        fc->fc = *(zend_class_entry **) c->pData;
+#else
+        fc->fc = c->pData;
+#endif
+        c = c->pListNext;
+        x = fc->htabkey;
+        zend_hash_add (&EAG (strings), fc->htabkey, fc->htablen, &x, 
+                sizeof (char *), NULL);
+        if (q == NULL) {
+            p->c_head = fc;
+        } else {
+            q->next = fc;
+        }
+        q = fc;
+    }
+
+    q = NULL;
+    while (f != NULL) {
+        DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
+        DBG(ea_debug_printf, (EA_DEBUG, 
+                    "[%d] eaccelerator_store_int:     function hashkey='%s'\n", getpid (), f->arKey));
+
+        EACCELERATOR_ALIGN (EAG (mem));
+        fc = (ea_fc_entry *) EAG (mem);
+        EAG (mem) += offsetof (ea_fc_entry, htabkey) + f->nKeyLength;
+        memcpy (fc->htabkey, f->arKey, f->nKeyLength);
+        fc->htablen = f->nKeyLength;
+        fc->next = NULL;
+        fc->fc = f->pData;
+        f = f->pListNext;
+        x = fc->htabkey;
+        zend_hash_add (&EAG (strings), fc->htabkey, fc->htablen, &x,
+                sizeof (char *), NULL);
+        if (q == NULL) {
+            p->f_head = fc;
+        } else {
+            q->next = fc;
+        }
+        q = fc;
+    }
+
+    q = p->c_head;
+    while (q != NULL) {
+        q->fc = store_class_entry ((zend_class_entry *) q->fc TSRMLS_CC);
+        q = q->next;
+    }
+
+    q = p->f_head;
+    while (q != NULL) {
+        q->fc = store_op_array ((zend_op_array *) q->fc TSRMLS_CC);
+        q = q->next;
+    }
+    p->op_array = store_op_array (op_array TSRMLS_CC);
+
+    zend_hash_destroy (&EAG (strings));
+    return p;
+}
+
-#endif /* HAVE_EACCELERATOR */

eaccelerator/trunk/ea_store.h

@@ -31 +31 @@
-void calc_zval(zval *z TSRMLS_DC);
-int calc_size(char *key, zend_op_array *op_array, Bucket *f, Bucket *c TSRMLS_DC);
-void calc_op_array(zend_op_array *from TSRMLS_DC);
-void calc_class_entry(zend_class_entry *from TSRMLS_DC);
-
-void store_zval(zval *z TSRMLS_DC);
-
-
-
+
-
-#endif /* EA_STORE_H */

eaccelerator/trunk/eaccelerator.c

@@ -564 +564 @@
-}
-
-void eaccelerator_fixup (ea_cache_entry * p TSRMLS_DC)
-{
-  ea_fc_entry *q;
-
-  EAG (mem) = (char *) ((long) p - (long) p->next);
-  EAG (compress) = 1;
-  p->next = NULL;
-  FIXUP (p->op_array);
-  FIXUP (p->f_head);
-  FIXUP (p->c_head);
-  fixup_op_array (p->op_array TSRMLS_CC);
-  q = p->f_head;
-  while (q != NULL) {
-    FIXUP (q->fc);
-    fixup_op_array ((ea_op_array *) q->fc TSRMLS_CC);
-    FIXUP (q->next);
-    q = q->next;
-  }
-  q = p->c_head;
-  while (q != NULL) {
-    FIXUP (q->fc);
-    fixup_class_entry ((ea_class_entry *) q->fc TSRMLS_CC);
-    FIXUP (q->next);
-    q = q->next;
-  }
-}
-
-/******************************************************************************/
-       
+  
-/******************************************************************************/
-
-/* Retrieve a cache entry from the cache directory */
-
-
+
-  int f;
-  char s[MAXPATHLEN];
@@ -737 +709 @@
-  }
-  return ret;
-}
-
-/* Create a cache entry from the given op_array, functions and classes of a
-   script */
-static ea_cache_entry *eaccelerator_store_int (char *key, int len, 
-        zend_op_array * op_array, Bucket * f, Bucket * c TSRMLS_DC)
-{
-  ea_cache_entry *p;
-  ea_fc_entry *fc;
-  ea_fc_entry *q;
-  char *x;
-
-  DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-  DBG(ea_debug_printf, (EA_DEBUG, "[%d] eaccelerator_store_int: key='%s'\n", 
-          getpid (), key));
-
-  EAG (compress) = 1;
-  zend_hash_init (&EAG (strings), 0, NULL, NULL, 0);
-  p = (ea_cache_entry *) EAG (mem);
-  EAG (mem) += offsetof (ea_cache_entry, realfilename) + len + 1;
-
-  p->nhits = 0;
-  p->use_cnt = 0;
-  p->removed = 0;
-  p->f_head = NULL;
-  p->c_head = NULL;
-  memcpy (p->realfilename, key, len + 1);
-  x = p->realfilename;
-  zend_hash_add (&EAG (strings), key, len + 1, &x, sizeof (char *), NULL);
-
-  q = NULL;
-  while (c != NULL) {
-    DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-    DBG(ea_debug_printf, (EA_DEBUG, 
-            "[%d] eaccelerator_store_int:     class hashkey=", getpid ()));
-    DBG(ea_debug_binary_print, (EA_DEBUG, c->arKey, c->nKeyLength));
-
-    EACCELERATOR_ALIGN (EAG (mem));
-    fc = (ea_fc_entry *) EAG (mem);
-    EAG (mem) += offsetof (ea_fc_entry, htabkey) + c->nKeyLength;
-    memcpy (fc->htabkey, c->arKey, c->nKeyLength);
-    fc->htablen = c->nKeyLength;
-    fc->next = NULL;
-#ifdef ZEND_ENGINE_2
-    fc->fc = *(zend_class_entry **) c->pData;
-#else
-    fc->fc = c->pData;
-#endif
-    c = c->pListNext;
-    x = fc->htabkey;
-    zend_hash_add (&EAG (strings), fc->htabkey, fc->htablen, &x, 
-            sizeof (char *), NULL);
-    if (q == NULL) {
-      p->c_head = fc;
-    } else {
-      q->next = fc;
-    }
-    q = fc;
-  }
-
-  q = NULL;
-  while (f != NULL) {
-      DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
-      DBG(ea_debug_printf, (EA_DEBUG, 
-              "[%d] eaccelerator_store_int:     function hashkey='%s'\n", getpid (), f->arKey));
-
-      EACCELERATOR_ALIGN (EAG (mem));
-      fc = (ea_fc_entry *) EAG (mem);
-      EAG (mem) += offsetof (ea_fc_entry, htabkey) + f->nKeyLength;
-      memcpy (fc->htabkey, f->arKey, f->nKeyLength);
-      fc->htablen = f->nKeyLength;
-      fc->next = NULL;
-      fc->fc = f->pData;
-      f = f->pListNext;
-      x = fc->htabkey;
-      zend_hash_add (&EAG (strings), fc->htabkey, fc->htablen, &x,
-              sizeof (char *), NULL);
-      if (q == NULL) {
-          p->f_head = fc;
-      } else {
-          q->next = fc;
-      }
-      q = fc;
-  }
-
-  q = p->c_head;
-  while (q != NULL) {
-      q->fc = store_class_entry ((zend_class_entry *) q->fc TSRMLS_CC);
-      q = q->next;
-  }
-
-  q = p->f_head;
-  while (q != NULL) {
-      q->fc = store_op_array ((zend_op_array *) q->fc TSRMLS_CC);
-      q = q->next;
-  }
-  p->op_array = store_op_array (op_array TSRMLS_CC);
-
-  zend_hash_destroy (&EAG (strings));
-  return p;
-}
-