php_vm 1.1.1 → 1.1.2

data/README.md

@@ -21,3 +21,8 @@ Install PHP (sapi/embed)
 	$ ./configure --prefix=/usr/local --enable-embed=shared --disable-cli --disable-cgi --without-pear
 	$ make
 	$ sudo make install
+
+
+Examples
+------
+https://github.com/yoshida-eth0/ruby-php_vm/tree/master/sample

data/ext/php_vm/php_vm.c

@@ -118,6 +118,8 @@ int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval)
 	int result = FAILURE;
 
 	if (ce->constructor) {
+		TSRMLS_FETCH();
+
 		// defined constructor
 /*
 		if (!(ce->constructor->common.fn_flags & ZEND_ACC_PUBLIC)) {
@@ -310,6 +312,8 @@ VALUE get_callee_name()
 
 VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int argc, VALUE *argv)
 {
+	TSRMLS_FETCH();
+
 	// callee
 	if (callee==Qnil) {
 		VALUE exception = rb_exc_new2(rb_ePHPError, "callee is nil");
@@ -351,6 +355,9 @@ VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int
 				zend_update_static_property(ce, RSTRING_PTR(callee), RSTRING_LEN(callee), z_val TSRMLS_CC);
 			}
 
+			// release
+			zval_ptr_dtor(&z_val);
+
 			return Qnil;
 		} else {
 			// getter
@@ -372,6 +379,10 @@ VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int
 
 void php_native_resource_delete(PHPNativeResource *p)
 {
+	if (p->zobj) {
+		zval_ptr_dtor(&p->zobj);
+		p->zobj = NULL;
+	}
 	free(p);
 }
 
@@ -440,6 +451,7 @@ VALUE rb_php_vm_require_once(VALUE cls, VALUE filepath)
 
 VALUE rb_php_vm_exec(VALUE cls, VALUE code)
 {
+	TSRMLS_FETCH();
 	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code) TSRMLS_CC);
 	return Qnil;
 }
@@ -493,7 +505,7 @@ VALUE rb_php_class_initialize(VALUE self, VALUE v_name)
 	VALUE resource = Data_Wrap_Struct(CLASS_OF(self), 0, php_native_resource_delete, p);
 	rb_iv_set(self, "php_native_resource", resource);
 
-	// define php static methods
+	// define php static properties and methods
 	define_php_properties(self, *ce, 1);
 	define_php_methods(self, *ce, 1);
 
@@ -510,6 +522,7 @@ VALUE rb_php_class_new(int argc, VALUE *argv, VALUE self)
 	VALUE args;
 	rb_scan_args(argc, argv, "*", &args);
 
+	// alloc
 	VALUE obj = Qnil;
 	zend_class_entry *ce = get_zend_class_entry(self);
 	if (is_exception_zend_class_entry(ce)) {
@@ -519,7 +532,7 @@ VALUE rb_php_class_new(int argc, VALUE *argv, VALUE self)
 	}
 	rb_php_object_initialize(obj, self, args);
 
-	// define php instance method
+	// define php instance properties and methods
 	define_php_properties(obj, ce, 0);
 	define_php_methods(obj, ce, 0);
 
@@ -614,6 +627,7 @@ VALUE rb_php_exception_object_initialize(int argc, VALUE *argv, VALUE self)
 
 void php_vm_module_init()
 {
+	TSRMLS_FETCH();
 	int argc = 1;
 	char *argv[2] = {"php_vm", NULL};
 	php_embed_init(argc, argv PTSRMLS_CC);
@@ -622,6 +636,7 @@ void php_vm_module_init()
 
 void php_vm_module_exit()
 {
+	TSRMLS_FETCH();
 	php_embed_shutdown(TSRMLS_C);
 }
 
@@ -641,7 +656,7 @@ void Init_php_vm()
 	rb_define_singleton_method(rb_mPHPVM, "exec", rb_php_vm_exec, 1);
 	rb_define_singleton_method(rb_mPHPVM, "getClass", rb_php_vm_getClass, 1);
 
-	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.1.1"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.1.2"));
 
 	// class PHPVM::PHPClass
 	rb_cPHPClass = rb_define_class_under(rb_mPHPVM, "PHPClass", rb_cObject);

data/ext/php_vm/php_vm_v2z.c

@@ -79,6 +79,8 @@ void value_to_zval(VALUE v, zval *z)
 			zval *resource_zobj = get_zval(v);
 			if (resource_zobj) {
 				// php native resource
+				//zval_ptr_dtor(&z);
+				zval_dtor(z);
 				*z = *resource_zobj;
 			} else {
 				// other to_s

data/ext/php_vm/php_vm_z2v.c

@@ -76,6 +76,8 @@ static VALUE zval_to_value_hash(HashTable* ht)
 
 static VALUE zval_to_value_object(zval *z)
 {
+	TSRMLS_FETCH();
+
 	// class name
 	const char *name = "";
 	zend_uint name_len = 0;
@@ -102,6 +104,9 @@ static VALUE zval_to_value_object(zval *z)
 		rb_iv_set(obj, "php_class", class);
 	}
 
+	// retain
+	Z_ADDREF_P(z);
+
 	// resource
 	PHPNativeResource *p = ALLOC(PHPNativeResource);
 	p->ce = get_zend_class_entry(class);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-24 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies: []
 description: php_vm is a native bridge between Ruby and PHP.
 email: