Changeset 17912

Timestamp:

10/04/08 12:24:59 (2 months ago)

Author:

piotras

Message:

Reduce memory usage. Basically limit memory abuse triggered by metadata object creation

Files:

• branches/branch-1-9/midgard/apis/php5/php_midgard_gobject.h (modified) (1 diff)
• branches/branch-1-9/midgard/apis/php5/php_midgard_gobject_generic.c (modified) (6 diffs)

branches/branch-1-9/midgard/apis/php5/php_midgard_gobject.h

@@ -53 +53 @@
-        const unsigned char *buffer, zend_uint buf_len, zend_unserialize_data *data TSRMLS_CC);
-
+void php_midgard_gobject_unset_property(zval *object, zval *member TSRMLS_CC);
+
-/* SIGNALS */
-void php_midgard_gobject_connect(INTERNAL_FUNCTION_PARAMETERS);

branches/branch-1-9/midgard/apis/php5/php_midgard_gobject_generic.c

@@ -542 +542 @@
-        
-        return;
+}
+
+void php_midgard_gobject_unset_property(zval *object, zval *member TSRMLS_DC)
+{
+        zend_class_entry *ce = Z_OBJCE_P(object);
+
+        SEPARATE_ARG_IF_REF(member);
+        zend_call_method_with_1_params(&object, ce, &ce->__unset, ZEND_UNSET_FUNC_NAME, NULL, member);
+        zval_ptr_dtor(&member);
-}
-
@@ -700 +709 @@
-
-                if(Z_TYPE_PP(zvalue) == IS_OBJECT) {
-
-
-
+
+
+
+
+
+
-                        //zend_objects_free_object_storage(pzo TSRMLS_CC);
+                        //pzo = NULL;
-                        //zend_objects_destroy_object(pzo, zo_handle TSRMLS_CC);
-
+
+
+
-                        //zval_dtor(*zvalue);
-
-
-
-
-
-
+
+
+
-                        zval_dtor(*zvalue);
-                        efree(*zvalue);
-
-
+
+
+
-                zend_hash_move_forward_ex(props, &iterator);
-        }
@@ -732 +745 @@
-                return;
-
+        if(&php_gobject->zo == NULL)
+                return;
+
-        zend_object_std_dtor(&php_gobject->zo TSRMLS_CC);
-
@@ -740 +756 @@
-        
-        } else if(G_OBJECT_TYPE_NAME(G_OBJECT(php_gobject->gobject)) != NULL){
-
+
-                if(G_IS_OBJECT(php_gobject->gobject)) {
-
-                        //__object_properties_dtor(&php_gobject->zo);
-                        g_object_unref(G_OBJECT(php_gobject->gobject));
@@ -750 +765 @@
-
-        php_gobject->gobject = NULL;
-
-        efree(php_gobject);
-
-        php_gobject = NULL;
+        object = NULL;
-}
-
@@ -792 +807 @@
-                        php_midgard_get_baseclass_ptr_by_name(G_OBJECT_TYPE_NAME(prop_gobject));
-
-
-php_midgard_gobject_new_with_gobject(prop_zobject, ce, prop_gobject, TRUE); /* SHOULD BE SET TO TRUE */
-
-zval *zprop
-MAKE_STD_ZVAL(zprop)
-
+      
+
+
+       (php_midgard_gobject *)zend_object_store_get_object(prop_zobject TSRMLS_CC)
+php_gobject->gobject = prop_gobject
+
-                zend_update_property(Z_OBJCE_P(zobject), zobject, 
-                                pspecs[i]->name, strlen(pspecs[i]->name), 
-zprop
+prop_zobject
-
-                g_value_unset(&oval);