php_vm 1.3.8 → 1.3.9

data/ext/php_vm/php_vm.c

@@ -32,7 +32,7 @@ static int php_embed_output_handler(const char *str, unsigned int str_length TSR
 	return str_length;
 }
 
-static void php_embed_error_handler(char *message)
+static void php_embed_error_handler(char *message TSRMLS_DC)
 {
 	VALUE proc = rb_cv_get(rb_mPHPVM, "@@error_handler");
 	VALUE report = rb_exc_new2(rb_ePHPErrorReporting, message);
@@ -77,9 +77,10 @@ void php_eval_string(char *code, int code_len TSRMLS_DC)
 	}
 
 	// exception
-	if (EG(exception)) {
-		VALUE exception = zval_to_value(EG(exception));
-		EG(exception) = NULL;
+	if (g_exception) {
+		VALUE exception = zval_to_value(g_exception);
+		zval_ptr_dtor(&g_exception);
+		g_exception = NULL;
 		rb_exc_raise(exception);
 	}
 
@@ -92,7 +93,7 @@ void php_eval_string(char *code, int code_len TSRMLS_DC)
 	}
 }
 
-void find_zend_class_entry(char *name, int name_len, zend_class_entry ***ce)
+void find_zend_class_entry(char *name, int name_len, zend_class_entry ***ce TSRMLS_DC)
 {
 	// lowercase
 	char *lcname = malloc(name_len+1);
@@ -115,7 +116,7 @@ void find_zend_class_entry(char *name, int name_len, zend_class_entry ***ce)
 
 int is_exception_zend_class_entry(zend_class_entry *ce TSRMLS_DC)
 {
-	return instanceof_function(ce, zend_exception_get_default() TSRMLS_CC);
+	return instanceof_function(ce, zend_exception_get_default(TSRMLS_C) TSRMLS_CC);
 }
 
 int is_exception_zval(zval *z TSRMLS_DC)
@@ -123,7 +124,7 @@ int is_exception_zval(zval *z TSRMLS_DC)
 	return is_exception_zend_class_entry(Z_OBJCE_P(z) TSRMLS_CC);
 }
 
