Changeset 248

Timestamp:

07/27/06 15:38:44 (2 years ago)

Author:

bart

Message:

Fix bug #145, objects are serialized when they are stored in shared memory.

Users don't have to do this in their code anymore.

Files:

• eaccelerator/trunk/ChangeLog (modified) (1 diff)
• eaccelerator/trunk/ea_restore.c (modified) (4 diffs)
• eaccelerator/trunk/ea_store.c (modified) (4 diffs)
• eaccelerator/trunk/shm.c (modified) (4 diffs)

eaccelerator/trunk/ChangeLog

@@ -7 +7 @@
-        * Some fixes to make eAccelerator compile with php 5.2, this fixes bug #150
-        * Restore __toString methods correctly with php 5.2
+        * Fix bug #145, objects are serialized when they are stored in shared memory.
+          Users don't have to do this in their code anymore.
-
-2006-07-25  Bart Vanbrabant <bart.vanbrabant at zoeloelip.be>

eaccelerator/trunk/ea_restore.c

@@ -144 +144 @@
-        switch (Z_TYPE_P(zv) & ~IS_CONSTANT_INDEX) {
-        case IS_CONSTANT:                       /* fallthrough */
+    case IS_OBJECT:             /* fallthrough: object are serialized */
-        case IS_STRING:
-                FIXUP(Z_STRVAL_P(zv));
@@ -152 +153 @@
-                fixup_zval_hash(Z_ARRVAL_P(zv));
-                break;
-        case IS_OBJECT:
-                if (!EAG(compress)) {
-                        return;
-                }
-#ifndef ZEND_ENGINE_2
-                FIXUP(Z_OBJCE_P(zv));
-                if (Z_OBJPROP_P(zv) != NULL) {
-                        FIXUP(Z_OBJPROP_P(zv));
-                        fixup_zval_hash(Z_OBJPROP_P(zv));
-                }
-#endif
-        default:
-                break;
@@ -372 +362 @@
-        switch (zv->type & ~IS_CONSTANT_INDEX) {
-        case IS_CONSTANT:
+    case IS_OBJECT:
-        case IS_STRING:
-                if (Z_STRVAL_P(zv) == NULL || Z_STRVAL_P(zv) == "" || Z_STRLEN_P(zv) == 0) {
@@ -391 +382 @@
-                }
-                return;
-
-        case IS_OBJECT:
-    {
-#ifndef ZEND_ENGINE_2
-        zend_bool incomplete_class = 0;
-        char *class_name = (char *) Z_OBJCE_P(zv);
-        int name_len = 0;
-        if (!EAG(compress)) {
-            return;
-        }
-        if (class_name != NULL) {
-            zend_class_entry *ce = NULL;
-            name_len = strlen(class_name);
-            if (zend_hash_find(CG(class_table), (void *) class_name, name_len + 1, (void **) &ce) != SUCCESS) {
-                char *lowercase_name = estrndup(INCOMPLETE_CLASS, sizeof(INCOMPLETE_CLASS));
-                zend_str_tolower(lowercase_name, sizeof(INCOMPLETE_CLASS));
-                if (zend_hash_find(CG(class_table), lowercase_name, sizeof(INCOMPLETE_CLASS), (void **) &ce) != SUCCESS) {
-                    efree(lowercase_name);
-                    zend_error(E_ERROR, "EACCELERATOR can't restore object's class \"%s\"", class_name);
-                } else {
-                    efree(lowercase_name);
-                    Z_OBJCE_P(zv) = ce;
-                    incomplete_class = 1;
-                }
-            } else {
-                Z_OBJCE_P(zv) = ce;
-            }
-        }
-        if (Z_OBJPROP_P(zv) != NULL) {
-            Z_OBJPROP_P(zv) = restore_zval_hash(NULL, Z_OBJPROP_P(zv));
-            Z_OBJPROP_P(zv)->pDestructor = ZVAL_PTR_DTOR;
-            /* Clearing references */
-            {
-                Bucket *p = Z_OBJPROP_P(zv)->pListHead;
-                while (p != NULL) {
-                    ((zval *) (p->pDataPtr))->refcount = 1;
-                    p = p->pListNext;
-                }
-            }
-        }
-        if (incomplete_class && class_name != NULL) {
-            zval *val;
-            MAKE_STD_ZVAL(val);
-            Z_TYPE_P(val) = IS_STRING;
-            Z_STRVAL_P(val) = estrndup(class_name, name_len);
-            Z_STRLEN_P(val) = name_len;
-            zend_hash_update(Z_OBJPROP_P(zv), MAGIC_MEMBER, sizeof(MAGIC_MEMBER), &val, sizeof(val), NULL);
-        }
-#endif
-        return;
-    }
-        }
-}

