Changeset 356

Timestamp:

06/22/09 09:48:49 (15 months ago)

Author:

bart

Message:

Sync with  http://hg.vanbrabant.eu/hg/bart/eaccelerator/

Location:

eaccelerator/trunk

Files:

• cache.c (modified) (2 diffs)
• config.m4 (modified) (1 diff)
• ea_restore.c (modified) (4 diffs)
• ea_store.c (modified) (1 diff)
• eaccelerator.h (modified) (1 diff)
• opcodes.c (modified) (4 diffs)

eaccelerator/trunk/cache.c

@@ -357 +357 @@
             p = p->next;
         }
-        EACCELERATOR_UNLOCK_RW();
-        EACCELERATOR_PROTECT();
         if (x) {
             memcpy(return_value, &x->value, sizeof(zval));
             restore_zval(return_value TSRMLS_CC);
+            EACCELERATOR_UNLOCK_RW();
+            EACCELERATOR_PROTECT();
             if (xlen != key_len) {
                 efree(xkey);
@@ -367 +367 @@
             return 1;
         }
+        EACCELERATOR_UNLOCK_RW();
+        EACCELERATOR_PROTECT();
     }
 

eaccelerator/trunk/config.m4

@@ -369 +369 @@
   fi
 
-  AC_CHECK_FUNC(sched_yield,[
-      AC_DEFINE(HAVE_SCHED_YIELD, 1, [Define if ou have sched_yield function])
-    ])
-
   AC_CHECK_FUNC(mprotect,[
       AC_DEFINE(HAVE_MPROTECT, 1, [Define if ou have mprotect function])

eaccelerator/trunk/ea_restore.c

@@ -277 +277 @@
     restore_zval(p TSRMLS_CC);
     /* hrak: reset refcount to make sure there is one reference to this val, and prevent memleaks */
-    RESET_PZVAL_REFCOUNT(p);
+#ifdef ZEND_ENGINE_2_3
+    Z_SET_REFCOUNT_P(p, 1);
+#else
+    p->refcount = 1;
+#endif
     return p;
 }
@@ -352 +356 @@
     case IS_OBJECT:
     case IS_STRING:
-        if (Z_STRVAL_P(zv) == NULL || Z_STRLEN_P(zv) == 0) {
+        if (Z_STRVAL_P(zv) == NULL || Z_STRVAL_P(zv) == "" || Z_STRLEN_P(zv) == 0) {
             Z_STRLEN_P(zv) = 0;
             Z_STRVAL_P(zv) = empty_string;
@@ -541 +545 @@
 #ifdef ZEND_ENGINE_2_3
     to->this_var = from->this_var;
+    to->early_binding = from->early_binding;
 #else
     to->uses_this = from->uses_this;
@@ -557 +562 @@
         to->static_variables = restore_zval_hash(NULL, from->static_variables);
         to->static_variables->pDestructor = ZVAL_PTR_DTOR;
-        if (EAG(class_entry) != NULL) {
-            Bucket *p = to->static_variables->pListHead;
-            while (p != NULL) {
-                RESET_PZVAL_REFCOUNT((zval*) p->pDataPtr);
-                p = p->pListNext;
-            }
-        }
     }
 

eaccelerator/trunk/ea_store.c

@@ -563 +563 @@
 #ifdef ZEND_ENGINE_2_3
     to->this_var = from->this_var;
+    to->early_binding = from->early_binding;
 #else
     to->uses_this = from->uses_this;

eaccelerator/trunk/eaccelerator.h

@@ -204 +204 @@
         zend_uchar type;
 #ifdef ZEND_ENGINE_2_3
+    zend_uint early_binding;
     zend_uint this_var;
 #else

eaccelerator/trunk/opcodes.c

@@ -36 +36 @@
 #endif
 
-#define OP1_VAR_2 OP1_STD
+#  define OP1_VAR_2 OP1_STD
 
 #define LAST_OPCODE (sizeof(opcodes)/sizeof(opcodes[0]))
@@ -101 +101 @@
   OPDEF("END_SILENCE",               EXT_UNUSED | OP1_TMP    | OP2_UNUSED | RES_UNUSED), /* 58 */
   OPDEF("INIT_FCALL_BY_NAME",        EXT_INIT_FCALL | OP1_STD | OP2_STD   | RES_UNUSED), /* 59 */
-  OPDEF("DO_FCALL",                  EXT_FCALL  | OP1_STD    | OP2_OPLINE | RES_VAR), /* 60 */
-  OPDEF("DO_FCALL_BY_NAME",          EXT_FCALL  | OP1_STD    | OP2_OPLINE | RES_VAR), /* 61 */
+  OPDEF("DO_FCALL",                  EXT_FCALL  | OP1_STD    | OP2_UNUSED | RES_VAR), /* 60 */
+  OPDEF("DO_FCALL_BY_NAME",          EXT_FCALL  | OP1_UNUSED | OP2_UNUSED | RES_VAR), /* 61 */
   OPDEF("RETURN",                    EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_UNUSED), /* 62 */
   OPDEF("RECV",                      EXT_UNUSED | OP1_ARG    | OP2_UNUSED | RES_VAR), /* 63 */
@@ -145 +145 @@
   OPDEF("FETCH_DIM_TMP_VAR",         EXT_UNUSED | OP1_STD    | OP2_STD    | RES_VAR), /* 98 */
   OPDEF("FETCH_CONSTANT",            EXT_UNUSED | OP1_UCLASS | OP2_STD    | RES_TMP), /* 99 */
-  OPDEF("FETCH_CONSTANT",            EXT_UNUSED | OP1_STD    | OP2_UNUSED | RES_TMP), /* 99 */
   OPDEF("DECLARE_FUNCTION_OR_CLASS", EXT_DECLARE| OP1_STD    | OP2_STD    | RES_UNUSED), /* 100 */
   OPDEF("EXT_STMT",                  EXT_STD    | OP1_STD    | OP2_STD    | RES_STD), /* 101 */
@@ -199 +198 @@
   OPDEF("ASSIGN_DIM",                EXT_UNUSED | OP1_STD    | OP2_STD    | RES_VAR),  /* 147 */
   OPDEF("ISSET_ISEMPTY_PROP_OBJ",    EXT_ISSET  | OP1_STD    | OP2_STD    | RES_TMP), /* 148 */
-  OPDEF("HANDLE_EXCEPTION",          EXT_STD    | OP1_UNUSED | OP2_UNUSED | RES_STD)  /* 149 */
+  OPDEF("HANDLE_EXCEPTION",          EXT_STD    | OP1_UNUSED | OP2_UNUSED | RES_STD),  /* 149 */
+  OPDEF("USER_OPCODE",               EXT_STD    | OP1_UNUSED | OP2_UNUSED | RES_STD)  /* 150 */
 # ifdef ZEND_ENGINE_2_3
   ,