mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-12-23 00:51:51 +00:00
Code Releases Activity

Clean up allocation/deallocation of php_v8js_ctx.

Browse Source 
Use the constructor and destructor functions (don't just cross our fingers
and hope that zeroing out memory will work).
This commit is contained in:
C. Scott Ananian 2013-10-25 14:00:15 -04:00
parent 49632054a4
commit 0e1c6ef5e9
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
v8js.cc
View File

@ -405,7 +405,7 @@ static int php_v8js_v8_call_method(char *method, INTERNAL_FUNCTION_PARAMETERS) /
cb = v8::Local<v8::Function>::Cast(v8obj->Get(method_name)); cb = v8::Local<v8::Function>::Cast(v8obj->Get(method_name));
} }
v8::Local<v8::Value> *jsArgv = new v8::Local<v8::Value>[argc]; v8::Local<v8::Value> jsArgv[argc];
v8::Local<v8::Value> js_retval; v8::Local<v8::Value> js_retval;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
@ -467,9 +467,7 @@ static void php_v8js_v8_free_storage(void *object, zend_object_handle handle TSR
zend_object_std_dtor(&c->std TSRMLS_CC); zend_object_std_dtor(&c->std TSRMLS_CC);
if (!c->v8obj.IsEmpty()) { c->v8obj.Reset();
c->v8obj.Dispose();
}
efree(object); efree(object);
} }
@ -519,19 +517,24 @@ static void php_v8js_free_storage(void *object TSRMLS_DC) /* {{{ */
zval_ptr_dtor(&c->pending_exception); zval_ptr_dtor(&c->pending_exception);
} }
c->object_name.Dispose(); c->object_name.Reset();
c->object_name.~Persistent();
c->global_template.Reset();
c->global_template.~Persistent();
/* Clear global object, dispose context */ /* Clear global object, dispose context */
if (!c->context.IsEmpty()) { if (!c->context.IsEmpty()) {
c->context.Dispose(); c->context.Reset();
c->context.Clear();
V8JSG(disposed_contexts) = v8::V8::ContextDisposedNotification(); V8JSG(disposed_contexts) = v8::V8::ContextDisposedNotification();
#if V8JS_DEBUG #if V8JS_DEBUG
fprintf(stderr, "Context dispose notification sent (%d)\n", V8JSG(disposed_contexts)); fprintf(stderr, "Context dispose notification sent (%d)\n", V8JSG(disposed_contexts));
fflush(stderr); fflush(stderr);
#endif #endif
} }
c->context.~Persistent();
c->modules_stack.~vector();
c->modules_base.~vector();
efree(object); efree(object);
} }
/* }}} */ /* }}} */
@ -543,6 +546,7 @@ static zend_object_value php_v8js_new(zend_class_entry *ce TSRMLS_DC) /* {{{ */
c = (php_v8js_ctx *) ecalloc(1, sizeof(*c)); c = (php_v8js_ctx *) ecalloc(1, sizeof(*c));
zend_object_std_init(&c->std, ce TSRMLS_CC); zend_object_std_init(&c->std, ce TSRMLS_CC);
#if PHP_VERSION_ID >= 50400 #if PHP_VERSION_ID >= 50400
object_properties_init(&c->std, ce); object_properties_init(&c->std, ce);
#else #else
@ -551,6 +555,13 @@ static zend_object_value php_v8js_new(zend_class_entry *ce TSRMLS_DC) /* {{{ */
(copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
#endif #endif
new(&c->object_name) v8::Persistent<v8::String>();
new(&c->context) v8::Persistent<v8::Context>();
new(&c->global_template) v8::Persistent<v8::FunctionTemplate>();
new(&c->modules_stack) std::vector<char*>();
new(&c->modules_base) std::vector<char*>();
retval.handle = zend_objects_store_put(c, NULL, (zend_objects_free_object_storage_t) php_v8js_free_storage, NULL TSRMLS_CC); retval.handle = zend_objects_store_put(c, NULL, (zend_objects_free_object_storage_t) php_v8js_free_storage, NULL TSRMLS_CC);
retval.handlers = &v8js_object_handlers; retval.handlers = &v8js_object_handlers;