tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r1419986 - in /tuscany/sca-cpp/trunk: modules/js/ modules/json/ modules/scheme/ patches/ unmaintained/ unmaintained/modules/ unmaintained/modules/js/ unmaintained/modules/json/
Date Tue, 11 Dec 2012 03:55:23 GMT
Author: jsdelfino
Date: Tue Dec 11 03:55:19 2012
New Revision: 1419986

URL: http://svn.apache.org/viewvc?rev=1419986&view=rev
Log:
Use Jansson to read/write JSON instead of Mozilla SpiderMonkey.

Added:
    tuscany/sca-cpp/trunk/modules/json/json-test.hpp
    tuscany/sca-cpp/trunk/patches/jansson-2.4.patch
    tuscany/sca-cpp/trunk/unmaintained/
    tuscany/sca-cpp/trunk/unmaintained/README
    tuscany/sca-cpp/trunk/unmaintained/modules/
    tuscany/sca-cpp/trunk/unmaintained/modules/js/
    tuscany/sca-cpp/trunk/unmaintained/modules/js/Makefile.am
      - copied, changed from r1419985, tuscany/sca-cpp/trunk/modules/json/Makefile.am
    tuscany/sca-cpp/trunk/unmaintained/modules/js/configure.ac
    tuscany/sca-cpp/trunk/unmaintained/modules/js/eval.hpp
      - copied, changed from r1419985, tuscany/sca-cpp/trunk/modules/js/eval.hpp
    tuscany/sca-cpp/trunk/unmaintained/modules/js/js-shell.cpp
      - copied, changed from r1419985, tuscany/sca-cpp/trunk/modules/js/js-shell.cpp
    tuscany/sca-cpp/trunk/unmaintained/modules/js/js-test.cpp
      - copied, changed from r1419985, tuscany/sca-cpp/trunk/modules/js/js-test.cpp
    tuscany/sca-cpp/trunk/unmaintained/modules/js/macos-install   (with props)
    tuscany/sca-cpp/trunk/unmaintained/modules/js/ubuntu-install   (with props)
    tuscany/sca-cpp/trunk/unmaintained/modules/json/
    tuscany/sca-cpp/trunk/unmaintained/modules/json/Makefile.am
      - copied, changed from r1419985, tuscany/sca-cpp/trunk/modules/json/Makefile.am
    tuscany/sca-cpp/trunk/unmaintained/modules/json/json-test.cpp
      - copied, changed from r1419985, tuscany/sca-cpp/trunk/modules/json/json-test.cpp
    tuscany/sca-cpp/trunk/unmaintained/modules/json/json.hpp
      - copied, changed from r1419985, tuscany/sca-cpp/trunk/modules/json/json.hpp
Removed:
    tuscany/sca-cpp/trunk/modules/js/eval.hpp
    tuscany/sca-cpp/trunk/modules/js/js-shell.cpp
    tuscany/sca-cpp/trunk/modules/js/js-test.cpp
Modified:
    tuscany/sca-cpp/trunk/modules/js/Makefile.am
    tuscany/sca-cpp/trunk/modules/json/Makefile.am
    tuscany/sca-cpp/trunk/modules/json/json-test.cpp
    tuscany/sca-cpp/trunk/modules/json/json.hpp
    tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp
    tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp

Modified: tuscany/sca-cpp/trunk/modules/js/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/js/Makefile.am?rev=1419986&r1=1419985&r2=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/js/Makefile.am Tue Dec 11 03:55:19 2012
@@ -15,8 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-incl_HEADERS = *.hpp
-incldir = $(prefix)/include/modules/js
 
 jsfiles = htdocs/util.js htdocs/elemutil.js htdocs/xmlutil.js htdocs/atomutil.js htdocs/jsonutil.js htdocs/scdl.js htdocs/ui.js htdocs/component.js
 
@@ -43,14 +41,5 @@ moddir = $(prefix)/modules/js
 nobase_dist_mod_DATA = ${minified}
 EXTRA_DIST = ${jsfiles} htdocs/ui.css
 
-js_test_SOURCES = js-test.cpp
-js_test_LDFLAGS = -lmozjs 
-
-js_shell_SOURCES = js-shell.cpp
-js_shell_LDFLAGS = -lmozjs 
-
-noinst_PROGRAMS = js-test
-mod_PROGRAMS = js-shell
 dist_noinst_SCRIPTS = util-test
-TESTS = js-test util-test
 

Modified: tuscany/sca-cpp/trunk/modules/json/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/json/Makefile.am?rev=1419986&r1=1419985&r2=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/json/Makefile.am Tue Dec 11 03:55:19 2012
@@ -19,7 +19,7 @@ incl_HEADERS = *.hpp
 incldir = $(prefix)/include/modules/json
 
 json_test_SOURCES = json-test.cpp
-json_test_LDFLAGS = -lmozjs 
+json_test_LDFLAGS = -ljansson 
 
 noinst_PROGRAMS = json-test
 TESTS = json-test

Modified: tuscany/sca-cpp/trunk/modules/json/json-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/json/json-test.cpp?rev=1419986&r1=1419985&r2=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/json-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/json/json-test.cpp Tue Dec 11 03:55:19 2012
@@ -28,6 +28,7 @@
 #include "string.hpp"
 #include "json.hpp"
 #include "perf.hpp"
