mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2024-12-22 16:21:52 +00:00
Code Releases Activity

Add isolate to key of template cache.

Browse Source
This commit is contained in:
Stefan Siegl 2013-10-02 23:38:26 +02:00
parent 1f3fbae058
commit bc82d13658
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/multi-object.phpt
View File

@ -25,7 +25,7 @@ for($i = 0; $i < 5; $i ++) {
} }
$JS = <<< EOT $JS = <<< EOT
php.test.sayHello(); PHP.test.sayHello();
EOT; EOT;
foreach($instances as $v8) { foreach($instances as $v8) {

10
v8js_convert.cc
View File

@ -29,6 +29,9 @@ extern "C" {
#include <map> #include <map>
#include <stdexcept> #include <stdexcept>
typedef std::pair<v8::Isolate *, const char *> TemplateCacheKey;
typedef std::map<TemplateCacheKey, v8::Persistent<v8::FunctionTemplate> > TemplateCache;
/* Callback for PHP methods and functions */ /* Callback for PHP methods and functions */
static void php_v8js_call_php_func(zval *value, zend_class_entry *ce, zend_function *method_ptr, v8::Isolate *isolate, const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */ static void php_v8js_call_php_func(zval *value, zend_class_entry *ce, zend_function *method_ptr, v8::Isolate *isolate, const v8::FunctionCallbackInfo<v8::Value>& info) /* {{{ */
{ {
@ -371,10 +374,10 @@ static v8::Handle<v8::Value> php_v8js_hash_to_jsobj(zval *value, v8::Isolate *is
if (ce) { if (ce) {
v8::Handle<v8::FunctionTemplate> new_tpl; v8::Handle<v8::FunctionTemplate> new_tpl;
bool cached_tpl = true; bool cached_tpl = true;
static std::map<const char *, v8::Persistent<v8::FunctionTemplate> > tpl_map; static TemplateCache tpl_map;
try { try {
new_tpl = tpl_map.at(ce->name); new_tpl = tpl_map.at(std::make_pair(isolate, ce->name));
} }
catch (const std::out_of_range &) { catch (const std::out_of_range &) {
cached_tpl = false; cached_tpl = false;
@ -393,7 +396,8 @@ static v8::Handle<v8::Value> php_v8js_hash_to_jsobj(zval *value, v8::Isolate *is
new_tpl->InstanceTemplate()->SetCallAsFunctionHandler(php_v8js_php_callback); new_tpl->InstanceTemplate()->SetCallAsFunctionHandler(php_v8js_php_callback);
} else { } else {
/* Add new v8::FunctionTemplate to tpl_map, as long as it is not a closure. */ /* Add new v8::FunctionTemplate to tpl_map, as long as it is not a closure. */
tpl_map[ce->name] = v8::Persistent<v8::FunctionTemplate>::New(isolate, new_tpl); tpl_map[std::make_pair(isolate, ce->name)] =
v8::Persistent<v8::FunctionTemplate>::New(isolate, new_tpl);
} }
} }