From 574ccee478b9da9457cdf0e476b8df6eb584b580 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 16 Jul 2012 06:48:11 +0000
Subject: Minor memory management, performance, and tracing improvements.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1361917 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/modules/js/eval.hpp    | 15 +++++++++++----
 sca-cpp/trunk/modules/js/js-test.cpp |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'sca-cpp/trunk/modules/js')

diff --git a/sca-cpp/trunk/modules/js/eval.hpp b/sca-cpp/trunk/modules/js/eval.hpp
index 21fa274d2c..f8f4cbe598 100644
--- a/sca-cpp/trunk/modules/js/eval.hpp
+++ b/sca-cpp/trunk/modules/js/eval.hpp
@@ -65,7 +65,7 @@ public:
     JSRuntime() {
         // Create JS runtime
         debug("js::jsruntime");
-        rt = JS_NewRuntime(32L * 1024L * 1024L);
+        rt = JS_NewRuntime(1L * 512L * 1024L);
         if(rt == NULL)
             cleanup();
     }
@@ -114,14 +114,19 @@ public:
         debug("js::jscontext");
         if (jsContext != NULL) {
             cx = jsContext;
+            JS_BeginRequest(cx);
             return;
         }
+        debug("js::jsnewcontext");
         cx = JS_NewContext(jsRuntime, 8192);
         if(cx == NULL)
             return;
+        JS_BeginRequest(cx);
+
         JS_SetOptions(cx, JSOPTION_VAROBJFIX | JSOPTION_JIT | JSOPTION_METHODJIT);
         JS_SetVersion(cx, JSVERSION_LATEST);
         JS_SetErrorReporter(cx, reportError);
+        //JS_SetGCZeal(cx, 2);
 
         // Create global JS object
         global = JS_NewCompartmentAndGlobalObject(cx, &jsGlobalClass, NULL);
@@ -140,8 +145,6 @@ public:
 
     ~JSContext() {
         debug("js::~jscontext");
-        if (cx != NULL)
-            JS_MaybeGC(cx);
         cleanup();
     }
 
@@ -156,8 +159,12 @@ public:
 private:
     bool cleanup() {
         if(cx != NULL) {
-            if (cx != jsContext)
+            JS_MaybeGC(cx);
+            JS_EndRequest(cx);
+            if (cx != jsContext) {
+                debug("js::jsdestroycontext");
                 JS_DestroyContext(cx);
+            }
             cx = NULL;
         }
         return true;
diff --git a/sca-cpp/trunk/modules/js/js-test.cpp b/sca-cpp/trunk/modules/js/js-test.cpp
index 9cbf000ac3..a7e5597610 100644
--- a/sca-cpp/trunk/modules/js/js-test.cpp
+++ b/sca-cpp/trunk/modules/js/js-test.cpp
@@ -42,6 +42,7 @@ bool testJSEval() {
 }
 
 int main() {
+    tuscany::gc_scoped_pool p;
     tuscany::cout << "Testing..." << tuscany::endl;
 
     tuscany::js::testJSEval();
-- 
cgit v1.2.3