Changeset 641

Timestamp:

2009-07-05T16:56:27+02:00 (4 years ago)

Author:

moo

Message:

merged r637,r634,r640 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• utils.c (modified) (2 diffs)
• utils.h (modified) (1 diff)
• xcache.c (modified) (6 diffs)

branches/1.3/utils.c

@@ -554 +554 @@
 #endif
 
-static void xc_copy_zend_constant(zend_constant *c) /* {{{ */
-{
+void xc_hash_copy_if(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, xc_if_func_t checker) /* {{{ */
+{
+    Bucket *p;
+    void *new_entry;
+    zend_bool setTargetPointer;
+
+    setTargetPointer = !target->pInternalPointer;
+    p = source->pListHead;
+    while (p) {
+        if (checker(p->pData)) {
+            if (setTargetPointer && source->pInternalPointer == p) {
+                target->pInternalPointer = NULL;
+            }
+            if (p->nKeyLength) {
+                zend_hash_quick_update(target, p->arKey, p->nKeyLength, p->h, p->pData, size, &new_entry);
+            } else {
+                zend_hash_index_update(target, p->h, p->pData, size, &new_entry);
+            }
+            if (pCopyConstructor) {
+                pCopyConstructor(new_entry);
+            }
+        }
+        p = p->pListNext;
+    }
+    if (!target->pInternalPointer) {
+        target->pInternalPointer = target->pListHead;
+    }
+}
+/* }}} */
+#ifdef HAVE_XCACHE_CONSTANT
+static zend_bool xc_is_internal_zend_constant(zend_constant *c) /* {{{ */
+{
+    return (c->flags & CONST_PERSISTENT) ? 1 : 0;
+}
+/* }}} */
+void xc_zend_constant_ctor(zend_constant *c) /* {{{ */
+{
+    assert((c->flags & CONST_PERSISTENT));
+#ifdef IS_UNICODE
+    c->name.u = zend_ustrndup(c->name.u, c->name_len - 1);
+#else
     c->name = zend_strndup(c->name, c->name_len - 1);
-    if (!(c->flags & CONST_PERSISTENT)) {
-        zval_copy_ctor(&c->value);
-    }
-}
-/* }}} */
+#endif
+}
+/* }}} */
+void xc_zend_constant_dtor(zend_constant *c) /* {{{ */
+{
+    free(ZSTR_U(c->name));
+}
+/* }}} */
+void xc_copy_internal_zend_constants(HashTable *target, HashTable *source) /* {{{ */
+{
+    zend_constant tmp_const;
+    xc_hash_copy_if(target, source, (copy_ctor_func_t) xc_zend_constant_ctor, (void *) &tmp_const, sizeof(zend_constant), (xc_if_func_t) xc_is_internal_zend_constant);
+}
+/* }}} */
+#endif
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC) /* {{{ */
 {
@@ -599 +648 @@
     h = OG(zend_constants);
     zend_hash_init_ex(&TG(zend_constants),  20, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
+    xc_copy_internal_zend_constants(&TG(zend_constants), &XG(internal_constant_table));
     {
         zend_constant tmp_const;
-        zend_hash_copy(&TG(zend_constants), &XG(internal_constant_table), (copy_ctor_func_t) xc_copy_zend_constant, (void *) &tmp_const, sizeof(tmp_const));
+        zend_hash_copy(&TG(zend_constants), &XG(internal_constant_table), (copy_ctor_func_t) xc_zend_constant_ctor, (void *) &tmp_const, sizeof(tmp_const));
     }
 #endif

branches/1.3/utils.h

@@ -119 +119 @@
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC);
 void xc_sandbox_free(xc_sandbox_t *sandbox, xc_install_action_t install TSRMLS_DC);
+
+typedef zend_bool (*xc_if_func_t)(void *data);
+
+void xc_hash_copy_if(HashTable *target, HashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, xc_if_func_t checker);
+#ifdef HAVE_XCACHE_CONSTANT
+void xc_zend_constant_ctor(zend_constant *c);
+void xc_zend_constant_dtor(zend_constant *c);
+void xc_copy_internal_zend_constants(HashTable *target, HashTable *source);
+#endif

branches/1.3/xcache.c

@@ -1585 +1585 @@
 }
 /* }}} */
-static void xc_copy_zend_constant(zend_constant *c) /* {{{ */
-{
-    c->name = zend_strndup(c->name, c->name_len - 1);
-    if (!(c->flags & CONST_PERSISTENT)) {
-        zval_copy_ctor(&c->value);
-    }
-}
-/* }}} */
 static void xc_request_init(TSRMLS_D) /* {{{ */
 {
@@ -1598 +1590 @@
 
     if (!XG(internal_table_copied)) {
-#ifdef HAVE_XCACHE_CONSTANT
-        zend_constant tmp_const;
-#endif
         zend_function tmp_func;
         xc_cest_t tmp_cest;
@@ -1611 +1600 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-        zend_hash_init_ex(&XG(internal_constant_table), 20,  NULL, NULL, 1, 0);
+        zend_hash_init_ex(&XG(internal_constant_table), 20,  NULL, (dtor_func_t) xc_zend_constant_dtor, 1, 0);
 #endif
         zend_hash_init_ex(&XG(internal_function_table), 100, NULL, NULL, 1, 0);
@@ -1617 +1606 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-        zend_hash_copy(&XG(internal_constant_table), EG(zend_constants), (copy_ctor_func_t) xc_copy_zend_constant, &tmp_const, sizeof(tmp_const));
+        xc_copy_internal_zend_constants(&XG(internal_constant_table), EG(zend_constants));
 #endif
         zend_hash_copy(&XG(internal_function_table), CG(function_table), NULL, &tmp_func, sizeof(tmp_func));
@@ -1678 +1667 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
-    zend_hash_init_ex(&xcache_globals->internal_constant_table, 1, NULL, NULL, 1, 0);
+    zend_hash_init_ex(&xcache_globals->internal_constant_table, 1, NULL, (dtor_func_t) xc_zend_constant_dtor, 1, 0);
 #endif
     zend_hash_init_ex(&xcache_globals->internal_function_table, 1, NULL, NULL, 1, 0);
@@ -1958 +1947 @@
         default:
 #ifdef IS_UNICODE
-            convert_to_text(name);
+            convert_to_unicode(name);
 #else
             convert_to_string(name);