Changeset 241

Timestamp:

07/25/06 14:31:24 (2 years ago)

Author:

bart

Message:

Fix restoring of opcode handler for php 5.0.5 when files are loaded

from disk cache. This fixes bug #147

Some update in the release notes for the upcoming rc1

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/NEWS (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (1 diff)
• eaccelerator/trunk/opcodes.c (modified) (1 diff)

eaccelerator/trunk/ChangeLog

@@ +1 @@
+2006-07-25  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
+
+        * Fix restoring of opcode handler for php 5.0.5 when files are loaded
+          from disk cache. This fixes bug #147
+        * Some update in the release notes for the upcoming rc1
+
-2006-07-24  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>
-

eaccelerator/trunk/NEWS

@@ -19 +19 @@
-        - Memory footprint should be reduced because redundant information in
-          the cached scripts is no longer stored.
+        - File hashing in the cache directory to improve performance with a 
+          big amount of cache files.
-    WARNING: The encoder and loader DO not support php 5.1 nor php 5.0 and contain
-    a lot of bug for php 4. This is the last release the encoder/loader 
-    functionality will be available. Maybe later a new encoder/loader will be 
-    included but there aren't any plans for that.
+    As always all patches and help are more then welcome.
-    
-

eaccelerator/trunk/ea_restore.c

@@ -222 +222 @@
-#  ifdef ZEND_ENGINE_2_1
-                        ZEND_VM_SET_OPCODE_HANDLER(opline);
+#  elif defined(ZEND_ENGINE_2)
+            opline->handler = zend_opcode_handlers[opline->opcode];
-#  else
-                        opline->handler = get_opcode_handler(opline->opcode TSRMLS_CC);

eaccelerator/trunk/opcodes.c

@@ -261 +261 @@
-}
-#endif
-
-#ifdef ZEND_ENGINE_2
-static opcode_handler_t eaccelerator_opcode_handlers[LAST_OPCODE];
-static int handlers_retrived = 0;
-
-ZEND_DLEXPORT void retrive_opcode_handlers_handler(zend_op_array *op_array) {
-  unsigned char i;
-  efree(op_array->opcodes);
-  op_array->opcodes = (zend_op*)emalloc(sizeof(zend_op)*(LAST_OPCODE));
-  op_array->last = LAST_OPCODE;
-  op_array->size = LAST_OPCODE;
-  op_array->T    = 0;
-  for (i=0; i<LAST_OPCODE; i++) {
-    op_array->opcodes[i].opcode = i;
-    op_array->opcodes[i].op1.op_type = IS_UNUSED;
-    op_array->opcodes[i].op1.u.opline_num = i;
-    op_array->opcodes[i].op2.op_type = IS_UNUSED;
-    op_array->opcodes[i].op2.u.opline_num = i;
-    op_array->opcodes[i].result.op_type = IS_UNUSED;
-  }
-}
-
-static int retrive_opcode_handlers(TSRMLS_D) {
-  zend_extension* ext;
-
-  if ((ext = zend_get_extension(EACCELERATOR_EXTENSION_NAME)) != NULL) {
-    zend_op_array* p;
-    zval str;
-    void (*old)(zend_op_array *o_a);
-
-    str.type = IS_STRING;
-    str.is_ref = 1;
-    str.refcount = 2;
-
-    Z_STRVAL(str) = "return 1;";
-    Z_STRLEN(str) = 9;
-    old = ext->op_array_handler;
-    ext->op_array_handler = retrive_opcode_handlers_handler;
-    p = compile_string(&str, empty_string TSRMLS_CC);
-    ext->op_array_handler = old;
-    if (p != NULL && p->last == (LAST_OPCODE - 1)) {
-      int i = 0;
-      while (i < LAST_OPCODE) {
-         eaccelerator_opcode_handlers[p->opcodes[i].opcode] = p->opcodes[i].handler;
-         ++i;
-      }
-      return 1;
-    }
-  }
-  return 0;
-}
-
-opcode_handler_t get_opcode_handler(zend_uchar opcode TSRMLS_DC) {
-  if (!handlers_retrived) {
-    if (retrive_opcode_handlers(TSRMLS_C)) {
-      handlers_retrived = 1;
-    } else {
-      return NULL;
-    }
-  }
-  if (opcode < LAST_OPCODE) {
-    return eaccelerator_opcode_handlers[opcode];
-  } else {
-    return (opcode_handler_t) NULL;
-  }
-}
-#endif