-void find_zend_function(zend_class_entry *ce, char *name, int name_len, zend_function **mptr)
+void find_zend_function(zend_class_entry *ce, char *name, int name_len, zend_function **mptr TSRMLS_DC)
 {
 	// function_table
 	HashTable *function_table = NULL;
@@ -152,20 +153,11 @@ void find_zend_function(zend_class_entry *ce, char *name, int name_len, zend_fun
 	free(lcname);
 }
 
-int has_zend_function(zend_class_entry *ce, VALUE method_name)
-{
-	zend_function *mptr;
-	find_zend_function(ce, RSTRING_PTR(method_name), RSTRING_LEN(method_name), &mptr);
-	return mptr!=NULL;
-}
-
-int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval)
+int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval TSRMLS_DC)
 {
 	int result = FAILURE;
 
 	if (ce->constructor) {
-		TSRMLS_FETCH();
-
 		// defined constructor
 /*
 		if (!(ce->constructor->common.fn_flags & ZEND_ACC_PUBLIC)) {
@@ -177,12 +169,13 @@ int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval)
 		object_init_ex(retval, ce);
 
 		// call constructor
-		int result = call_php_method(ce, retval, ce->constructor, RARRAY_LEN(v_args), RARRAY_PTR(v_args), &retval TSRMLS_CC);
+		result = call_php_method(ce, retval, ce->constructor, RARRAY_LEN(v_args), RARRAY_PTR(v_args), &retval TSRMLS_CC);
 
 		// exception
 		if (result==FAILURE) {
 			if (g_exception) {
 				VALUE exception = zval_to_value(g_exception);
+				zval_ptr_dtor(&g_exception);
 				g_exception = NULL;
 				rb_exc_raise(exception);
 			} else {
@@ -190,6 +183,8 @@ int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval)
 			}
 		}
 
+		zval_ptr_dtor(&retval);
+
 	} else if (!RARRAY_LEN(v_args)) {
 		// undefined constructor, hasnt args
 		object_init_ex(retval, ce);
@@ -368,7 +363,7 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 		zend_hash_next_index_insert(Z_ARRVAL_P(z_args), &new_var, sizeof(zval *), NULL);
 	}
 
-	zend_fcall_info_args(&fci, z_args);
+	zend_fcall_info_args(&fci, z_args TSRMLS_CC);
 
 	zend_try {
 		// call method
@@ -391,10 +386,8 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 	} zend_end_try();
 
 	// release
-	for (i=0; i<fci.param_count; i++) {
-		zval_ptr_dtor(fci.params[i]);
-	}
 	zend_fcall_info_args_clear(&fci, 1);
+	zval_ptr_dtor(&z_args);
 
 	// result
 	if (g_exception) {
@@ -424,6 +417,8 @@ VALUE get_callee_name()
 
 VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, zend_function *mptr, int argc, VALUE *argv)
 {
+	TSRMLS_FETCH();
+
 	// call
 	zval *z_val;
 	int result = call_php_method(ce, obj, mptr, argc, argv, &z_val TSRMLS_CC);
@@ -432,6 +427,7 @@ VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, zend_function *mpt
 	if (result==FAILURE) {
 		if (g_exception) {
 			VALUE exception = zval_to_value(g_exception);
+			zval_ptr_dtor(&g_exception);
 			g_exception = NULL;
 			rb_exc_raise(exception);
 		} else {
@@ -439,7 +435,9 @@ VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, zend_function *mpt
 		}
 	}
 
-	return zval_to_value(z_val);
+	VALUE v_retval = zval_to_value(z_val);
+	zval_ptr_dtor(&z_val);
+	return v_retval;
 }
 
 VALUE call_php_method_name_bridge(zend_class_entry *ce, zval *obj, VALUE callee, int argc, VALUE *argv)
@@ -453,7 +451,7 @@ VALUE call_php_method_name_bridge(zend_class_entry *ce, zval *obj, VALUE callee,
 
 	// method
 	zend_function *mptr;
-	find_zend_function(ce, RSTRING_PTR(callee), RSTRING_LEN(callee), &mptr);
+	find_zend_function(ce, RSTRING_PTR(callee), RSTRING_LEN(callee), &mptr TSRMLS_CC);
 
 	// call
 	if (mptr) {
@@ -602,7 +600,7 @@ VALUE rb_php_vm_set_error_handler(VALUE cls, VALUE proc)
 	return Qnil;
 }
 
-void php_vm_require(char *token, VALUE filepath)
+void php_vm_require(char *token, VALUE filepath TSRMLS_DC)
 {
 	StringValue(filepath);
 	filepath = rb_funcall(filepath, rb_intern("gsub"), 2, rb_str_new2("\\"), rb_str_new2("\\\\"));
@@ -613,30 +611,34 @@ void php_vm_require(char *token, VALUE filepath)
 	rb_str_cat(code, RSTRING_PTR(filepath), RSTRING_LEN(filepath));
 	rb_str_cat2(code, "\";");
 
-	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code));
+	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code) TSRMLS_CC);
 }
 
 VALUE rb_php_vm_require(VALUE cls, VALUE filepath)
 {
-	php_vm_require("require", filepath);
+	TSRMLS_FETCH();
+	php_vm_require("require", filepath TSRMLS_CC);
 	return Qtrue;
 }
 
 VALUE rb_php_vm_require_once(VALUE cls, VALUE filepath)
 {
-	php_vm_require("require_once", filepath);
+	TSRMLS_FETCH();
+	php_vm_require("require_once", filepath TSRMLS_CC);
 	return Qtrue;
 }
 
 VALUE rb_php_vm_include(VALUE cls, VALUE filepath)
 {
-	php_vm_require("include", filepath);
+	TSRMLS_FETCH();
+	php_vm_require("include", filepath TSRMLS_CC);
 	return Qnil;
 }
 
 VALUE rb_php_vm_include_once(VALUE cls, VALUE filepath)
 {
-	php_vm_require("include_once", filepath);
+	TSRMLS_FETCH();
+	php_vm_require("include_once", filepath TSRMLS_CC);
 	return Qnil;
 }
 
@@ -658,7 +660,7 @@ VALUE define_global_constants()
 
 	// method
 	zend_function *mptr;
-	find_zend_function(NULL, "get_defined_constants", strlen("get_defined_constants"), &mptr);
+	find_zend_function(NULL, "get_defined_constants", strlen("get_defined_constants"), &mptr TSRMLS_CC);
 	if (!mptr) {
 		return Qfalse;
 	}
@@ -667,7 +669,10 @@ VALUE define_global_constants()
 	zval *z_val;
 	int result = call_php_method(NULL, NULL, mptr, 0, NULL, &z_val TSRMLS_CC);
 	if (result==FAILURE) {
-		g_exception = NULL;
+		if (g_exception) {
+			zval_ptr_dtor(&g_exception);
+			g_exception = NULL;
+		}
 		return Qfalse;
 	}
 
@@ -703,6 +708,7 @@ VALUE define_global_constants()
 
 		zend_hash_move_forward_ex(ht, &pos);
 	}
+	zval_ptr_dtor(&z_val);
 	return Qtrue;
 }
 
@@ -712,7 +718,7 @@ VALUE define_global_functions()
 
 	// method
 	zend_function *mptr;
-	find_zend_function(NULL, "get_defined_functions", strlen("get_defined_functions"), &mptr);
+	find_zend_function(NULL, "get_defined_functions", strlen("get_defined_functions"), &mptr TSRMLS_CC);
 	if (!mptr) {
 		return Qfalse;
 	}
@@ -721,7 +727,10 @@ VALUE define_global_functions()
 	zval *z_val;
 	int result = call_php_method(NULL, NULL, mptr, 0, NULL, &z_val TSRMLS_CC);
 	if (result==FAILURE) {
-		g_exception = NULL;
+		if (g_exception) {
+			zval_ptr_dtor(&g_exception);
+			g_exception = NULL;
+		}
 		return Qfalse;
 	}
 
@@ -743,6 +752,7 @@ VALUE define_global_functions()
 
 		zend_hash_move_forward_ex(ht, &pos);
 	}
+	zval_ptr_dtor(&z_val);
 	return Qtrue;
 }
 
@@ -752,7 +762,7 @@ VALUE define_global_classes()
 
 	// method
 	zend_function *mptr;
-	find_zend_function(NULL, "get_declared_classes", strlen("get_declared_classes"), &mptr);
+	find_zend_function(NULL, "get_declared_classes", strlen("get_declared_classes"), &mptr TSRMLS_CC);
 	if (!mptr) {
 		return Qfalse;
 	}
@@ -761,7 +771,10 @@ VALUE define_global_classes()
 	zval *z_val;
 	int result = call_php_method(NULL, NULL, mptr, 0, NULL, &z_val TSRMLS_CC);
 	if (result==FAILURE) {
-		g_exception = NULL;
+		if (g_exception) {
+			zval_ptr_dtor(&g_exception);
+			g_exception = NULL;
+		}
 		return Qfalse;
 	}
 
@@ -785,6 +798,7 @@ VALUE define_global_classes()
 		}
 		zend_hash_move_forward_ex(ht, &pos);
 	}
+	zval_ptr_dtor(&z_val);
 	return Qtrue;
 }
 
@@ -813,7 +827,8 @@ VALUE rb_php_global_class_call(VALUE self)
 
 static VALUE php_global_require_b_proc(RequireArgs *args)
 {
-	php_vm_require(args->token, args->filepath);
+	TSRMLS_FETCH();
+	php_vm_require(args->token, args->filepath TSRMLS_CC);
 	return Qnil;
 }
 
@@ -915,11 +930,13 @@ VALUE rb_php_class_get(VALUE cls, VALUE v_name)
 
 VALUE rb_php_class_initialize(VALUE self, VALUE v_name)
 {
+	TSRMLS_FETCH();
+
 	rb_iv_set(self, "name", v_name);
 
 	// find zend class
 	zend_class_entry **ce = NULL;
-	find_zend_class_entry(RSTRING_PTR(v_name), RSTRING_LEN(v_name), &ce);
+	find_zend_class_entry(RSTRING_PTR(v_name), RSTRING_LEN(v_name), &ce TSRMLS_CC);
 
 	// class not found
 	if (!ce) {
@@ -948,13 +965,15 @@ VALUE rb_php_class_name(VALUE self)
 
 VALUE rb_php_class_new(int argc, VALUE *argv, VALUE self)
 {
+	TSRMLS_FETCH();
+
 	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)) {
+	if (is_exception_zend_class_entry(ce TSRMLS_CC)) {
 		obj = rb_obj_alloc(rb_ePHPExceptionObject);
 	} else {
 		obj = rb_obj_alloc(rb_cPHPObject);
@@ -1010,6 +1029,8 @@ VALUE rb_php_class_call_method_missing(int argc, VALUE *argv, VALUE self)
 
 VALUE rb_php_object_initialize(VALUE self, VALUE class, VALUE args)
 {
+	TSRMLS_FETCH();
+
 	// set class
 	rb_iv_set(self, "php_class", class);
 
@@ -1017,7 +1038,7 @@ VALUE rb_php_object_initialize(VALUE self, VALUE class, VALUE args)
 	zend_class_entry *ce = get_zend_class_entry(class);
 	zval *z_obj;
 	ALLOC_INIT_ZVAL(z_obj);
-	new_php_object(ce, args, z_obj);
+	new_php_object(ce, args, z_obj TSRMLS_CC);
 	
 	// set resource
 	PHPNativeResource *p = ALLOC(PHPNativeResource);
@@ -1080,6 +1101,13 @@ VALUE rb_php_object_call_magic_clone(VALUE self)
 	Z_SET_REFCOUNT_P(retval, 0);
 	Z_SET_ISREF_P(retval);
 
+	if (g_exception) {
+		VALUE exception = zval_to_value(g_exception);
+		zval_ptr_dtor(&g_exception);
+		g_exception = NULL;
+		rb_exc_raise(exception);
+	}
+
 	return zval_to_value(retval);
 }
 
@@ -1101,6 +1129,14 @@ VALUE rb_php_object_call_magic___get(VALUE self, VALUE name)
 	retval = handler(zobj, member, BP_VAR_IS, NULL TSRMLS_CC);
 
 	zval_ptr_dtor(&member);
+
+	if (g_exception) {
+		VALUE exception = zval_to_value(g_exception);
+		zval_ptr_dtor(&g_exception);
+		g_exception = NULL;
+		rb_exc_raise(exception);
+	}
+
 	return zval_to_value(retval);
 }
 
@@ -1125,6 +1161,14 @@ VALUE rb_php_object_call_magic___set(VALUE self, VALUE name, VALUE arg)
 
 	zval_ptr_dtor(&member);
 	zval_ptr_dtor(&z_arg);
+
+	if (g_exception) {
+		VALUE exception = zval_to_value(g_exception);
+		zval_ptr_dtor(&g_exception);
+		g_exception = NULL;
+		rb_exc_raise(exception);
+	}
+
 	return Qnil;
 }
 
@@ -1145,6 +1189,14 @@ VALUE rb_php_object_call_magic___unset(VALUE self, VALUE name)
 	handler(zobj, member, NULL TSRMLS_CC);
 
 	zval_ptr_dtor(&member);
+
+	if (g_exception) {
+		VALUE exception = zval_to_value(g_exception);
+		zval_ptr_dtor(&g_exception);
+		g_exception = NULL;
+		rb_exc_raise(exception);
+	}
+
 	return Qnil;
 }
 
@@ -1166,6 +1218,14 @@ VALUE rb_php_object_call_magic___isset(VALUE self, VALUE name)
 	has = handler(zobj, member, 0, NULL TSRMLS_CC);
 
 	zval_ptr_dtor(&member);
+
+	if (g_exception) {
+		VALUE exception = zval_to_value(g_exception);
+		zval_ptr_dtor(&g_exception);
+		g_exception = NULL;
+		rb_exc_raise(exception);
+	}
+
 	return has ? Qtrue : Qfalse;
 }
 
@@ -1291,15 +1351,6 @@ VALUE rb_php_error_reporting_line(VALUE self)
 
 // module
 
-void php_vm_module_init()
-{
-	TSRMLS_FETCH();
-	int argc = 1;
-	char *argv[2] = {"php_vm", NULL};
-	php_embed_init(argc, argv PTSRMLS_CC);
-	EG(bailout) = NULL;
-}
-
 void php_vm_module_exit()
 {
 	TSRMLS_FETCH();
@@ -1308,13 +1359,24 @@ void php_vm_module_exit()
 
 void Init_php_vm()
 {
-	// initialize php_vm
+#ifdef ZTS
+	void ***tsrm_ls;
+#endif
+
+	// set php_embed callback function
 	php_embed_module.ub_write = php_embed_output_handler;
 	php_embed_module.log_message = php_embed_error_handler;
 
-	php_vm_module_init();
+	// initialize php_embed
+	int init_argc = 1;
+	char *init_argv[2] = {"php_vm", NULL};
+	php_embed_init(init_argc, init_argv PTSRMLS_CC);
+	EG(bailout) = NULL;
+
+	// set exit php_vm callback function
 	atexit(php_vm_module_exit);
 
+	// set php_embed hook function
 	zend_throw_exception_hook = php_vm_exception_hook;
 
 	// ini
@@ -1341,7 +1403,7 @@ void Init_php_vm()
 	rb_define_singleton_method(rb_mPHPVM, "get_class", rb_php_vm_get_class, 1);
 	rb_define_singleton_method(rb_mPHPVM, "define_global", rb_php_vm_define_global, 0);
 
-	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.8"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.9"));
 
 	rb_cv_set(rb_mPHPVM, "@@output_handler", Qnil);
 	rb_cv_set(rb_mPHPVM, "@@error_handler", Qnil);

data/ext/php_vm/php_vm.h

@@ -27,12 +27,11 @@ typedef struct {
 
 // PHP
 extern void php_eval_string(char *code, int code_len TSRMLS_DC);
-extern void find_zend_class_entry(char *name, int name_len, zend_class_entry ***ce);
+extern void find_zend_class_entry(char *name, int name_len, zend_class_entry ***ce TSRMLS_DC);
 extern int is_exception_zend_class_entry(zend_class_entry *ce TSRMLS_DC);
 extern int is_exception_zval(zval *z TSRMLS_DC);
-extern void find_zend_function(zend_class_entry *ce, char *name, int name_len, zend_function **mptr);
-extern int has_zend_function(zend_class_entry *ce, VALUE method_name);
-extern int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval);
+extern void find_zend_function(zend_class_entry *ce, char *name, int name_len, zend_function **mptr TSRMLS_DC);
+extern int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval TSRMLS_DC);
 extern void define_php_properties(VALUE v_obj, zend_class_entry *ce, int is_static);
 extern void define_php_methods(VALUE v_obj, zend_class_entry *ce, int is_static);
 extern void define_php_magic_method(VALUE v_obj, zend_class_entry *ce, zval *zobj);
@@ -54,7 +53,7 @@ extern VALUE rb_php_vm_get_output_handler(VALUE cls);
 extern VALUE rb_php_vm_set_output_handler(VALUE cls, VALUE proc);
 extern VALUE rb_php_vm_get_error_handler(VALUE cls);
 extern VALUE rb_php_vm_set_error_handler(VALUE cls, VALUE proc);
-extern void php_vm_require(char *token, VALUE filepath);
+extern void php_vm_require(char *token, VALUE filepath TSRMLS_DC);
 extern VALUE rb_php_vm_require(VALUE cls, VALUE filepath);
 extern VALUE rb_php_vm_require_once(VALUE cls, VALUE filepath);
 extern VALUE rb_php_vm_include(VALUE cls, VALUE filepath);
@@ -113,7 +112,6 @@ extern VALUE rb_php_error_reporting_file(VALUE self);
 extern VALUE rb_php_error_reporting_line(VALUE self);
 
 // module
-extern void php_vm_module_init();
 extern void php_vm_module_exit();
 extern void Init_php_vm();
 

data/ext/php_vm/php_vm_z2v.c

@@ -91,7 +91,7 @@ static VALUE zval_to_value_object(zval *z)
 
 	// object
 	VALUE obj = Qnil;
-	if (is_exception_zval(z)) {
+	if (is_exception_zval(z TSRMLS_CC)) {
 		// exception object
 		zval *z_message = zend_read_property(zend_exception_get_default(TSRMLS_C), z, "message", sizeof("message")-1, 0 TSRMLS_CC);
 		obj = rb_exc_new2(rb_ePHPExceptionObject, Z_STRVAL_P(z_message));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-07 00:00:00.000000000 Z
 dependencies: []
 description: php_vm is a native bridge between Ruby and PHP.
 email: