clearlinux/uwsgi
2
0
Fork 0
mirror of https://github.com/clearlinux/uwsgi.git synced 2026-08-19 03:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

more solid multithreading support for v8

Browse Source
This commit is contained in:
Unbit
2013-04-01 21:36:07 +02:00
parent 41da7175d1
commit bb3f6bcf7e
2 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/v8/plugin.c
+4
View File
@@ -5,6 +5,8 @@ void uwsgi_v8_apps(void);
void uwsgi_v8_configurator(char *, char **);
uint16_t uwsgi_v8_rpc(void *, uint8_t, char **, uint16_t *, char *);
int uwsgi_v8_signal_handler(uint8_t, void *);
void uwsgi_v8_init_thread(int);
void uwsgi_v8_enable_threads();
static void uwsgi_v8_register(void) {
uwsgi_register_configurator(".js", uwsgi_v8_configurator);
@@ -26,4 +28,6 @@ struct uwsgi_plugin v8_plugin = {
.rpc = uwsgi_v8_rpc,
.request = uwsgi_v8_request,
.signal_handler = uwsgi_v8_signal_handler,
.enable_threads = uwsgi_v8_enable_threads,
.init_thread = uwsgi_v8_init_thread,
};
plugins/v8/v8_uwsgi.cc
+63 -64
View File
@@ -4,7 +4,8 @@
// as we have isolates in multithread modes, we need to maintain
// special tables for the handlers (mules and spooler just run on the core 0)
struct uwsgi_v8_signal_table {
void *func;
v8::Persistent<v8::Function> *func;
uint8_t registered;
};
struct uwsgi_v8_rpc_table {
@@ -12,16 +13,15 @@ struct uwsgi_v8_rpc_table {
v8::Persistent<v8::Function> *func;
};
v8::Persistent<v8::Function> handler1;
struct uwsgi_v8 {
v8::Persistent<v8::Context> *contexts;
v8::Isolate **isolates;
struct uwsgi_string_list *load;
struct uwsgi_v8_signal_table **sigtable;
struct uwsgi_v8_signal_table *sigtable;
struct uwsgi_v8_rpc_table *rpctable;
int current_core;
pthread_key_t current_core;
int preemptive;
uint64_t gc_freq;
} uv8;
extern struct uwsgi_server uwsgi;
@@ -41,10 +41,25 @@ static v8::Handle<v8::Value> uwsgi_v8_api_register_signal(const v8::Arguments& a
v8::Persistent<v8::Function> func = v8::Persistent<v8::Function>::New(v8::Handle<v8::Function>::Cast(args[2]));
if (uwsgi_register_signal(uwsgi_signal, *signal_kind, *func, v8_plugin.modifier1)) {
int core_id = (long) pthread_getspecific(uv8.current_core);
struct uwsgi_v8_signal_table *uvst = &uv8.sigtable[uwsgi_signal];
int need_register = 1;
if (uvst->registered == 1) {
need_register = 0;
}
uvst->func[core_id] = func;
if (!need_register) {
return v8::True();
}
if (uwsgi_register_signal(uwsgi_signal, *signal_kind, uvst, v8_plugin.modifier1)) {
uwsgi_log("[uwsgi-v8] unable to register signal %d\n", uwsgi_signal);
return v8::Undefined();
}
uvst->registered = 1 ;
return v8::True();
}
@@ -61,21 +76,9 @@ static v8::Handle<v8::Value> uwsgi_v8_api_register_rpc(const v8::Arguments& args
j_argc = args[2]->Uint32Value();
}
//v8::Persistent<v8::Function> func = v8::Persistent<v8::Function>::New(v8::Handle<v8::Function>::Cast(args[1]));
v8::Local<v8::Function> l_func = v8::Local<v8::Function>::Cast(args[1]);
v8::Persistent<v8::Function> func = v8::Persistent<v8::Function>::New(l_func);
v8::Persistent<v8::Function> func = v8::Persistent<v8::Function>::New(v8::Handle<v8::Function>::Cast(args[1]));
int core_id = uv8.current_core;
if (core_id < 0) {
struct wsgi_request *wsgi_req = current_wsgi_req();
core_id = wsgi_req->async_id;
}
if (core_id == 1) {
uwsgi_log("OOOOps\n");
handler1 = v8::Persistent<v8::Function>::New(l_func);
}
int core_id = (long) pthread_getspecific(uv8.current_core);
// get the rpc slot
int i;
@@ -151,15 +154,13 @@ static v8::Handle<v8::Value> uwsgi_v8_api_log(const v8::Arguments& args) {
}
static v8::Persistent<v8::Context> uwsgi_v8_new_isolate(int core) {
if (core > 0) {
// create a new isolate
v8::Isolate *isolate = v8::Isolate::New();
// set as the current isolate
isolate->Enter();
}
static v8::Persistent<v8::Context> uwsgi_v8_new_isolate(int core_id) {
// create a new isolate
v8::Isolate *isolate = v8::Isolate::New();
// set as the current isolate
isolate->Enter();
uv8.isolates[core] = v8::Isolate::GetCurrent();
uv8.isolates[core_id] = v8::Isolate::GetCurrent();
v8::HandleScope handle_scope;
@@ -182,39 +183,34 @@ extern "C" int uwsgi_v8_init(){
uwsgi_log("Initializing V8 %s environment... (%d Isolates)\n", v8::V8::GetVersion(), uwsgi.cores);
uv8.isolates = (v8::Isolate **) uwsgi_malloc( sizeof(v8::Isolate *) * uwsgi.cores );
uv8.contexts = (v8::Persistent<v8::Context> *) uwsgi_malloc( sizeof(v8::Persistent<v8::Context>) * uwsgi.cores );
for(i=0;i<uwsgi.cores;i++) {
uv8.contexts[i] = uwsgi_v8_new_isolate(i);
}
// allocates rpc and signal tables
uv8.rpctable = (struct uwsgi_v8_rpc_table *) uwsgi_calloc(sizeof(struct uwsgi_v8_rpc_table) * uwsgi.rpc_max);
for(i=0;i<(int)uwsgi.rpc_max;i++) {
uv8.rpctable[i].func = (v8::Persistent<v8::Function>*) uwsgi_calloc(sizeof(v8::Persistent<v8::Function>) * uwsgi.cores);
}
/*
uv8.sigtable = (struct uwsgi_v8_signal_table **) uwsgi_calloc(sizeof(struct uwsgi_v8_signal_table *) * 256);
uv8.sigtable = (struct uwsgi_v8_signal_table *) uwsgi_calloc(sizeof(struct uwsgi_v8_signal_table) * 256);
for(i=0;i<256;i++) {
uv8.sigtable[i] = (struct uwsgi_v8_signal_table *) uwsgi_calloc(sizeof(struct uwsgi_v8_signal_table) * uwsgi.cores);
uv8.sigtable[i].func = (v8::Persistent<v8::Function>*) uwsgi_calloc(sizeof(v8::Persistent<v8::Function>) * uwsgi.cores);
}
*/
pthread_key_create(&uv8.current_core, NULL);
pthread_setspecific(uv8.current_core, (void *) 0);
uv8.contexts[0] = uwsgi_v8_new_isolate(0);
return 0;
}
extern "C" void uwsgi_v8_apps() {
static void uwsgi_v8_apps_do(int core_id) {
if (!uv8.load) return;
int i;
for(i=0;i<uwsgi.cores;i++) {
uv8.current_core = i;
struct uwsgi_string_list *usl = uv8.load;
while(usl) {
uwsgi_v8_load_file(i, usl->value);
usl = usl->next;
}
struct uwsgi_string_list *usl = uv8.load;
while(usl) {
uwsgi_v8_load_file(core_id, usl->value);
usl = usl->next;
}
// inform the system to use current_wsgi_req
uv8.current_core = -1;
}
extern "C" void uwsgi_v8_apps() {
uwsgi_v8_apps_do(0);
}
extern "C" void uwsgi_v8_configurator(char *filename, char *magic_table[]) {
@@ -274,11 +270,7 @@ extern "C" void uwsgi_v8_configurator(char *filename, char *magic_table[]) {
extern "C" uint16_t uwsgi_v8_rpc(void * func, uint8_t argc, char **argv, uint16_t argvs[], char *buffer) {
int core_id = 0;
if (uwsgi.mywid > 0) {
struct wsgi_request *wsgi_req = current_wsgi_req();
core_id = wsgi_req->async_id;
}
int core_id = (long) pthread_getspecific(uv8.current_core);
uv8.isolates[core_id]->Enter();
uv8.contexts[core_id]->Enter();
@@ -294,11 +286,6 @@ extern "C" uint16_t uwsgi_v8_rpc(void * func, uint8_t argc, char **argv, uint16_
v8::Persistent<v8::Function> l_func = uvrt->func[core_id];
if (core_id == 1) {
uwsgi_log("111111\n");
l_func = handler1;
}
v8::Handle<v8::Value> result = l_func->Call(uv8.contexts[core_id]->Global(), argc, argj);
if (result.IsEmpty()) {
return 0;
@@ -318,15 +305,27 @@ extern "C" uint16_t uwsgi_v8_rpc(void * func, uint8_t argc, char **argv, uint16_
}
extern "C" void uwsgi_v8_init_thread(int core_id) {
pthread_setspecific(uv8.current_core, (void *) ((long)core_id));
uv8.contexts[core_id] = uwsgi_v8_new_isolate(core_id);
uwsgi_v8_apps_do(core_id);
}
extern "C" void uwsgi_v8_enable_threads() {
}
extern "C" int uwsgi_v8_signal_handler(uint8_t sig, void *handler) {
int ret = 0;
v8::HandleScope handle_scope;
struct wsgi_request *wsgi_req = current_wsgi_req();
v8::Context::Scope context_scope(uv8.contexts[wsgi_req->async_id]);
v8::Persistent<v8::Function> l_func = static_cast<v8::Function*> (handler);
v8::Handle<v8::Value> argj[1];
int core_id = (long) pthread_getspecific(uv8.current_core);
uv8.isolates[core_id]->Enter();
uv8.contexts[core_id]->Enter();
v8::HandleScope handle_scope;
v8::Handle<v8::Value> argj[1];
argj[0] = v8::Number::New(sig);
v8::Handle<v8::Value> result = l_func->Call(l_func, 1, argj);
struct uwsgi_v8_signal_table *uvst = (struct uwsgi_v8_signal_table *) handler;
v8::Persistent<v8::Function> l_func = uvst->func[core_id];
v8::Handle<v8::Value> result = l_func->Call(uv8.contexts[core_id]->Global(), 1, argj);
if (result.IsEmpty()) ret = -1;
while(!v8::V8::IdleNotification()) {};
return ret;