Provide a new ?destroy to release the JSContext.

diff --git a/Console.cpp b/Console.cpp
index dbb8baa4f8ec195f9e89f0a47296d50df6a41747..ec849fe8639258bd5014a48787be41bd475c99d9 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -497,6 +497,8 @@ static void Console(CYOptions &options) {
                 } else if (data == "debug") {
                     debug = !debug;
                     *out_ << "debug == " << (debug ? "true" : "false") << std::endl;
                 } else if (data == "debug") {
                     debug = !debug;
                     *out_ << "debug == " << (debug ? "true" : "false") << std::endl;

+                } else if (data == "destroy") {
+                    CYDestroyContext();

                 } else if (data == "expand") {
                     expand = !expand;
                     *out_ << "expand == " << (expand ? "true" : "false") << std::endl;
                 } else if (data == "expand") {
                     expand = !expand;
                     *out_ << "expand == " << (expand ? "true" : "false") << std::endl;

diff --git a/Execute.cpp b/Execute.cpp
index 61acaf2e8a05f36ca1c3b6114bae8d1c0ab594c5..b2e0e0a467a674de79b9e14f2e8d444f8a7f9337 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1763,11 +1763,11 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYRunSetups(context);
 }
 
     CYRunSetups(context);
 }
 

+static JSGlobalContextRef context_;
+

 JSGlobalContextRef CYGetJSContext() {
     CYInitializeDynamic();
 
 JSGlobalContextRef CYGetJSContext() {
     CYInitializeDynamic();
 

-    static JSGlobalContextRef context_;
-

     if (context_ == NULL) {
         context_ = JSGlobalContextCreate(Global_);
         CYSetupContext(context_);
     if (context_ == NULL) {
         context_ = JSGlobalContextCreate(Global_);
         CYSetupContext(context_);


@@ -1775,3 +1775,10 @@ JSGlobalContextRef CYGetJSContext() {
 
     return context_;
 }
 
     return context_;
 }

+
+void CYDestroyContext() {
+    if (context_ == NULL)
+        return;
+    JSGlobalContextRelease(context_);
+    context_ = NULL;
+}

diff --git a/JavaScript.hpp b/JavaScript.hpp
index 4ce43b68f86292211a4a3a34185cc50e9f1ac9ca..b863a93bf25949d82b41215989fb7819cc8ff257 100644 (file)
--- a/JavaScript.hpp
+++ b/JavaScript.hpp
@@ -143,6 +143,8 @@ JSStringRef CYCopyJSString(JSStringRef value);
 JSStringRef CYCopyJSString(CYUTF8String value);
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value);
 
 JSStringRef CYCopyJSString(CYUTF8String value);
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value);
 

+void CYDestroyContext();
+

 class CYJSString {
   private:
     JSStringRef string_;
 class CYJSString {
   private:
     JSStringRef string_;