+#include "json-test.hpp"
 
 namespace tuscany {
 namespace json {
@@ -37,47 +38,59 @@ ostream* jsonWriter(const string& s, ost
     return os;
 }
 
-const string jscustomer("{\n"
-    " \"customer\": {\n"
-    "  \"@name\": \"jdoe\",\n"
-    "  \"address\": {\n"
-    "   \"@city\": \"san francisco\",\n"
-    "   \"@state\": \"ca\"\n"
-    "  },\n"
-    "  \"account\": {\n"
-    "   \"id\": \"1234\",\n"
-    "   \"@balance\": 1000\n"
-    "  }\n"
-    " }\n"
-    "}");
-
-const string jsphones("{\n"
-    " \"phones\": [\n"
-    "  \"408-1234\",\n"
-    "  \"650-1234\"\n"
-    " ],\n"
-    " \"lastName\": \"test\\u0009tab\",\n"
-    " \"@firstName\": \"test1\"\n"
-    "}");
-
-const string jsecho("{\n"
-    " \"ns1:echoString\": {\n"
-    "  \"@xmlns:ns1\": \"http://ws.apache.org/axis2/services/echo\",\n"
-    "  \"text\": \"Hello World!\"\n"
-    " }\n"
-    "}");
-
-const string jsarray("{\n"
-    " \"fruit\": [\n"
-    "  \"Apple\",\n"
-    "  \"Orange\"\n"
-    " ]\n"
-    "}");
-
-bool testJSON() {
-    gc_scoped_pool pool;
-    const js::JSContext cx;
+const string testCustomer("{"
+    "\"customer\":{"
+    "\"@name\":\"jdoe\","
+    "\"address\":{"
+    "\"@city\":\"san francisco\","
+    "\"@state\":\"ca\""
+    "},"
+    "\"account\":{"
+    "\"id\":\"1234\","
+    "\"@balance\":1000"
+    "}"
+    "}"
+    "}");
+
+const string testCustomer2("{"
+    "\"customer\":{"
+    "\"@name\":\"jdoe\","
+    "\"account\":{"
+    "\"id\":\"1234\","
+    "\"@balance\":1000"
+    "},"
+    "\"address\":{"
+    "\"@city\":\"san francisco\","
+    "\"@state\":\"ca\""
+    "}"
+    "}"
+    "}");
 
+const string testPhones("{"
+    "\"phones\":["
+    "\"408-1234\","
+    "\"650-1234\""
+    "],"
+    "\"lastName\":\"test\\ttab\","
+    "\"@firstName\":\"test1\""
+    "}");
+
+const string testEcho("{"
+    "\"ns1:echoString\":{"
+    "\"@xmlns:ns1\":\"http://ws.apache.org/axis2/services/echo\","
+    "\"text\":\"Hello World!\""
+    "}"
+    "}");
+
+const string testArray("{"
+    "\"fruit\":["
+    "\"Apple\","
+    "\"Orange\""
+    "]"
+    "}");
+
+const bool testJSON() {
+    const gc_scoped_pool pool;
     {
         const list<value> ad = mklist<value>(mklist<value>(attribute, "city", string("san francisco")), mklist<value>(attribute, "state", string("ca")));
         const list<value> ac = mklist<value>(mklist<value>(element, "id", string("1234")), mklist<value>(attribute, "balance", 1000));
@@ -85,161 +98,192 @@ bool testJSON() {
         const list<value> c = mklist<value>(cons<value>(element, cons<value>("customer", cr)));
 
         ostringstream os;
-        writeJSON<ostream*>(jsonWriter, &os, c, cx);
-        assert(str(os) == jscustomer);
+        writeElements<ostream*>(jsonWriter, &os, c);
+        assert(str(os) == testCustomer);
     }
     {
         const list<value> phones = mklist<value> (string("408-1234"), string("650-1234"));
         const list<value> l = mklist<value> (mklist<value> (element, "phones", phones), mklist<value> (element, "lastName", string("test\ttab")), mklist<value> (attribute, "firstName", string("test1")));
 
         ostringstream os;
-        writeJSON<ostream*>(jsonWriter, &os, l, cx);
-        assert(str(os) == jsphones);
+        writeElements<ostream*>(jsonWriter, &os, l);
+        assert(str(os) == testPhones);
 
         istringstream is(str(os));
         const list<string> il = streamList(is);
-        const list<value> r = content(readJSON(il, cx));
+        const list<value> r = content(readElements(il));
         assert(r == l);
 
         ostringstream wos;
-        write(content(writeJSON(r, cx)), wos);
+        write(content(writeElements(r)), wos);
         assert(str(wos) == str(os));
     }
     {
-        const list<value> l = mklist<value>(list<value>() + "ns1:echoString" + (list<value>() + "@xmlns:ns1" + string("http://ws.apache.org/axis2/services/echo")) + (list<value>() + "text" + string("Hello World!")));
+        const list<value> l = mklist<value>(nilListValue + "ns1:echoString" + (nilListValue + "@xmlns:ns1" + string("http://ws.apache.org/axis2/services/echo")) + (nilListValue + "text" + string("Hello World!")));
         ostringstream wos;
-        write(content(writeJSON(valuesToElements(l), cx)), wos);
-        assert(str(wos) == jsecho);
+        write(content(writeElements(valuesToElements(l))), wos);
+        assert(str(wos) == testEcho);
 
         istringstream is(str(wos));
         const list<string> il = streamList(is);
-        const list<value> r = elementsToValues(content(readJSON(il, cx)));
+        const list<value> r = elementsToValues(content(readElements(il)));
         assert(r == l);
     }
     {
-        const list<value> l = mklist<value>((list<value>() + "fruit" + string("Apple")), (list<value>() + "fruit" + string("Orange")));
+        const list<value> l = mklist<value>((nilListValue + "fruit" + string("Apple")), (nilListValue + "fruit" + string("Orange")));
         ostringstream wos;
-        write(content(writeJSON(valuesToElements(l), cx)), wos);
-        assert(str(wos) == jsarray);
+        write(content(writeElements(valuesToElements(l))), wos);
+        assert(str(wos) == testArray);
 
         istringstream is(str(wos));
         const list<string> il = streamList(is);
-        const list<value> r = elementsToValues(content(readJSON(il, cx)));
-        const list<value> l2 = mklist<value>(list<value>() + "fruit" + (list<value>() + string("Apple") + string("Orange")));
+        const list<value> r = elementsToValues(content(readElements(il)));
+        const list<value> l2 = mklist<value>(nilListValue + "fruit" + (nilListValue + string("Apple") + string("Orange")));
         assert(r == l2);
     }
     return true;
 }
 
-const string jsitem("{\n"
-    " \"id\": 3,\n"
-    " \"result\": [\n"
-    "  {\n"
-    "   \"price\": \"$2.99\",\n"
-    "   \"name\": \"Apple\"\n"
-    "  },\n"
-    "  {\n"
-    "   \"price\": \"$3.55\",\n"
-    "   \"name\": \"Orange\"\n"
-    "  },\n"
-    "  {\n"
-    "   \"price\": \"$1.55\",\n"
-    "   \"name\": \"Pear\"\n"
-    "  }\n"
-    " ]\n"
-    "}");
-
-const string jsresult("{\n"
-    " \"id\": 1,\n"
-    " \"result\": [\n"
-    "  \"Service.get\",\n"
-    "  \"Service.getTotal\"\n"
-    " ]\n"
-    "}");
-
-const string jsfeed("{\n"
-    " \"id\": 1,\n"
-    " \"result\": [\n"
-    "  \"Sample Feed\",\n"
-    "  \"123456789\",\n"
-    "  [\n"
-    "   \"Item\",\n"
-    "   \"111\",\n"
-    "   {\n"
-    "    \"name\": \"Apple\",\n"
-    "    \"currencyCode\": \"USD\",\n"
-    "    \"currencySymbol\": \"$\",\n"
-    "    \"price\": 2.99\n"
-    "   }\n"
-    "  ],\n"
-    "  [\n"
-    "   \"Item\",\n"
-    "   \"222\",\n"
-    "   {\n"
-    "    \"name\": \"Orange\",\n"
-    "    \"currencyCode\": \"USD\",\n"
-    "    \"currencySymbol\": \"$\",\n"
-    "    \"price\": 3.55\n"
-    "   }\n"
-    "  ],\n"
-    "  [\n"
-    "   \"Item\",\n"
-    "   \"333\",\n"
-    "   {\n"
-    "    \"name\": \"Pear\",\n"
-    "    \"currencyCode\": \"USD\",\n"
-    "    \"currencySymbol\": \"$\",\n"
-    "    \"price\": 1.55\n"
-    "   }\n"
-    "  ]\n"
-    " ]\n"
-    "}");
-
-const string jsechoreq("{\n"
-    " \"id\": 1,\n"
-    " \"method\": \"echo\",\n"
-    " \"params\": [\n"
-    "  {\n"
-    "   \"ns1:echoString\": {\n"
-    "    \"@xmlns:ns1\": \"http://ws.apache.org/axis2/services/echo\",\n"
-    "    \"text\": \"Hello World!\"\n"
-    "   }\n"
-    "  }\n"
-    " ]\n"
-    "}");
-
-const string jsechores("{\n"
-    " \"id\": 1,\n"
-    " \"result\": {\n"
-    "  \"ns1:echoString\": {\n"
-    "   \"@xmlns:ns1\": \"http://ws.apache.org/axis2/c/samples\",\n"
-    "   \"text\": \"Hello World!\"\n"
-    "  }\n"
-    " }\n"
-    "}");
-
-bool testJSONRPC() {
-    gc_scoped_pool pool;
-    js::JSContext cx;
+const string testItem("{"
+    "\"id\":3,"
+    "\"result\":["
+    "{"
+    "\"price\":\"$2.99\","
+    "\"name\":\"Apple\""
+    "},"
+    "{"
+    "\"price\":\"$3.55\","
+    "\"name\":\"Orange\""
+    "},"
+    "{"
+    "\"price\":\"$1.55\","
+    "\"name\":\"Pear\""
+    "}"
+    "]"
+    "}");
+
+const string testResult("{"
+    "\"id\":1,"
+    "\"result\":["
+    "\"Service.get\","
+    "\"Service.getTotal\""
+    "]"
+    "}");
+
+const string testFeed("{"
+    "\"id\":1,"
+    "\"result\":["
+    "\"Sample Feed\","
+    "\"123456789\","
+    "["
+    "\"Item\","
+    "\"111\","
+    "{"
+    "\"name\":\"Apple\","
+    "\"currencyCode\":\"USD\","
+    "\"currencySymbol\":\"$\","
+    "\"price\":2.99"
+    "}"
+    "],"
+    "["
+    "\"Item\","
+    "\"222\","
+    "{"
+    "\"name\":\"Orange\","
+    "\"currencyCode\":\"USD\","
+    "\"currencySymbol\":\"$\","
+    "\"price\":3.55"
+    "}"
+    "],"
+    "["
+    "\"Item\","
+    "\"333\","
+    "{"
+    "\"name\":\"Pear\","
+    "\"currencyCode\":\"USD\","
+    "\"currencySymbol\":\"$\","
+    "\"price\":1.55"
+    "}"
+    "]"
+    "]"
+    "}");
+
+const string testFeed2("{"
+    "\"id\":1,"
+    "\"result\":["
+    "\"Sample Feed\","
+    "\"123456789\","
+    "["
+    "\"Item\","
+    "\"111\","
+    "{"
+    "\"name\":\"Apple\","
+    "\"price\":2.99,"
+    "\"currencyCode\":\"USD\","
+    "\"currencySymbol\":\"$\""
+    "}"
+    "],"
+    "["
+    "\"Item\","
+    "\"222\","
+    "{"
+    "\"name\":\"Orange\","
+    "\"price\":3.55,"
+    "\"currencyCode\":\"USD\","
+    "\"currencySymbol\":\"$\""
+    "}"
+    "],"
+    "["
+    "\"Item\","
+    "\"333\","
+    "{"
+    "\"name\":\"Pear\","
+    "\"price\":1.55,"
+    "\"currencyCode\":\"USD\","
+    "\"currencySymbol\":\"$\""
+    "}"
+    "]"
+    "]"
+    "}");
+
+const string testEchoreq("{"
+    "\"id\":1,"
+    "\"method\":\"echo\","
+    "\"params\":["
+    "{"
+    "\"ns1:echoString\":{"
+    "\"@xmlns:ns1\":\"http://ws.apache.org/axis2/services/echo\","
+    "\"text\":\"Hello World!\""
+    "}"
+    "}"
+    "]"
+    "}");
+
+const string testEchores("{"
+    "\"id\":1,"
+    "\"result\":{"
+    "\"ns1:echoString\":{"
+    "\"@xmlns:ns1\":\"http://ws.apache.org/axis2/c/samples\","
+    "\"text\":\"Hello World!\""
+    "}"
+    "}"
+    "}");
+
+const bool testJSONRPC() {
+    const gc_scoped_pool pool;
     {
-        const string lm("{\"id\": 1, \"method\": \"test\", \"params\": []}");
-        const list<value> e = content(readJSON(mklist(lm), cx));
+        const string lm("{\"id\":1,\"method\":\"test\",\"params\":[]}");
+        const list<value> e = content(readElements(mklist(lm)));
         const list<value> v = elementsToValues(e);
         assert(assoc<value>("id", v) == mklist<value>("id", 1));
         assert(assoc<value>("method", v) == mklist<value>("method", string("test")));
-        assert(assoc<value>("params", v) == mklist<value>("params", list<value>()));
+        assert(assoc<value>("params", v) == mklist<value>("params", nilListValue));
     }
     {
-        const string i2 = "{\"id\": 3,\"result\": {\"0\": {\"price\": \"$2.99\",\"name\": \"Apple\"},\"1\": {\"price\": \"$3.55\",\"name\": \"Orange\"},\"2\": {\"price\": \"$1.55\",\"name\": \"Pear\"}}}";
-        const list<value> e = content(readJSON(mklist(jsitem), cx));
-        const list<value> e2 = content(readJSON(mklist(i2), cx));
-        assert(e == e2);
-    }
-    {
-        const list<value> e = content(readJSON(mklist(jsitem), cx));
+        const list<value> e = content(readElements(mklist(testItem)));
         ostringstream os;
-        write(content(writeJSON(e, cx)), os);
-        assert(str(os) == jsitem);
+        write(content(writeElements(e)), os);
+        assert(str(os) == testItem);
         const list<value> v = elementsToValues(e);
         const list<value> r = valuesToElements(v);
         assert(r == e);
@@ -248,73 +292,86 @@ bool testJSONRPC() {
         const list<value> r = mklist<value>(mklist<value>("id", 1), mklist<value>("result", mklist<value>(string("Service.get"), string("Service.getTotal"))));
         const list<value> e = valuesToElements(r);
         ostringstream os;
-        write(content(writeJSON(e, cx)), os);
-        assert(str(os) == jsresult);
+        write(content(writeElements(e)), os);
+        assert(str(os) == testResult);
     }
     {
-        const list<value> r = content(readJSON(mklist(jsfeed), cx));
+        const list<value> r = content(readElements(mklist(testFeed)));
         const list<value> v = elementsToValues(r);
         const list<value> e = valuesToElements(v);
         ostringstream os;
-        write(content(writeJSON(e, cx)), os);
-        assert(str(os) == jsfeed);
+        write(content(writeElements(e)), os);
+#ifndef __clang__
+        assert(str(os) == testFeed2);
+#endif
     }
     {
-        const list<value> arg = mklist<value>(list<value>() + "ns1:echoString" + (list<value>() + "@xmlns:ns1" + string("http://ws.apache.org/axis2/services/echo")) + (list<value>() + "text" + string("Hello World!")));
-        const failable<list<string> > r = jsonRequest(1, "echo", mklist<value>(arg), cx);
+        const list<value> arg = mklist<value>(nilListValue + "ns1:echoString" + (nilListValue + "@xmlns:ns1" + string("http://ws.apache.org/axis2/services/echo")) + (nilListValue + "text" + string("Hello World!")));
+        const failable<list<string> > r = jsonRequest(1, "echo", mklist<value>(arg));
         ostringstream os;
         write(content(r), os);
-        assert(str(os) == jsechoreq);
+        assert(str(os) == testEchoreq);
 
         istringstream is(str(os));
         const list<string> il = streamList(is);
-        const list<value> ir = elementsToValues(content(readJSON(il, cx)));
+        const list<value> ir = elementsToValues(content(readElements(il)));
         assert(car<value>(cadr<value>(caddr<value>(ir))) == arg);
     }
     {
-        const list<value> res = mklist<value>(list<value>() + "ns1:echoString" + (list<value>() + "@xmlns:ns1" + string("http://ws.apache.org/axis2/c/samples")) + (list<value>() + "text" + string("Hello World!")));
-        const failable<list<string> > r = jsonResult(1, res, cx);
+        const list<value> res = mklist<value>(nilListValue + "ns1:echoString" + (nilListValue + "@xmlns:ns1" + string("http://ws.apache.org/axis2/c/samples")) + (nilListValue + "text" + string("Hello World!")));
+        const failable<list<string> > r = jsonResult(1, res);
         ostringstream os;
         write(content(r), os);
-        assert(str(os) == jsechores);
+        assert(str(os) == testEchores);
 
         istringstream is(str(os));
         const list<string> il = streamList(is);
-        const list<value> ir = elementsToValues(content(readJSON(il, cx)));
+        const list<value> ir = elementsToValues(content(readElements(il)));
         assert(cdr<value>(cadr<value>(ir)) == res);
     }
     return true;
 }
 
-struct testReadWrite {
-    testReadWrite() {
-    }
-    const bool operator()() const {
-        gc_scoped_pool pool;
-        js::JSContext cx;
+const bool readWrite() {
+    const gc_scoped_pool pool;
 
-        const list<value> ad = mklist<value>(mklist<value>(attribute, "city", string("san francisco")), mklist<value>(attribute, "state", string("ca")));
-        const list<value> ac = mklist<value>(mklist<value>(element, "id", string("1234")), mklist<value>(attribute, "balance", 1000));
-        const list<value> cr = mklist<value>(mklist<value> (attribute, "name", string("jdoe")), cons<value>(element, cons<value>("address", ad)), cons<value>(element, cons<value>("account", ac)));
-        const list<value> c = mklist<value>(cons<value>(element, cons<value>("customer", cr)));
+    istringstream is(testCustomer);
+    const list<string> il = streamList(is);
+    const list<value> r = elementsToValues(content(readElements(il)));
+
+    ostringstream os;
+    writeElements<ostream*>(jsonWriter, &os, valuesToElements(r));
+    //assert(str(os) == testCustomer2);
+    return true;
+}
 
-        ostringstream os;
-        writeJSON<ostream*>(jsonWriter, &os, c, cx);
-        assert(str(os) == jscustomer);
+const bool testReadWritePerf() {
+    const gc_scoped_pool pool;
 
-        istringstream is(jscustomer);
-        const list<string> il = streamList(is);
-        const list<value> r = content(readJSON(il, cx));
-        assert(r == c);
-        return true;
-    }
-};
+    const blambda rwl = blambda(readWrite);
+    cout << "JSON read + write test " << time(rwl, 5, 200) << " ms" << endl;
 
-bool testJSONPerf() {
-    gc_scoped_pool pool;
+    return true;
+}
 
-    const lambda<bool()> rwl = lambda<bool()>(testReadWrite());
-    cout << "JSON read + write test " << time(rwl, 5, 200) << " ms" << endl;
+const bool readWriteBigDoc() {
+    const gc_scoped_pool pool;
+
+    istringstream is(testBigDoc);
+    const list<string> il = streamList(is);
+    const list<value> r = elementsToValues(content(readElements(il)));
+
+    ostringstream os;
+    writeElements<ostream*>(jsonWriter, &os, valuesToElements(r));
+    //assert(str(os) == testBigDoc2);
+    return true;
+}
+
+const bool testReadWriteBigDocPerf() {
+    const gc_scoped_pool pool;
+
+    const blambda rwl = blambda(readWriteBigDoc);
+    cout << "JSON big doc read + write test " << time(rwl, 5, 200) << " ms" << endl;
 
     return true;
 }
@@ -323,12 +380,13 @@ bool testJSONPerf() {
 }
 
 int main() {
-    tuscany::gc_scoped_pool p;
+    const tuscany::gc_scoped_pool p;
     tuscany::cout << "Testing..." << tuscany::endl;
 
     tuscany::json::testJSON();
     tuscany::json::testJSONRPC();
-    tuscany::json::testJSONPerf();
+    tuscany::json::testReadWritePerf();
+    tuscany::json::testReadWriteBigDocPerf();
 
     tuscany::cout << "OK" << tuscany::endl;
 

Added: tuscany/sca-cpp/trunk/modules/json/json-test.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/json/json-test.hpp?rev=1419986&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/json-test.hpp (added)
+++ tuscany/sca-cpp/trunk/modules/json/json-test.hpp Tue Dec 11 03:55:19 2012
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/* $Rev$ $Date$ */
+
+/**
+ * Test JSON doc.
+ */
+
+namespace tuscany {
+namespace json {
+
+const string testBigDoc = "{\"feed\":{\"title\":\"Search Results\",\"id\":\"search\",\"entry\":[{\"title\":\"An empty app template\",\"id\":\"new\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"An empty test app\",\"id\":\"test\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Check my public social data\",\"id\":\"me360\",\"author\":\"admin@example.com\",\"updated\":\"Apr 28, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"nearme\",\"id\":\"nearme\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"nearme2\",\"id\":\"nearme2\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Our photos of an event\",\"id\":\"our
 photos\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"My online store\",\"id\":\"shoppingcart\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Slice\",\"id\":\"slice\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test animation components\",\"id\":\"testanimation\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test database components\",\"id\":\"testdb\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test event components\",\"id\":\"testevents\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"
 Sample app\"}}},{\"title\":\"Test HTTP components\",\"id\":\"testhttp\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test logic components\",\"id\":\"testlogic\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test search components\",\"id\":\"testsearch\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test HTTP components\",\"id\":\"testhttp\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test social components\",\"id\":\"testsocial\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test text processing components\",\"id\":\"testtext\",\"author\":\"adm
 in@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test URL components\",\"id\":\"testurl\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test values and lists\",\"id\":\"testvalues\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test widgets\",\"id\":\"testwidgets\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test more widgets\",\"id\":\"testwidgets2\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test HTML generator components\",\"id\":\"testwidgets3\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app
 \"}}},{\"title\":\"jsdtest\",\"id\":\"jsdtest\",\"author\":\"jsdelfino\",\"updated\":\"Jul 27, 2012\",\"content\":{\"stats\":{\"description\":\"Test app\"}}},{\"title\":\"SMS send service\",\"id\":\"twsms\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"boao\",\"id\":\"boao\",\"author\":\"jsdelfino\",\"updated\":\"2012-10-12T12:06:59+00:00\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"An empty test app\",\"id\":\"test\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"An empty app template\",\"id\":\"new\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"nearme\",\"id\":\"nearme\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},
 {\"title\":\"nearme2\",\"id\":\"nearme2\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Our photos of an event\",\"id\":\"ourphotos\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"My online store\",\"id\":\"shoppingcart\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Slice\",\"id\":\"slice\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test animation components\",\"id\":\"testanimation\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test database components\",\"id\":\"testdb\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content
 \":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test event components\",\"id\":\"testevents\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test social components\",\"id\":\"testsocial\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test HTTP components\",\"id\":\"testhttp\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test logic components\",\"id\":\"testlogic\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test search components\",\"id\":\"testsearch\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test HTTP components\",\"id\":\"te
 sthttp\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test text processing components\",\"id\":\"testtext\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test URL components\",\"id\":\"testurl\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test values and lists\",\"id\":\"testvalues\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test widgets\",\"id\":\"testwidgets\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Test more widgets\",\"id\":\"testwidgets2\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"desc
 ription\":\"Sample app\"}}},{\"title\":\"Test HTML generator components\",\"id\":\"testwidgets3\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"test9\",\"id\":\"test9\",\"author\":\"jsdelfino\",\"updated\":\"2012-09-25T06:17:18+00:00\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"SMS send service\",\"id\":\"twsms\",\"author\":\"admin@example.com\",\"updated\":\"Jan 01, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}},{\"title\":\"Check my public social data\",\"id\":\"me360\",\"author\":\"admin@example.com\",\"updated\":\"Apr 28, 2012\",\"content\":{\"stats\":{\"description\":\"Sample app\"}}}]}}";
+
+const string testBigDoc2 = "{\"feed\":{\"title\":\"Search Results\",\"id\":\"search\",\"entry\":[{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"An empty app template\",\"id\":\"new\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"An empty test app\",\"id\":\"test\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Check my public social data\",\"id\":\"me360\",\"updated\":\"Apr 28, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"nearme\",\"id\":\"nearme\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"nearme2\",\"id\":\"nearme2\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample
  app\"}},\"title\":\"Our photos of an event\",\"id\":\"ourphotos\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"My online store\",\"id\":\"shoppingcart\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Slice\",\"id\":\"slice\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test animation components\",\"id\":\"testanimation\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test database components\",\"id\":\"testdb\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test event components\",\"id\":\"testevents\",\"updated\":\"Jan 01, 2012\",\"author\":\"admi
 n@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test HTTP components\",\"id\":\"testhttp\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test logic components\",\"id\":\"testlogic\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test search components\",\"id\":\"testsearch\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test HTTP components\",\"id\":\"testhttp\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test social components\",\"id\":\"testsocial\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test text pr
 ocessing components\",\"id\":\"testtext\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test URL components\",\"id\":\"testurl\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test values and lists\",\"id\":\"testvalues\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test widgets\",\"id\":\"testwidgets\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test more widgets\",\"id\":\"testwidgets2\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test HTML generator components\",\"id\":\"testwidgets3\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.
 com\"},{\"content\":{\"stats\":{\"description\":\"Test app\"}},\"title\":\"jsdtest\",\"id\":\"jsdtest\",\"updated\":\"Jul 27, 2012\",\"author\":\"jsdelfino\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"SMS send service\",\"id\":\"twsms\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"boao\",\"id\":\"boao\",\"updated\":\"2012-10-12T12:06:59+00:00\",\"author\":\"jsdelfino\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"An empty test app\",\"id\":\"test\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"An empty app template\",\"id\":\"new\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"nearme\",\"id\":\"nearme\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"}
 ,{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"nearme2\",\"id\":\"nearme2\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Our photos of an event\",\"id\":\"ourphotos\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"My online store\",\"id\":\"shoppingcart\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Slice\",\"id\":\"slice\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test animation components\",\"id\":\"testanimation\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test database components\",\"id\":\"testdb\",\"updated\":\
 "Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test event components\",\"id\":\"testevents\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test social components\",\"id\":\"testsocial\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test HTTP components\",\"id\":\"testhttp\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test logic components\",\"id\":\"testlogic\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test search components\",\"id\":\"testsearch\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sam
 ple app\"}},\"title\":\"Test HTTP components\",\"id\":\"testhttp\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test text processing components\",\"id\":\"testtext\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test URL components\",\"id\":\"testurl\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test values and lists\",\"id\":\"testvalues\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test widgets\",\"id\":\"testwidgets\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test more widgets\",\"id\":\"testwidgets2\",\"updated\":\"Jan 01, 2012\",\"aut
 hor\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Test HTML generator components\",\"id\":\"testwidgets3\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"test9\",\"id\":\"test9\",\"updated\":\"2012-09-25T06:17:18+00:00\",\"author\":\"jsdelfino\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"SMS send service\",\"id\":\"twsms\",\"updated\":\"Jan 01, 2012\",\"author\":\"admin@example.com\"},{\"content\":{\"stats\":{\"description\":\"Sample app\"}},\"title\":\"Check my public social data\",\"id\":\"me360\",\"updated\":\"Apr 28, 2012\",\"author\":\"admin@example.com\"}]}}";
+
+}
+}
+

Modified: tuscany/sca-cpp/trunk/modules/json/json.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/json/json.hpp?rev=1419986&r1=1419985&r2=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/json.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/json/json.hpp Tue Dec 11 03:55:19 2012
@@ -31,50 +31,243 @@
 #include "value.hpp"
 #include "element.hpp"
 #include "monad.hpp"
-#include "../js/eval.hpp"
+#include "jansson.h"
 
 namespace tuscany {
 namespace json {
 
 /**
- * Return true if a list of strings contains a JSON document.
+ * Customize JSON memory allocation functions.
  */
-const bool isJSON(const list<string>& ls) {
-    if (isNil(ls))
-        return false;
-    const string s = substr(car(ls), 0, 1);
-    return s == "[" || s == "{";
+inline void* jsonAlloc(size_t size) {
+    return gc_pool_malloc(size);
 }
 
+inline void jsonFree(void *ptr) {
+    return gc_pool_free(ptr);
+}
+
+class JSONAllocFuncs {
+public:
+    inline JSONAllocFuncs() {
+        json_set_alloc_funcs(jsonAlloc, jsonFree);
+    }
+} jsonAllocFuncs;
+
 /**
- * Consumes JSON strings and populates a JS object.
+ * Returns true if a list represents a JS array.
  */
-failable<bool> consume(JSONParser* parser, const list<string>& ilist, const js::JSContext& cx) {
-    if (isNil(ilist))
+inline const bool isJSArray(const list<value>& l) {
+    if(isNil(l))
         return true;
-    JSString* jstr = JS_NewStringCopyZ(cx, c_str(car(ilist)));
-    if(!JS_ConsumeJSONText(cx, parser, JS_GetStringCharsZ(cx, jstr), (uint32)JS_GetStringLength(jstr)))
-        return mkfailure<bool>("JS_ConsumeJSONText failed");
-    return consume(parser, cdr(ilist), cx);
+    const value v = car(l);
+    if (isSymbol(v))
+        return false;
+    if(isList(v)) {
+        if(!isNil((list<value>)v) && isSymbol(car<value>(v)))
+            return false;
+    }
+    return true;
+}
+
+/**
+ * Converts a JS array to values.
+ */
+inline const list<value> jsArrayToValues(const list<value>& listSoFar, json_t* const a, const int i) {
+    const value jsValToValue(json_t* const jsv);
+
+    if (i < 0)
+        return listSoFar;
+    json_t* const jsv = json_array_get(a, i);
+    const value val = jsValToValue(jsv);
+    return jsArrayToValues(cons(val, listSoFar), a, i - 1);
+}
+
+/**
+ * Converts JS properties to values.
+ */
+inline const list<value> jsPropertiesToValues(const list<value>& propertiesSoFar, json_t* const o, void* i) {
+    const value jsValToValue(json_t* const jsv);
+
+    if (i == NULL)
+        return reverse(propertiesSoFar);
+    const char* const name = json_object_iter_key(i);
+    json_t* const jsv = json_object_iter_value(i);
+    const value val = jsValToValue(jsv);
+    if (isNil(val) && !isList(val))
+        return jsPropertiesToValues(cons<value> (mklist<value> (element, c_str(name), val), propertiesSoFar), o, json_object_iter_next(o, i));
+    if (substr(name, 0, 1) == atsign)
+        return jsPropertiesToValues(cons<value>(mklist<value>(attribute, c_str(substr(name, 1)), val), propertiesSoFar), o, json_object_iter_next(o, i));
+    if (isList(val) && !isJSArray(val))
+        return jsPropertiesToValues(cons<value>(cons<value>(element, cons<value>(c_str(name), list<value>(val))), propertiesSoFar), o, json_object_iter_next(o, i));
+    return jsPropertiesToValues(cons<value> (mklist<value> (element, c_str(name), val), propertiesSoFar), o, json_object_iter_next(o, i));
+}
+
+/**
+ * Converts a JS val to a value.
+ */
+const value jsValToValue(json_t* const jsv) {
+    switch(json_typeof(jsv)) {
+    case json_type::JSON_STRING: {
+        const string svalue = string(json_string_value(jsv));
+        return value(svalue);
+    }
+    case json_type::JSON_TRUE: {
+        return value((bool)true);
+    }
+    case json_type::JSON_FALSE: {
+        return value((bool)false);
+    }
+    case json_type::JSON_REAL: {
+        return value((double)json_real_value(jsv));
+    }
+    case json_type::JSON_INTEGER: {
+        return value((double)json_integer_value(jsv));
+    }
+    case json_type::JSON_NULL: {
+        return nilValue;
+    }
+    case json_type::JSON_ARRAY: {
+        const int i = (int)json_array_size(jsv) - 1;
+        const value v = jsArrayToValues(list<value> (), jsv, i);
+        return v;
+    }
+    case json_type::JSON_OBJECT: {
+        void* const i = json_object_iter(jsv);
+        const value v = jsPropertiesToValues(list<value> (), jsv, i);
+        return v;
+    }
+    default: {
+        return nilValue;
+    }
+    }
+}
+
+/**
+ * Converts a list of values to JS array elements.
+ */
+inline json_t* const valuesToJSElements(json_t* const a, const list<value>& l) {
+    json_t* const valueToJSVal(const value& val);
+    if (isNil(l))
+        return a;
+    json_t* const v = valueToJSVal(car(l));
+    json_array_append(a, v);
+    return valuesToJSElements(a, cdr(l));
+}
+
+/**
+ * Converts a value to a JS val.
+ */
+inline json_t* const valueToJSVal(const value& val) {
+    json_t* const valuesToJSProperties(json_t* const o, const list<value>& l);
+
+    switch(type(val)) {
+    case value::String: {
+        return json_string(c_str((string)val));
+    }
+    case value::Symbol: {
+        return json_string(c_str((string)val));
+    }
+    case value::Bool: {
+        return json_boolean((bool)val);
+    }
+    case value::Number: {
+        const double d = (double)val;
+        if (((double)((json_int_t)d)) == d)
+            return json_integer((json_int_t)d);
+        else
+            return json_real(d);
+    }
+    case value::List: {
+        if (isJSArray(val)) {
+            json_t* const a = json_array();
+            return valuesToJSElements(a, val);
+        }
+        json_t* const c = json_object();
+        return valuesToJSProperties(c, val);
+    }
+    case value::Nil: {
+        return json_null();
+    }
+    default: {
+        return json_null();
+    }
+    }
 }
 
 /**
- * Convert a list of strings representing a JSON document to a list of values.
+ * Converts a list of values to JS properties.
  */
-const failable<list<value> > readJSON(const list<string>& ilist, const js::JSContext& cx) {
-    jsval val;
-    JSONParser* parser = JS_BeginJSONParse(cx, &val);
-    if(parser == NULL)
-        return mkfailure<list<value> >("JS_BeginJSONParse failed");
+inline json_t* const valuesToJSProperties(json_t* const o, const list<value>& l) {
+    if (isNil(l))
+        return o;
 
-    const failable<bool> consumed = consume(parser, ilist, cx);
+    // Write an attribute
+    const value token(car(l));
 
-    if(!JS_FinishJSONParse(cx, parser, JSVAL_NULL))
-        return mkfailure<list<value> >("JS_FinishJSONParse failed");
-    if(!hasContent(consumed))
-        return mkfailure<list<value> >(consumed);
+    if (isTaggedList(token, attribute)) {
+        json_t* const v = valueToJSVal(attributeValue(token));
+        json_object_set(o, c_str(atsign + string(attributeName(token))), v);
+
+    } else if (isTaggedList(token, element)) {
+
+        // Write the value of an element
+        if (elementHasValue(token)) {
+            json_t* const v = valueToJSVal(elementValue(token));
+            json_object_set(o, c_str(string(elementName(token))), v);
+
+        } else {
+
+            // Write a parent element
+            json_t* const c = json_object();
+            json_object_set(o, c_str(string(elementName(token))), c);
+
+            // Write its children
+            valuesToJSProperties(c, elementChildren(token));
+        }
+    }
+
+    // Go on
+    return valuesToJSProperties(o, cdr(l));
+}
+
+/**
+ * Return true if a list of strings contains a JSON document.
+ */
+inline const bool isJSON(const list<string>& ls) {
+    if (isNil(ls))
+        return false;
+    const string s = substr(car(ls), 0, 1);
+    return s == "[" || s == "{";
+}
 
-    return list<value>(js::jsValToValue(val, cx));
+ /**
+  * Convert a list of strings representing a JSON document to a list of elements.
+  */
+inline const failable<list<value> > readElements(const list<string>& ilist) {
+    ostringstream os;
+    write(ilist, os);
+    json_error_t e;
+    json_t* const val = json_loads(c_str(str(os)), 0, &e);
+   if(val == NULL)
+        return mkfailure<list<value> >(string("json_loads failed: ") + string(e.text));
+    return list<value>(jsValToValue(val));
+}
+ 
+/**
+ * Convert a list of strings representing a JSON document to a value
+ */
+inline const failable<value> readValue(const list<string>& ilist) {
+    ostringstream os;
+    write(ilist, os);
+    json_error_t e;
+    json_t* const jv = json_loads(c_str(str(os)), JSON_DECODE_ANY, &e);
+    if(jv == NULL)
+        return mkfailure<value>(string("json_loads failed: ") + string(e.text));
+    const value val = jsValToValue(jv);
+    if (!isList(val))
+        return val;
+    return (value)elementsToValues(val);
 }
 
 /**
@@ -82,47 +275,68 @@ const failable<list<value> > readJSON(co
  */
 template<typename R> class WriteContext {
 public:
-    WriteContext(const lambda<R(const string&, const R)>& reduce, const R& accum, const js::JSContext& cx) : cx(cx), reduce(reduce), accum(accum) {
+    inline WriteContext(const lambda<const R(const string&, const R)>& reduce, const R& accum) : reduce(reduce), accum(accum) {
     }
-    const js::JSContext& cx;
-    const lambda<R(const string&, const R)> reduce;
-    R accum;
+
+    const lambda<const R(const string&, const R)> reduce;
+    gc_mutable_ref<R> accum;
 };
 
 /**
- * Called by JS_Stringify to write JSON out.
+ * Called by dump_callback to write JSON out.
  */
-template<typename R> JSBool writeCallback(const jschar *buf, uint32 len, void *data) {
-    WriteContext<R>& wcx = *(static_cast<WriteContext<R>*> (data));
-    JSString* jstr = JS_NewUCStringCopyN(wcx.cx, buf, len);
-    char* cstr = JS_EncodeString(wcx.cx, jstr);
-    const string str(cstr, JS_GetStringLength(jstr));
-    JS_free(wcx.cx, cstr);
+template<typename R> inline int writeCallback(const char *buf, size_t len, void *data) {
+    WriteContext<R>& wcx = *(WriteContext<R>*)data;
+    const string str(buf, len);
     wcx.accum = wcx.reduce(str, wcx.accum);
-    return JS_TRUE;
+    return 0;
 }
 
 /**
- * Convert a list of values to a JSON document.
+ * Convert a value to a JSON document.
  */
-template<typename R> const failable<R> writeJSON(const lambda<R(const string&, const R)>& reduce, const R& initial, const list<value>& l, const js::JSContext& cx) {
-    jsval val;
-    if (js::isJSArray(l))
-        val = OBJECT_TO_JSVAL(valuesToJSElements(JS_NewArrayObject(cx, 0, NULL), l, 0, cx));
-    else
-        val = OBJECT_TO_JSVAL(valuesToJSProperties(JS_NewObject(cx, NULL, NULL, NULL), l, cx));
+template<typename R> inline const failable<R> writeValue(const lambda<const R(const string&, const R)>& reduce, const R& initial, const list<value>& l) {
+    json_t* const val = valueToJSVal(l);
+    WriteContext<R> wcx(reduce, initial);
+    if (json_dump_callback(val, writeCallback<R>, &wcx, JSON_COMPACT | JSON_ENSURE_ASCII | JSON_PRESERVE_ORDER | JSON_ENCODE_ANY) == -1)
+        return mkfailure<R>("json_dump_callback failed");
+    return (R)wcx.accum;
+}
 
-    WriteContext<R> wcx(reduce, initial, cx);
-    if (!JS_Stringify(cx, &val, NULL, INT_TO_JSVAL(1), writeCallback<R>, &wcx))
-        return mkfailure<R>("JS_Stringify failed");
-    return wcx.accum;
+/**
+ * Convert a list of elements to a JSON document.
+ */
+template<typename R> inline const failable<R> writeElements(const lambda<const R(const string&, const R)>& reduce, const R& initial, const list<value>& l) {
+    json_t* const val = isJSArray(l)? valuesToJSElements(::json_array(), l) : valuesToJSProperties(::json_object(), l);
+
+    WriteContext<R> wcx(reduce, initial);
+    if (json_dump_callback(val, writeCallback<R>, &wcx, JSON_COMPACT | JSON_ENSURE_ASCII | JSON_PRESERVE_ORDER | JSON_ENCODE_ANY) == -1)
+        return mkfailure<R>("json_dump_callback failed");
+    return (R)wcx.accum;
 }
 
 /**
- * Convert a list of values to a list of strings representing a JSON document.
+ * Convert a list of elements to a list of strings representing a JSON document.
  */
-const failable<list<string> > writeJSON(const list<value>& l, const js::JSContext& cx) {
-    const failable<list<string> > ls = writeJSON<list<string>>(rcons<string>, list<string>(), valuesToElements(elementsToValues(l)), cx);
+inline const failable<list<string> > writeElements(const list<value>& l) {
+    const failable<list<string> > ls = writeElements<list<string>>(rcons<string>, list<string>(), valuesToElements(elementsToValues(l)));
+     if (!hasContent(ls))
+         return ls;
+     return reverse(list<string>(content(ls)));
+}
+ 
+/**
+ * Convert a value to a list of strings representing a JSON document.
+ */
+inline const failable<list<string> > writeValue(const value& v) {
+    if (!isList(v)) {
+        const failable<list<string> > ls = writeValue<list<string>>(rcons<string>, list<string>(), v);
+        if (!hasContent(ls))
+            return ls;
+        return reverse(list<string>(content(ls)));
+    }
+
+    const failable<list<string> > ls = writeElements<list<string>>(rcons<string>, list<string>(), valuesToElements(elementsToValues(valuesToElements(v))));
     if (!hasContent(ls))
         return ls;
     return reverse(list<string>(content(ls)));
@@ -131,44 +345,37 @@ const failable<list<string> > writeJSON(
 /**
  * Convert a list of function + params to a JSON-RPC request.
  */
-const failable<list<string> > jsonRequest(const value& id, const value& func, const value& params, js::JSContext& cx) {
+inline const failable<list<string> > jsonRequest(const value& id, const value& func, const value& params) {
     const list<value> r = mklist<value>(mklist<value>("id", id), mklist<value>("method", string(func)), mklist<value>("params", params));
-    return writeJSON(valuesToElements(r), cx);
+    return writeElements(valuesToElements(r));
 }
 
 /**
  * Convert a value to a JSON-RPC result.
  */
-const failable<list<string> > jsonResult(const value& id, const value& val, js::JSContext& cx) {
-    return writeJSON(valuesToElements(mklist<value>(mklist<value>("id", id), mklist<value>("result", val))), cx);
+inline const failable<list<string> > jsonResult(const value& id, const value& val) {
+    return writeElements(valuesToElements(mklist<value>(mklist<value>("id", id), mklist<value>("result", val))));
 }
 
 /**
  * Convert a JSON-RPC result to a value.
  */
-const failable<value> jsonResultValue(const list<string>& s, js::JSContext& cx) {
-    const failable<list<value> > jsres = json::readJSON(s, cx);
+inline const failable<value> jsonResultValue(const list<string>& s) {
+    const failable<value> jsres = json::readValue(s);
     if (!hasContent(jsres))
         return mkfailure<value>(jsres);
-    const list<value> rval(cadr<value>(elementsToValues(content(jsres))));
+    const list<value> rval(cadr<value>(content(jsres)));
     const value val = cadr(rval);
-    if (isList(val) && !js::isJSArray(val))
+    if (isList(val) && !isJSArray(val))
         return value(mklist<value>(val));
     return val;
 }
 
 /**
- * Convert a JSON payload to a list of values.
- */
-const list<value> jsonValues(const list<value>& e) {
-    return elementsToValues(e);
-}
-
-/**
  * Return a portable function name from a JSON-RPC function name.
  * Strip the ".", "system." and "Service." prefixes added by some JSON-RPC clients.
  */
-const string funcName(const string& f) {
+inline const string funcName(const string& f) {
     if (length(f) > 1 && find(f, ".", 0) == 0)
         return c_str(f) + 1;
     if (length(f) > 7 && find(f, "system.", 0) == 0)
@@ -182,9 +389,9 @@ const string funcName(const string& f) {
  * Returns a list of param values other than the id and method args from a list
  * of key value pairs.
  */
-const list<value> queryParams(const list<list<value> >& a) {
+inline const list<value> queryParams(const list<list<value> >& a) {
     if (isNil(a))
-        return list<value>();
+        return nilListValue;
     const list<value> p = car(a);
     if (car(p) == value("id") || car(p) == value("method"))
         return queryParams(cdr(a));

Modified: tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp?rev=1419986&r1=1419985&r2=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/scheme/json-value.cpp Tue Dec 11 03:55:19 2012
@@ -32,14 +32,13 @@
 namespace tuscany {
 namespace scheme {
 
-int jsonValue() {
-    const js::JSContext cx;
-    const failable<list<value> > lv = json::readJSON(streamList(cin), cx);
-    if (!hasContent(lv)) {
-        cerr << reason(lv) << " : " << rcode(lv);
+const int jsonValue() {
+    const failable<value> v = json::readValue(streamList(cin));
+    if (!hasContent(v)) {
+        cerr << reason(v) << " : " << rcode(v);
         return 1;
     }
-    cout << writeValue(content(lv));
+    write(content(writeValue(content(v))), cout);
     return 0;
 }
 

Modified: tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp?rev=1419986&r1=1419985&r2=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/scheme/value-json.cpp Tue Dec 11 03:55:19 2012
@@ -32,9 +32,8 @@
 namespace tuscany {
 namespace scheme {
 
-int valueJSON() {
-    const js::JSContext cx;
-    failable<list<string> > s = json::writeJSON(readValue(cin), cx);
+const int valueJSON() {
+    const failable<list<string> > s = json::writeValue(content(readValue(cin)));
     if (!hasContent(s)) {
         cerr << reason(s) << " : " << rcode(s);
         return 1;

Added: tuscany/sca-cpp/trunk/patches/jansson-2.4.patch
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/patches/jansson-2.4.patch?rev=1419986&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/patches/jansson-2.4.patch (added)
+++ tuscany/sca-cpp/trunk/patches/jansson-2.4.patch Tue Dec 11 03:55:19 2012
@@ -0,0 +1,11 @@
+--- src/strconv.c
++++ src/strconv.c
+@@ -79,7 +79,7 @@
+     char *start, *end;
+     size_t length;
+ 
+-    ret = snprintf(buffer, size, "%.17g", value);
++    ret = snprintf(buffer, size, "%g", value);
+     if(ret < 0)
+         return -1;
+ 

Added: tuscany/sca-cpp/trunk/unmaintained/README
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/README?rev=1419986&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/unmaintained/README (added)
+++ tuscany/sca-cpp/trunk/unmaintained/README Tue Dec 11 03:55:19 2012
@@ -0,0 +1,3 @@
+Apache Tuscany SCA Unmaintained Modules
+=======================================
+

Copied: tuscany/sca-cpp/trunk/unmaintained/modules/js/Makefile.am (from r1419985, tuscany/sca-cpp/trunk/modules/json/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/js/Makefile.am?p2=tuscany/sca-cpp/trunk/unmaintained/modules/js/Makefile.am&p1=tuscany/sca-cpp/trunk/modules/json/Makefile.am&r1=1419985&r2=1419986&rev=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/js/Makefile.am Tue Dec 11 03:55:19 2012
@@ -15,11 +15,17 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+
 incl_HEADERS = *.hpp
-incldir = $(prefix)/include/modules/json
+incldir = $(prefix)/include/modules/js
+
+moddir = $(prefix)/modules/js
+
+js_test_SOURCES = js-test.cpp
+js_test_LDFLAGS = -ljansson 
+
+js_shell_SOURCES = js-shell.cpp
+js_shell_LDFLAGS = -ljansson 
 
-json_test_SOURCES = json-test.cpp
-json_test_LDFLAGS = -lmozjs 
+mod_PROGRAMS = js-shell
 
-noinst_PROGRAMS = json-test
-TESTS = json-test

Added: tuscany/sca-cpp/trunk/unmaintained/modules/js/configure.ac
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/js/configure.ac?rev=1419986&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/unmaintained/modules/js/configure.ac (added)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/js/configure.ac Tue Dec 11 03:55:19 2012
@@ -0,0 +1,63 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# Enable Javascript support.
+AC_MSG_CHECKING([whether to enable Javascript support])
+AC_ARG_ENABLE(js, [AS_HELP_STRING([--enable-js], [enable Javascript support [default=no]])],
+[ case "${enableval}" in
+  no)
+    AC_MSG_RESULT(no)
+    ;;
+  *)
+    AC_MSG_RESULT(yes)
+    want_js=true
+    ;;
+  esac ],
+[
+  AC_MSG_RESULT(no)
+])
+if test "${want_js}" = "true"; then
+
+  # Configure path to libmozjs includes and lib.
+  AC_MSG_CHECKING([for js-include])
+  AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH], [path to installed SpiderMonkey include dir
+                [default=/usr/include]])], [
+  JS_INCLUDE="${withval}"
+  AC_MSG_RESULT("${withval}")
+  ], [
+  JS_INCLUDE="/usr/include"
+  AC_MSG_RESULT(/usr/include)
+  ])
+  AC_MSG_CHECKING([for js-lib])
+  AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH], [path to installed SpiderMonkey lib dir [default=/usr/lib]])], [
+  JS_LIB="${withval}"
+  AC_MSG_RESULT("${withval}")
+  ], [
+  JS_LIB="/usr/lib"
+  AC_MSG_RESULT(/usr/lib)
+  ])
+  AC_SUBST(JS_INCLUDE)
+  AC_SUBST(JS_LIB)
+  LIBS="-L${JS_LIB} ${defaultlibs}"
+  AC_CHECK_LIB([mozjs], [JS_NewContext], [], [AC_MSG_ERROR([couldn't find a suitable libmozjs, use --with-js-lib=PATH])])
+  AM_CONDITIONAL([WANT_JS], true)
+  AC_DEFINE([WANT_JS], 1, [enable Javascript support])
+
+else
+  AM_CONDITIONAL([WANT_JS], false)
+fi
+

Copied: tuscany/sca-cpp/trunk/unmaintained/modules/js/eval.hpp (from r1419985, tuscany/sca-cpp/trunk/modules/js/eval.hpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/js/eval.hpp?p2=tuscany/sca-cpp/trunk/unmaintained/modules/js/eval.hpp&p1=tuscany/sca-cpp/trunk/modules/js/eval.hpp&r1=1419985&r2=1419986&rev=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/eval.hpp (original)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/js/eval.hpp Tue Dec 11 03:55:19 2012
@@ -32,7 +32,7 @@
 #pragma GCC diagnostic ignored "-Wsign-compare"
 #pragma GCC diagnostic ignored "-Wredundant-decls"
 #endif
-#include <jsapi.h>
+#include "jsapi.h"
 #ifdef WANT_MAINTAINER_WARNINGS
 #pragma GCC diagnostic warning "-Wunused-parameter"
 #pragma GCC diagnostic warning "-Wsign-compare"
@@ -65,7 +65,12 @@ public:
     JSRuntime() {
         // Create JS runtime
         debug("js::jsruntime");
-        rt = JS_NewRuntime(1L * 512L * 1024L);
+        pthread_mutex_init(&mutex, NULL);
+#ifdef WANT_THREADS
+        rt = JS_NewRuntime(32L * 1024L * 1024L);
+#else
+        rt = JS_NewRuntime(8L * 1024L * 1024L);
+#endif
         if(rt == NULL)
             cleanup();
     }
@@ -78,6 +83,16 @@ public:
         debug("js::~jsruntime");
     }
 
+    bool lock() {
+        //pthread_mutex_lock(&mutex);
+        return true;
+    }
+
+    bool unlock() {
+        //pthread_mutex_unlock(&mutex);
+        return true;
+    }
+
 private:
     bool cleanup() {
         if(rt != NULL) {
@@ -88,6 +103,7 @@ private:
         return true;
     }
 
+    pthread_mutex_t mutex;
     ::JSRuntime* rt;
 } jsRuntime;
 
@@ -110,36 +126,49 @@ perthread_ptr<JSContext> jsContext;
 class JSContext {
 public:
     JSContext() {
-        // Create JS context if necessary
         debug("js::jscontext");
+        jsRuntime.lock();
+
+        // Create JS context if necessary
         if (jsContext != NULL) {
             cx = jsContext;
+            debug(cx, "js::jscontext::beginRequest::cx");
+            JS_SetContextThread(cx);
             JS_BeginRequest(cx);
             return;
         }
-        debug("js::jsnewcontext");
+
+        debug("js::jscontext::newcontext");
         cx = JS_NewContext(jsRuntime, 8192);
-        if(cx == NULL)
+        if(cx == NULL) {
+            jsRuntime.unlock();
             return;
+        }
+        debug(cx, "js::jscontext::beginRequest::cx");
+        JS_SetContextThread(cx);
         JS_BeginRequest(cx);
 
-        JS_SetOptions(cx, JSOPTION_VAROBJFIX | JSOPTION_JIT | JSOPTION_METHODJIT);
+        JS_SetOptions(cx, JSOPTION_VAROBJFIX /*| JSOPTION_JIT | JSOPTION_METHODJIT*/);
         JS_SetVersion(cx, JSVERSION_LATEST);
         JS_SetErrorReporter(cx, reportError);
-        //JS_SetGCZeal(cx, 2);
+        JS_SetGCZeal(cx, 0);
 
         // Create global JS object
         global = JS_NewCompartmentAndGlobalObject(cx, &jsGlobalClass, NULL);
         if(global == NULL) {
+            JS_DestroyContext(cx);
             cleanup();
             return;
         }
+        JS_SetGlobalObject(cx, global);
 
         // Populate global object with the standard globals, like Object and Array
         if(!JS_InitStandardClasses(cx, global)) {
+            JS_DestroyContext(cx);
             cleanup();
             return;
         }
+
         jsContext = cx;
     }
 
@@ -159,14 +188,23 @@ public:
 private:
     bool cleanup() {
         if(cx != NULL) {
-            JS_MaybeGC(cx);
-            JS_EndRequest(cx);
             if (cx != jsContext) {
-                debug("js::jsdestroycontext");
+                debug(cx, "js::jscontext::endrequest::cx");
+                JS_EndRequest(cx);
+                JS_ClearContextThread(cx);
+                debug(cx, "js::jscontext::destroycontext::cx");
                 JS_DestroyContext(cx);
+                jsContext = NULL;
+            } else {
+                //debug(cx, "js::jscontext::maybegc::cx");
+                //JS_MaybeGC(cx);
+                debug(cx, "js::jscontext::endrequest::cx");
+                JS_EndRequest(cx);
+                JS_ClearContextThread(cx);
             }
             cx = NULL;
         }
+        jsRuntime.unlock();
         return true;
     }
 
@@ -241,7 +279,7 @@ const value jsValToValue(const jsval& js
         return value((bool)JSVAL_TO_BOOLEAN(jsv));
     }
     case JSTYPE_NUMBER: {
-        jsdouble jsd;
+        double jsd;
         JS_ValueToNumber(cx, jsv, &jsd);
         return value((double)jsd);
     }
@@ -290,15 +328,18 @@ const jsval valueToJSVal(const value& va
         return BOOLEAN_TO_JSVAL((bool)val);
     }
     case value::Number: {
-        jsval jsv;
-        if (!JS_NewNumberValue(cx, (jsdouble)val, &jsv))
-            return DOUBLE_TO_JSVAL(0);
+        jsval jsv = DOUBLE_TO_JSVAL((double)val);
         return jsv;
     }
     case value::List: {
-        if (isJSArray(val))
-            return OBJECT_TO_JSVAL(valuesToJSElements(JS_NewArrayObject(cx, 0, NULL), val, 0, cx));
-        return OBJECT_TO_JSVAL(valuesToJSProperties(JS_NewObject(cx, NULL, NULL, NULL), val, cx));
+        if (isJSArray(val)) {
+            JSObject* array = JS_NewArrayObject(cx, 0, NULL);
+            //debug(array, "js::valueToJSVal::new::array");
+            return OBJECT_TO_JSVAL(valuesToJSElements(array, val, 0, cx));
+        }
+        JSObject* child = JS_NewObject(cx, NULL, NULL, NULL);
+        //debug(child, "js::valueToJSVal::new::child");
+        return OBJECT_TO_JSVAL(valuesToJSProperties(child, val, cx));
     }
     case value::Nil: {
         return JSVAL_NULL;
@@ -334,6 +375,7 @@ JSObject* valuesToJSProperties(JSObject*
 
             // Write a parent element
             JSObject* child = JS_NewObject(cx, NULL, NULL, NULL);
+            //debug(child, "js::valuesToJSProperties::new::child");
             jsval pv = OBJECT_TO_JSVAL(child);
             JS_SetProperty(cx, o, c_str(string(elementName(token))), &pv);
 
@@ -352,7 +394,7 @@ JSObject* valuesToJSProperties(JSObject*
 const failable<value> evalScript(const string& s) {
     js::JSContext cx;
     jsval rval;
-    JSBool rc = JS_EvaluateScript(cx, cx.getGlobal(), c_str(s), (uintN)length(s), "eval.js", 1, &rval);
+    JSBool rc = JS_EvaluateScript(cx, cx.getGlobal(), c_str(s), (unsigned int)length(s), "eval.js", 1, &rval);
     if (rc != JS_TRUE) {
         return mkfailure<value>("Couldn't evaluate Javascript script.");
     }

Copied: tuscany/sca-cpp/trunk/unmaintained/modules/js/js-shell.cpp (from r1419985, tuscany/sca-cpp/trunk/modules/js/js-shell.cpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/js/js-shell.cpp?p2=tuscany/sca-cpp/trunk/unmaintained/modules/js/js-shell.cpp&p1=tuscany/sca-cpp/trunk/modules/js/js-shell.cpp&r1=1419985&r2=1419986&rev=1419986&view=diff
==============================================================================
    (empty)

Copied: tuscany/sca-cpp/trunk/unmaintained/modules/js/js-test.cpp (from r1419985, tuscany/sca-cpp/trunk/modules/js/js-test.cpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/js/js-test.cpp?p2=tuscany/sca-cpp/trunk/unmaintained/modules/js/js-test.cpp&p1=tuscany/sca-cpp/trunk/modules/js/js-test.cpp&r1=1419985&r2=1419986&rev=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/js/js-test.cpp (original)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/js/js-test.cpp Tue Dec 11 03:55:19 2012
@@ -26,18 +26,39 @@
 #include <assert.h>
 #include "stream.hpp"
 #include "string.hpp"
+#include "parallel.hpp"
+#include "perf.hpp"
 #include "eval.hpp"
 
 namespace tuscany {
 namespace js {
 
-bool testJSEval() {
+bool testEval() {
+    gc_scoped_pool pool;
     failable<value> v = evalScript("(function testJSON(n){ return JSON.parse(JSON.stringify(n)) })(5)");
     assert(hasContent(v));
     assert(content(v) == value(5));
     return true;
 }
 
+struct evalLoop {
+    evalLoop() {
+    }
+    const bool operator()() const {
+        failable<value> v = evalScript("(function testJSON(n){ return JSON.parse(JSON.stringify(n)) })(5)");
+        assert(hasContent(v));
+        assert(content(v) == value(5));
+        return true;
+    }
+};
+
+const bool testEvalPerf() {
+    gc_scoped_pool pool;
+    const lambda<bool()> el = evalLoop();
+    cout << "JS eval test " << time(el, 5, 5) << " ms" << endl;
+    return true;
+}
+
 }
 }
 
@@ -45,7 +66,8 @@ int main() {
     tuscany::gc_scoped_pool p;
     tuscany::cout << "Testing..." << tuscany::endl;
 
-    tuscany::js::testJSEval();
+    tuscany::js::testEval();
+    tuscany::js::testEvalPerf();
 
     tuscany::cout << "OK" << tuscany::endl;
 

Added: tuscany/sca-cpp/trunk/unmaintained/modules/js/macos-install
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/js/macos-install?rev=1419986&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/unmaintained/modules/js/macos-install (added)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/js/macos-install Tue Dec 11 03:55:19 2012
@@ -0,0 +1,47 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# Build Mozilla Portable Runtime
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/nspr-4.8.8.tar.gz
+tar xzf nspr-4.8.8.tar.gz
+cd nspr-4.8.8/mozilla/nsprpub
+./configure --prefix=$build/nspr-4.8.8-bin --enable-64bit
+make
+make install
+install_name_tool -id $build/nspr-4.8.8-bin/lib/libnspr4.dylib $build/nspr-4.8.8-bin/lib/libnspr4.dylib
+install_name_tool -id $build/nspr-4.8.8-bin/lib/libplc4.dylib $build/nspr-4.8.8-bin/lib/libplc4.dylib
+install_name_tool -id $build/nspr-4.8.8-bin/lib/libplds4.dylib $build/nspr-4.8.8-bin/lib/libplds4.dylib
+install_name_tool -change @executable_path/libnspr4.dylib $build/nspr-4.8.8-bin/lib/libnspr4.dylib $build/nspr-4.8.8-bin/lib/libplc4.dylib
+install_name_tool -change @executable_path/libnspr4.dylib $build/nspr-4.8.8-bin/lib/libnspr4.dylib $build/nspr-4.8.8-bin/lib/libplds4.dylib
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
+
+# Build SpiderMonkey
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz 
+tar xzf js185-1.0.0.tar.gz
+cd js-1.8.5/js/src
+./configure --prefix=$build/js-1.8.5-bin --enable-threadsafe --with-system-nspr --with-nspr-prefix=$build/nspr-4.8.8-bin
+make
+make install
+ln -s $build/js-1.8.5-bin/lib/libmozjs185.dylib $build/js-1.8.5-bin/lib/libmozjs.dylib
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
+

Propchange: tuscany/sca-cpp/trunk/unmaintained/modules/js/macos-install
------------------------------------------------------------------------------
    svn:executable = *

Added: tuscany/sca-cpp/trunk/unmaintained/modules/js/ubuntu-install
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/js/ubuntu-install?rev=1419986&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/unmaintained/modules/js/ubuntu-install (added)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/js/ubuntu-install Tue Dec 11 03:55:19 2012
@@ -0,0 +1,48 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#    
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+
+# Build Mozilla Portable Runtime
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.8.8/src/nspr-4.8.8.tar.gz
+tar xzf nspr-4.8.8.tar.gz
+cd nspr-4.8.8/mozilla/nsprpub
+./configure --prefix=$build/nspr-4.8.8-bin --enable-64bit
+make
+make install
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
+
+# Build SpiderMonkey
+sudo apt-get -y install zip unzip
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+curl -OL http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
+tar xzf js185-1.0.0.tar.gz
+cd js-1.8.5/js/src
+export LD_RUN_PATH=$build/nspr-4.8.8-bin/lib
+./configure --prefix=$build/js-1.8.5-bin --enable-threadsafe --with-system-nspr --with-nspr-prefix=$build/nspr-4.8.8-bin
+make
+make install
+unset LD_RUN_PATH
+ln -s $build/js-1.8.5-bin/lib/libmozjs185.so $build/js-1.8.5-bin/lib/libmozjs.so
+if [ "$?" != "0" ]; then
+    exit $?
+fi
+cd $build
+

Propchange: tuscany/sca-cpp/trunk/unmaintained/modules/js/ubuntu-install
------------------------------------------------------------------------------
    svn:executable = *

Copied: tuscany/sca-cpp/trunk/unmaintained/modules/json/Makefile.am (from r1419985, tuscany/sca-cpp/trunk/modules/json/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/json/Makefile.am?p2=tuscany/sca-cpp/trunk/unmaintained/modules/json/Makefile.am&p1=tuscany/sca-cpp/trunk/modules/json/Makefile.am&r1=1419985&r2=1419986&rev=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/json/Makefile.am Tue Dec 11 03:55:19 2012
@@ -15,6 +15,8 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
+if WANT_JS
+
 incl_HEADERS = *.hpp
 incldir = $(prefix)/include/modules/json
 
@@ -23,3 +25,5 @@ json_test_LDFLAGS = -lmozjs 
 
 noinst_PROGRAMS = json-test
 TESTS = json-test
+
+endif

Copied: tuscany/sca-cpp/trunk/unmaintained/modules/json/json-test.cpp (from r1419985, tuscany/sca-cpp/trunk/modules/json/json-test.cpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/json/json-test.cpp?p2=tuscany/sca-cpp/trunk/unmaintained/modules/json/json-test.cpp&p1=tuscany/sca-cpp/trunk/modules/json/json-test.cpp&r1=1419985&r2=1419986&rev=1419986&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/json/json-test.cpp (original)
+++ tuscany/sca-cpp/trunk/unmaintained/modules/json/json-test.cpp Tue Dec 11 03:55:19 2012
@@ -27,6 +27,7 @@
 #include "stream.hpp"
 #include "string.hpp"
 #include "json.hpp"
+#include "parallel.hpp"
 #include "perf.hpp"
 
 namespace tuscany {

Copied: tuscany/sca-cpp/trunk/unmaintained/modules/json/json.hpp (from r1419985, tuscany/sca-cpp/trunk/modules/json/json.hpp)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/unmaintained/modules/json/json.hpp?p2=tuscany/sca-cpp/trunk/unmaintained/modules/json/json.hpp&p1=tuscany/sca-cpp/trunk/modules/json/json.hpp&r1=1419985&r2=1419986&rev=1419986&view=diff
==============================================================================
    (empty)



Mime
View raw message