diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-08-11 00:26:11 +0200 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-09-06 05:51:42 +0200 |
commit | 756b6222956b5d25b2e7db81f4e79033a3a4d20e (patch) | |
tree | eb03b6f0bf33c36e011858c4a31b10a6eaadfc19 /src/tls_wrap.h | |
parent | 81655a224a36948291e1f21f03273b5b604b7e6a (diff) | |
download | android-node-v8-756b6222956b5d25b2e7db81f4e79033a3a4d20e.tar.gz android-node-v8-756b6222956b5d25b2e7db81f4e79033a3a4d20e.tar.bz2 android-node-v8-756b6222956b5d25b2e7db81f4e79033a3a4d20e.zip |
src: add multi-context support
This commit makes it possible to use multiple V8 execution contexts
within a single event loop. Put another way, handle and request wrap
objects now "remember" the context they belong to and switch back to
that context when the time comes to call into JS land.
This could have been done in a quick and hacky way by calling
v8::Object::GetCreationContext() on the wrap object right before
making a callback but that leaves a fairly wide margin for bugs.
Instead, we make the context explicit through a new Environment class
that encapsulates everything (or almost everything) that belongs to
the context. Variables that used to be a static or a global are now
members of the aforementioned class. An additional benefit is that
this approach should make it relatively straightforward to add full
isolate support in due course.
There is no JavaScript API yet but that will be added in the near
future.
This work was graciously sponsored by GitHub, Inc.
Diffstat (limited to 'src/tls_wrap.h')
-rw-r--r-- | src/tls_wrap.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/tls_wrap.h b/src/tls_wrap.h index 83f54c3b92..d8f3997923 100644 --- a/src/tls_wrap.h +++ b/src/tls_wrap.h @@ -24,6 +24,8 @@ #include "node.h" #include "node_crypto.h" // SSLWrap + +#include "env.h" #include "queue.h" #include "stream_wrap.h" #include "v8.h" @@ -42,7 +44,9 @@ namespace crypto { class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>, public StreamWrapCallbacks { public: - static void Initialize(v8::Handle<v8::Object> target); + static void Initialize(v8::Handle<v8::Object> target, + v8::Handle<v8::Value> unused, + v8::Handle<v8::Context> context); int DoWrite(WriteWrap* w, uv_buf_t* bufs, @@ -82,7 +86,10 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>, QUEUE member_; }; - TLSCallbacks(Kind kind, v8::Handle<v8::Object> sc, StreamWrapCallbacks* old); + TLSCallbacks(Environment* env, + Kind kind, + v8::Handle<v8::Object> sc, + StreamWrapCallbacks* old); ~TLSCallbacks(); static void SSLInfoCallback(const SSL* ssl_, int where, int ret); @@ -99,7 +106,7 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>, EncOut(); } - v8::Handle<v8::Value> GetSSLError(int status, int* err); + v8::Local<v8::Value> GetSSLError(int status, int* err); static void OnClientHelloParseEnd(void* arg); static void Wrap(const v8::FunctionCallbackInfo<v8::Value>& args); |