eaccelerator/trunk/ea_store.c

@@ -115 +115 @@
-        switch (Z_TYPE_P(zv) & ~IS_CONSTANT_INDEX) {
-        case IS_CONSTANT:
+    case IS_OBJECT: /* object should have been serialized before storing them */
-        case IS_STRING:
-                calc_string(Z_STRVAL_P(zv), Z_STRLEN_P(zv) + 1 TSRMLS_CC);
@@ -126 +127 @@
-                }
-                break;
-        case IS_OBJECT:
-#ifndef ZEND_ENGINE_2
-                if (Z_OBJCE_P(zv) != NULL) {
-                        zend_class_entry *ce = Z_OBJCE_P(zv);
-                        if (!EAG(compress)) {
-                                DBG(ea_debug_error, ("[%d] EACCELERATOR can't cache objects\n", getpid()));
-                                zend_bailout();
-                        }
-                        while (ce != NULL) {
-                                if (ce->type != ZEND_USER_CLASS && strcmp(ce->name, "stdClass") != 0) {
-                                        DBG(ea_debug_error, ("[%d] EACCELERATOR can't cache objects\n", getpid()));
-                                        zend_bailout();
-                                }
-                                ce = ce->parent;
-                        }
-                        calc_string(Z_OBJCE_P(zv)->name, Z_OBJCE_P(zv)->name_length + 1 TSRMLS_CC);
-                }
-                if (Z_OBJPROP_P(zv) != NULL) {
-                        EACCELERATOR_ALIGN(EAG(mem));
-                        EAG(mem) += sizeof(HashTable);
-                        calc_zval_hash(Z_OBJPROP_P(zv));
-                }
-#endif
-                return;
-        case IS_RESOURCE:
-                DBG(ea_debug_error, ("[%d] EACCELERATOR can't cache resources\n", getpid()));
@@ -476 +453 @@
-        switch (Z_TYPE_P(zv) & ~IS_CONSTANT_INDEX) {
-        case IS_CONSTANT:
+    case IS_OBJECT: /* object should have been serialized before storing them */
-        case IS_STRING:
-                Z_STRVAL_P(zv) = store_string(Z_STRVAL_P(zv), Z_STRLEN_P(zv) + 1 TSRMLS_CC);
@@ -490 +468 @@
-                }
-                break;
-        case IS_OBJECT:
-                if (!EAG(compress)) {
-                        return;
-                }
-#ifndef ZEND_ENGINE_2
-                if (Z_OBJCE_P(zv) != NULL) {
-                        char *s = store_string(Z_OBJCE_P(zv)->name, Z_OBJCE_P(zv)->name_length + 1 TSRMLS_CC);
-                        zend_str_tolower(s, Z_OBJCE_P(zv)->name_length);
-                        Z_OBJCE_P(zv) = (zend_class_entry *) s;
-                }
-                if (Z_OBJPROP_P(zv) != NULL) {
-                        HashTable *p;
-                        EACCELERATOR_ALIGN(EAG(mem));
-                        p = (HashTable *) EAG(mem);
-                        EAG(mem) += sizeof(HashTable);
-                        store_zval_hash(p, Z_OBJPROP_P(zv));
-                        Z_OBJPROP_P(zv) = p;
-                }
-#endif
-        default:
-                break;

eaccelerator/trunk/shm.c

@@ -38 +38 @@
-#include "zend_API.h"
-#include "zend_extensions.h"
+#include "standard/php_var.h"
-
-/* where to cache the keys */
@@ -102 +103 @@
-        char *key;
-        int key_len;
-
+, *result
-        time_t ttl = 0;
-        long where = eaccelerator_keys_cache_place;
@@ -109 +110 @@
-                return;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                RETURN_TRUE;
-        } else {
@@ -121 +141 @@
-        int key_len;
-        long where = eaccelerator_keys_cache_place;
+    zval *value;
-
-        if (zend_parse_parameters (ZEND_NUM_ARGS ()TSRMLS_CC, "s|l", &key, &key_len, &where) == FAILURE)
-                return;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-                RETURN_NULL ();