From 48d4c68f589b2d7b901717304a1df47a85fd666e Mon Sep 17 00:00:00 2001 From: mthiru270 Date: Thu, 9 Apr 2020 05:59:16 -0400 Subject: [PATCH 01/51] enabling jsc build in travis --- ci/build_linux.sh | 4 ++-- ci/execute_osx.sh | 7 +++++++ ci/script.sh | 7 +++++-- src/rtScriptJSC/rtJSCWrappers.cpp | 9 +++++++-- tests/pxScene2d/pxscene2dtests.sh | 4 ++++ tests/pxScene2d/test_memoryleak.cpp | 1 + tests/pxScene2d/test_rtnode.cpp | 6 +++++- 7 files changed, 31 insertions(+), 7 deletions(-) diff --git a/ci/build_linux.sh b/ci/build_linux.sh index 507737986e..1e52554902 100755 --- a/ci/build_linux.sh +++ b/ci/build_linux.sh @@ -27,7 +27,7 @@ export PKG_CONFIG_PATH=$TRAVIS_BUILD_DIR/examples/pxScene2d/external/extlibs/lib if [ "$TRAVIS_PULL_REQUEST" = "false" ] then echo "************************* Generating config files *************************" >> $BUILDLOGS - cmake -DPREFER_SYSTEM_LIBRARIES=ON -DPREFER_PKGCONFIG=ON -DPREFER_EXTERNAL_GIF=ON -DSPARK_ENABLE_VIDEO=ON -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON .. >>$BUILDLOGS 2>&1; + cmake -DSUPPORT_JSC=OFF -DPREFER_SYSTEM_LIBRARIES=ON -DPREFER_PKGCONFIG=ON -DPREFER_EXTERNAL_GIF=ON -DSPARK_ENABLE_VIDEO=ON -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON .. >>$BUILDLOGS 2>&1; checkError $? "cmake config failed" "Config error" "Check the error in $BUILDLOGS" echo "************************* Building pxcore,rtcore,pxscene app,libpxscene, unitttests ****" >> $BUILDLOGS @@ -36,7 +36,7 @@ then else echo "************************* Generating config files ****" - cmake -DPREFER_SYSTEM_LIBRARIES=ON -DPREFER_PKGCONFIG=ON -DPREFER_EXTERNAL_GIF=ON -DSPARK_ENABLE_VIDEO=ON -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON .. 1>>$BUILDLOGS; + cmake -DSUPPORT_JSC=OFF -DPREFER_SYSTEM_LIBRARIES=ON -DPREFER_PKGCONFIG=ON -DPREFER_EXTERNAL_GIF=ON -DSPARK_ENABLE_VIDEO=ON -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON .. 1>>$BUILDLOGS; checkError $? "cmake config failed" "Config error" "Check the errors displayed in this window" echo "************************* Building pxcore,rtcore,pxscene app,libpxscene, unitttests ********" diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index df86c67ec3..16eaec88bd 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -57,6 +57,13 @@ printExecLogs() # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Start testRunner ... +sparkPlatform=$1 +if [ "$sparkPlatform" -eq "jsc" ]; then +export SPARK_USE_JSC=1 + echo "Running under JSC Platform" +else + echo "Running under Node Platform" +fi rm -rf /var/tmp/spark.log cd $TRAVIS_BUILD_DIR/examples/pxScene2d/src/spark.app/Contents/MacOS ./spark.sh -enableVideo=false $TESTRUNNERURL?tests=$TESTS & diff --git a/ci/script.sh b/ci/script.sh index 64f051fd0a..419737a93f 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -73,8 +73,11 @@ then sh "unittests_$TRAVIS_OS_NAME.sh" checkError $? "#### Build/unittests/execution [unittests_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" - sh "execute_$TRAVIS_OS_NAME.sh" - checkError $? "#### Build/unittests/execution [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" + sh "execute_$TRAVIS_OS_NAME.sh" "node" + checkError $? "#### Build/unittests/execution node platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" + + sh "execute_$TRAVIS_OS_NAME.sh" "jsc" + checkError $? "#### Build/unittests/execution jsc platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" sh "code_coverage_$TRAVIS_OS_NAME.sh" checkError $? "#### Build/unittests/execution [code_coverage_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 91a5926b88..5bb9e656a5 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -973,6 +973,10 @@ rtError JSObjectWrapper::Get(uint32_t i, rtValue* value) const return RT_ERROR_INVALID_ARG; JSValueRef exc = nullptr; JSValueRef valueRef = JSObjectGetPropertyAtIndex(context(), wrapped(), i, &exc); + if (JSValueGetType(context(), valueRef) == kJSTypeUndefined) + { + return RT_PROPERTY_NOT_FOUND; + } if (exc) { printException(context(), exc); return RT_FAIL; @@ -993,7 +997,8 @@ rtError JSObjectWrapper::Set(const char* name, const rtValue* value) return RT_FAIL; } if (!name || !value) - return RT_FAIL; + return RT_ERROR_INVALID_ARG; + if (m_isArray) return RT_PROP_NOT_FOUND; JSValueRef valueRef = rtToJs(context(), *value); @@ -1012,7 +1017,7 @@ rtError JSObjectWrapper::Set(uint32_t i, const rtValue* value) { RtJSC::assertIsMainThread(); if (!value) - return RT_FAIL; + return RT_ERROR_INVALID_ARG; JSValueRef valueRef = rtToJs(context(), *value); JSValueRef exc = nullptr; JSObjectSetPropertyAtIndex(context(), wrapped(), i, valueRef, &exc); diff --git a/tests/pxScene2d/pxscene2dtests.sh b/tests/pxScene2d/pxscene2dtests.sh index 55f6872064..ad4b8b8318 100755 --- a/tests/pxScene2d/pxscene2dtests.sh +++ b/tests/pxScene2d/pxscene2dtests.sh @@ -53,6 +53,8 @@ export SPARK_PERMISSIONS_ENABLED=true ln -s ../../examples/pxScene2d/src/shell.js shell.js ln -s ../../examples/pxScene2d/src/init.js init.js ln -s ../../examples/pxScene2d/src/node_modules/ node_modules +ln -s ../../examples/pxScene2d/src/jsc_modules/ jsc_modules +ln -s ../../examples/pxScene2d/src/v8_modules/ v8_modules ln -s ../../examples/pxScene2d/src/rcvrcore/ rcvrcore ln -s ../../examples/pxScene2d/src/FreeSans.ttf FreeSans.ttf ln -s ../../examples/pxScene2d/src/package.json package.json @@ -66,6 +68,8 @@ ${DBG} ./pxscene2dtests "$@" rm -rf shell.js rm -rf init.js rm -rf node_modules +rm -rf jsc_modules +rm -rf v8_modules rm -rf rcvrcore rm -rf FreeSans.ttf rm -rf package.json diff --git a/tests/pxScene2d/test_memoryleak.cpp b/tests/pxScene2d/test_memoryleak.cpp index 462b69a52c..4a2be1f18d 100644 --- a/tests/pxScene2d/test_memoryleak.cpp +++ b/tests/pxScene2d/test_memoryleak.cpp @@ -114,6 +114,7 @@ class pxSceneContainerLeakTest : public testing::Test sceneContainer->AddRef(); sceneContainer->remove(); script.collectGarbage(); + process(); EXPECT_TRUE (sceneptr->isObjectTracked(sceneContainer) == false); sceneContainer->Release(); } diff --git a/tests/pxScene2d/test_rtnode.cpp b/tests/pxScene2d/test_rtnode.cpp index 32bfbcb1f9..7b98c1a0a8 100644 --- a/tests/pxScene2d/test_rtnode.cpp +++ b/tests/pxScene2d/test_rtnode.cpp @@ -31,7 +31,7 @@ TEST(pxScene2dTests, rtNodeTests) { // Create rtNode extern rtScript script; - + if (script.engine().compare("node/v8") == 0) { //v8::Isolate *isolate = script.getIsolate(); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -210,4 +210,8 @@ TEST(pxScene2dTests, rtNodeTests) EXPECT_TRUE((t2 < (t1 / 4)) == true); // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + } + else { + EXPECT_TRUE(true); + } } From bdeb0c2218263125e58bbb4ed833831054fccb01 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Thu, 9 Apr 2020 16:13:22 +0530 Subject: [PATCH 02/51] Update execute_osx.sh --- ci/execute_osx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index 16eaec88bd..ae9d9c9661 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -58,7 +58,7 @@ printExecLogs() # Start testRunner ... sparkPlatform=$1 -if [ "$sparkPlatform" -eq "jsc" ]; then +if [ "$sparkPlatform" = "jsc" ]; then export SPARK_USE_JSC=1 echo "Running under JSC Platform" else From 8ef1bb77e576520cb43043b37611ff3a5f5ea057 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Thu, 9 Apr 2020 16:22:31 +0530 Subject: [PATCH 03/51] Update rtScriptJSC.cpp --- src/rtScriptJSC/rtScriptJSC.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/rtScriptJSC/rtScriptJSC.cpp b/src/rtScriptJSC/rtScriptJSC.cpp index 705fae442c..fb4d8347a0 100644 --- a/src/rtScriptJSC/rtScriptJSC.cpp +++ b/src/rtScriptJSC/rtScriptJSC.cpp @@ -297,8 +297,13 @@ rtJSCContext::~rtJSCContext() rtLogInfo("%s begin", __FUNCTION__); if (gTopLevelContext == m_context) + { + if (gTopLevelContext != nullptr) { + JSSynchronousGarbageCollectForDebugging(gTopLevelContext); + } gTopLevelContext = nullptr; - + } + // RtJSC::dispatchOnMainLoop([m_priv=m_priv,m_context=m_context,m_contextGroup=m_contextGroup] { // static JSStringRef codeStr = JSStringCreateWithUTF8CString("console.clear(); delete global.console"); // JSEvaluateScript(m_context, codeStr, nullptr, nullptr, 0, nullptr); @@ -476,8 +481,7 @@ rtError rtScriptJSC::pump() rtError rtScriptJSC::collectGarbage() { if (gTopLevelContext) { - JSGarbageCollect(gTopLevelContext); - // JSSynchronousGarbageCollectForDebugging(gTopLevelContext); + JSSynchronousGarbageCollectForDebugging(gTopLevelContext); } return RT_OK; } From 9fd23a2d2899c51c199203d0f1a1d5ec2f1e29d4 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Thu, 9 Apr 2020 18:22:11 +0530 Subject: [PATCH 04/51] Update Spark.cpp --- examples/pxScene2d/src/Spark.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/examples/pxScene2d/src/Spark.cpp b/examples/pxScene2d/src/Spark.cpp index d8898df931..aa0c11c67d 100644 --- a/examples/pxScene2d/src/Spark.cpp +++ b/examples/pxScene2d/src/Spark.cpp @@ -308,10 +308,6 @@ class sceneWindow : public pxWindow, public pxIViewContainer if (gDumpMemUsage) { - #ifdef RUNINMAIN - script.pump(); - #endif - script.collectGarbage(); rtLogInfo("pxobjectcount is [%d]",pxObjectCount); #ifndef PX_PLATFORM_DFB_NON_X11 rtLogInfo("texture memory usage is [%" PRId64 "]",context.currentTextureMemoryUsageInBytes()); From 5ebe1c6ed45a8a8efd2cc8f9039bc52c82a8ed95 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Thu, 9 Apr 2020 19:07:27 +0530 Subject: [PATCH 05/51] Update script.sh --- ci/script.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ci/script.sh b/ci/script.sh index 419737a93f..05dff7be42 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -76,9 +76,12 @@ then sh "execute_$TRAVIS_OS_NAME.sh" "node" checkError $? "#### Build/unittests/execution node platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" - sh "execute_$TRAVIS_OS_NAME.sh" "jsc" - checkError $? "#### Build/unittests/execution jsc platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" - + if [ "$TRAVIS_OS_NAME" = "osx" ] + then + sh "execute_$TRAVIS_OS_NAME.sh" "jsc" + checkError $? "#### Build/unittests/execution jsc platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" + fi + sh "code_coverage_$TRAVIS_OS_NAME.sh" checkError $? "#### Build/unittests/execution [code_coverage_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" From 23962e353b8b81f2e243ddbf6a2d33621855bc64 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Thu, 9 Apr 2020 23:47:22 -0400 Subject: [PATCH 06/51] Update script.sh --- ci/script.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/script.sh b/ci/script.sh index 05dff7be42..5018c2ebe1 100755 --- a/ci/script.sh +++ b/ci/script.sh @@ -73,14 +73,14 @@ then sh "unittests_$TRAVIS_OS_NAME.sh" checkError $? "#### Build/unittests/execution [unittests_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" - sh "execute_$TRAVIS_OS_NAME.sh" "node" - checkError $? "#### Build/unittests/execution node platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" - if [ "$TRAVIS_OS_NAME" = "osx" ] then sh "execute_$TRAVIS_OS_NAME.sh" "jsc" checkError $? "#### Build/unittests/execution jsc platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" fi + + sh "execute_$TRAVIS_OS_NAME.sh" "node" + checkError $? "#### Build/unittests/execution node platform [execute_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" sh "code_coverage_$TRAVIS_OS_NAME.sh" checkError $? "#### Build/unittests/execution [code_coverage_$TRAVIS_OS_NAME.sh] failed" "Either build problem/execution problem" "Analyze corresponding log file" From 536e5dc624259449f702c7f4dffd7eb550f1c9f4 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 00:17:11 -0400 Subject: [PATCH 07/51] Update rtJSCBindings.cpp --- src/rtScriptJSC/rtJSCBindings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCBindings.cpp b/src/rtScriptJSC/rtJSCBindings.cpp index a225389e3e..63d06c81f0 100644 --- a/src/rtScriptJSC/rtJSCBindings.cpp +++ b/src/rtScriptJSC/rtJSCBindings.cpp @@ -182,7 +182,7 @@ static JSValueRef requireCallback(JSContextRef ctx, JSObjectRef, JSObjectRef thi return moduleObj; } - rtLogInfo("Loading %s", path.cString()); + rtLogDebug("Loading %s", path.cString()); std::string codeStr = readFile(path.cString()); if (codeStr.empty()) { JSStringRelease(reqArgStr); From 4d9a03b9773f6328cf1b2d7e7bb046310b708d60 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 00:52:24 -0400 Subject: [PATCH 08/51] Update Spark.cpp --- examples/pxScene2d/src/Spark.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/pxScene2d/src/Spark.cpp b/examples/pxScene2d/src/Spark.cpp index aa0c11c67d..3ad2e35197 100644 --- a/examples/pxScene2d/src/Spark.cpp +++ b/examples/pxScene2d/src/Spark.cpp @@ -308,6 +308,10 @@ class sceneWindow : public pxWindow, public pxIViewContainer if (gDumpMemUsage) { + #ifdef RUNINMAIN + script.pump(); + #endif + script.collectGarbage(); rtLogInfo("pxobjectcount is [%d]",pxObjectCount); #ifndef PX_PLATFORM_DFB_NON_X11 rtLogInfo("texture memory usage is [%" PRId64 "]",context.currentTextureMemoryUsageInBytes()); From f8de396ebb6d497a6a1925a56fd6665c269e5b4c Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 01:20:11 -0400 Subject: [PATCH 09/51] Update CMakeLists.txt --- examples/pxScene2d/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/CMakeLists.txt b/examples/pxScene2d/src/CMakeLists.txt index 675db95cad..ebaff9487e 100644 --- a/examples/pxScene2d/src/CMakeLists.txt +++ b/examples/pxScene2d/src/CMakeLists.txt @@ -62,7 +62,7 @@ option(SPARK_ENABLE_LRU_TEXTURE_EJECTION "SPARK_ENABLE_LRU_TEXTURE_EJECTION" ON) option(SPARK_BACKGROUND_TEXTURE_CREATION "SPARK_BACKGROUND_TEXTURE_CREATION" OFF) option(SPARK_ENABLE_ALPHA_FBO_SUPPORT "SPARK_ENABLE_ALPHA_FBO_SUPPORT" ON) option(SPARK_ENABLE_CURSOR_SUPPORT "SPARK_ENABLE_CURSOR_SUPPORT" OFF) -option(BUILD_WITH_PXOBJECT_TRACKING "BUILD_WITH_PXOBJECT_TRACKING" OFF) +option(BUILD_WITH_PXOBJECT_TRACKING "BUILD_WITH_PXOBJECT_TRACKING" ON) option(SPARK_ENABLE_OPTIMIZED_UPDATE "SPARK_ENABLE_OPTIMIZED_UPDATE" OFF) option(SPARK_ENABLE_WEBGL "SPARK_ENABLE_WEBGL" ON) option(SPARK_ENABLE_THUNDER "SPARK_ENABLE_THUNDER" OFF) From ae9626946cbce16b3adf3a818ca0549f3447e5dd Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 01:43:31 -0400 Subject: [PATCH 10/51] Update unittests_osx.sh --- ci/unittests_osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/unittests_osx.sh b/ci/unittests_osx.sh index b374c6096c..787578a026 100755 --- a/ci/unittests_osx.sh +++ b/ci/unittests_osx.sh @@ -1,4 +1,5 @@ #!/bin/sh +exit 0; checkError() { if [ "$1" -ne 0 ] From 55e64dd4c1528437f28cbbf70c2073c9b109858d Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 02:15:46 -0400 Subject: [PATCH 11/51] Update tests.json --- tests/pxScene2d/testRunner/tests.json | 30 +-------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/tests/pxScene2d/testRunner/tests.json b/tests/pxScene2d/testRunner/tests.json index eb4a99aa84..0f93662352 100644 --- a/tests/pxScene2d/testRunner/tests.json +++ b/tests/pxScene2d/testRunner/tests.json @@ -70,33 +70,5 @@ {"url":"../tests/test_fallbackFont.js", "title":"test_fallbackFont","useBaseURI":"true"}, {"url":"../tests/test_ws.js", "title":"test_ws","useBaseURI":"true"}, {"url":"../tests/test_storage.js", "title":"test_storage","useBaseURI":"true"}, - {"url":"../tests/test_pxSuspendAndResume.js", "title":"test_pxSuspendAndResume","useBaseURI":"true"}, - {"url": "https://www.sparkui.org/examples/Lightning/actions/js/init.spark", "title": "actions", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/action-value/js/init.spark", "title": "action-value", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/animations/js/init.spark", "title": "animations", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/animations-attributes/js/init.spark", "title": "animations-attributes", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/animations-events/js/init.spark", "title": "animations-events", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/animations-methods/js/init.spark", "title": "animations-methods", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/attributes/js/init.spark", "title": "attributes", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/children/js/init.spark", "title": "children", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/events/js/init.spark", "title": "events", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/fire-ancestors/js/init.spark", "title": "fire-ancestors", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/focus/js/init.spark", "title": "focus", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/images/js/init.spark", "title": "images", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/key-handling/js/init.spark", "title": "key-handling", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/methods/js/init.spark", "title": "methods", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/nesting-states/js/init.spark", "title": "nesting-states", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/patch/js/init.spark", "title": "patch", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/positioning/js/init.spark", "title": "positioning", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/rectangles/js/init.spark", "title": "rectangles", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/rendering/js/init.spark", "title": "rendering", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/signal/js/init.spark", "title": "signal", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/state-events/js/init.spark", "title": "state-events", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/switching-states/js/init.spark", "title": "switching-states", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/template/js/init.spark", "title": "template", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/text/js/init.spark", "title": "text", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/toolbox/js/init.spark", "title": "toolbox", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/transforms/js/init.spark", "title": "transforms", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/transitions/js/init.spark", "title": "transitions", "timeToRun": "3000", "useBaseURI": "false"}, - {"url": "https://www.sparkui.org/examples/Lightning/value-smoothing/js/init.spark", "title": "value-smoothing", "timeToRun": "3000", "useBaseURI": "false"} + {"url":"../tests/test_pxSuspendAndResume.js", "title":"test_pxSuspendAndResume","useBaseURI":"true"} ] From 0b7e52db8effd580adc9f297db9595a82dc192e4 Mon Sep 17 00:00:00 2001 From: mthiru270 Date: Fri, 10 Apr 2020 03:54:20 -0400 Subject: [PATCH 12/51] fix leaks with lightning apps --- ci/unittests_osx.sh | 1 - examples/pxScene2d/src/CMakeLists.txt | 2 +- examples/pxScene2d/src/rcvrcore/initGL.js | 15 +++++++++--- tests/pxScene2d/testRunner/tests.json | 30 ++++++++++++++++++++++- 4 files changed, 42 insertions(+), 6 deletions(-) diff --git a/ci/unittests_osx.sh b/ci/unittests_osx.sh index 787578a026..b374c6096c 100755 --- a/ci/unittests_osx.sh +++ b/ci/unittests_osx.sh @@ -1,5 +1,4 @@ #!/bin/sh -exit 0; checkError() { if [ "$1" -ne 0 ] diff --git a/examples/pxScene2d/src/CMakeLists.txt b/examples/pxScene2d/src/CMakeLists.txt index ebaff9487e..675db95cad 100644 --- a/examples/pxScene2d/src/CMakeLists.txt +++ b/examples/pxScene2d/src/CMakeLists.txt @@ -62,7 +62,7 @@ option(SPARK_ENABLE_LRU_TEXTURE_EJECTION "SPARK_ENABLE_LRU_TEXTURE_EJECTION" ON) option(SPARK_BACKGROUND_TEXTURE_CREATION "SPARK_BACKGROUND_TEXTURE_CREATION" OFF) option(SPARK_ENABLE_ALPHA_FBO_SUPPORT "SPARK_ENABLE_ALPHA_FBO_SUPPORT" ON) option(SPARK_ENABLE_CURSOR_SUPPORT "SPARK_ENABLE_CURSOR_SUPPORT" OFF) -option(BUILD_WITH_PXOBJECT_TRACKING "BUILD_WITH_PXOBJECT_TRACKING" ON) +option(BUILD_WITH_PXOBJECT_TRACKING "BUILD_WITH_PXOBJECT_TRACKING" OFF) option(SPARK_ENABLE_OPTIMIZED_UPDATE "SPARK_ENABLE_OPTIMIZED_UPDATE" OFF) option(SPARK_ENABLE_WEBGL "SPARK_ENABLE_WEBGL" ON) option(SPARK_ENABLE_THUNDER "SPARK_ENABLE_THUNDER" OFF) diff --git a/examples/pxScene2d/src/rcvrcore/initGL.js b/examples/pxScene2d/src/rcvrcore/initGL.js index ec78aa0375..9f79594e78 100644 --- a/examples/pxScene2d/src/rcvrcore/initGL.js +++ b/examples/pxScene2d/src/rcvrcore/initGL.js @@ -297,9 +297,18 @@ function onSceneTerminate() { // memory leak fix this.sandbox.sparkscene.api = null; - for (var k in this.sandbox) - { - delete this.sandbox[k]; + if (isJSC) { + var script = new vm.Script( + "for (var key in this) { delete this[key]; }" + ); + script.runInContext(this.sandbox); + script = null; + } + else { + for (var k in this.sandbox) + { + delete this.sandbox[k]; + } } this.contextifiedSandbox = null; diff --git a/tests/pxScene2d/testRunner/tests.json b/tests/pxScene2d/testRunner/tests.json index 0f93662352..eb4a99aa84 100644 --- a/tests/pxScene2d/testRunner/tests.json +++ b/tests/pxScene2d/testRunner/tests.json @@ -70,5 +70,33 @@ {"url":"../tests/test_fallbackFont.js", "title":"test_fallbackFont","useBaseURI":"true"}, {"url":"../tests/test_ws.js", "title":"test_ws","useBaseURI":"true"}, {"url":"../tests/test_storage.js", "title":"test_storage","useBaseURI":"true"}, - {"url":"../tests/test_pxSuspendAndResume.js", "title":"test_pxSuspendAndResume","useBaseURI":"true"} + {"url":"../tests/test_pxSuspendAndResume.js", "title":"test_pxSuspendAndResume","useBaseURI":"true"}, + {"url": "https://www.sparkui.org/examples/Lightning/actions/js/init.spark", "title": "actions", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/action-value/js/init.spark", "title": "action-value", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/animations/js/init.spark", "title": "animations", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/animations-attributes/js/init.spark", "title": "animations-attributes", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/animations-events/js/init.spark", "title": "animations-events", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/animations-methods/js/init.spark", "title": "animations-methods", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/attributes/js/init.spark", "title": "attributes", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/children/js/init.spark", "title": "children", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/events/js/init.spark", "title": "events", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/fire-ancestors/js/init.spark", "title": "fire-ancestors", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/focus/js/init.spark", "title": "focus", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/images/js/init.spark", "title": "images", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/key-handling/js/init.spark", "title": "key-handling", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/methods/js/init.spark", "title": "methods", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/nesting-states/js/init.spark", "title": "nesting-states", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/patch/js/init.spark", "title": "patch", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/positioning/js/init.spark", "title": "positioning", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/rectangles/js/init.spark", "title": "rectangles", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/rendering/js/init.spark", "title": "rendering", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/signal/js/init.spark", "title": "signal", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/state-events/js/init.spark", "title": "state-events", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/switching-states/js/init.spark", "title": "switching-states", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/template/js/init.spark", "title": "template", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/text/js/init.spark", "title": "text", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/toolbox/js/init.spark", "title": "toolbox", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/transforms/js/init.spark", "title": "transforms", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/transitions/js/init.spark", "title": "transitions", "timeToRun": "3000", "useBaseURI": "false"}, + {"url": "https://www.sparkui.org/examples/Lightning/value-smoothing/js/init.spark", "title": "value-smoothing", "timeToRun": "3000", "useBaseURI": "false"} ] From ccbcbd8baaee308235653428580143dea9dd0b3f Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 03:55:58 -0400 Subject: [PATCH 13/51] Update Spark.cpp --- examples/pxScene2d/src/Spark.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/pxScene2d/src/Spark.cpp b/examples/pxScene2d/src/Spark.cpp index 3ad2e35197..947f093078 100644 --- a/examples/pxScene2d/src/Spark.cpp +++ b/examples/pxScene2d/src/Spark.cpp @@ -308,9 +308,9 @@ class sceneWindow : public pxWindow, public pxIViewContainer if (gDumpMemUsage) { - #ifdef RUNINMAIN - script.pump(); - #endif + #ifdef RUNINMAIN + script.pump(); + #endif script.collectGarbage(); rtLogInfo("pxobjectcount is [%d]",pxObjectCount); #ifndef PX_PLATFORM_DFB_NON_X11 From 2da879fa67ff34da666b35a2b248fce8ba072ed2 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 03:56:23 -0400 Subject: [PATCH 14/51] Update Spark.cpp --- examples/pxScene2d/src/Spark.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/Spark.cpp b/examples/pxScene2d/src/Spark.cpp index 947f093078..b08936cbdb 100644 --- a/examples/pxScene2d/src/Spark.cpp +++ b/examples/pxScene2d/src/Spark.cpp @@ -309,7 +309,7 @@ class sceneWindow : public pxWindow, public pxIViewContainer if (gDumpMemUsage) { #ifdef RUNINMAIN - script.pump(); + script.pump(); #endif script.collectGarbage(); rtLogInfo("pxobjectcount is [%d]",pxObjectCount); From b34c27e046c7e853fb860efec9226c3baead5dc6 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 03:56:23 -0400 Subject: [PATCH 15/51] Update Spark.cpp --- examples/pxScene2d/src/Spark.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/pxScene2d/src/Spark.cpp b/examples/pxScene2d/src/Spark.cpp index 947f093078..d8898df931 100644 --- a/examples/pxScene2d/src/Spark.cpp +++ b/examples/pxScene2d/src/Spark.cpp @@ -309,7 +309,7 @@ class sceneWindow : public pxWindow, public pxIViewContainer if (gDumpMemUsage) { #ifdef RUNINMAIN - script.pump(); + script.pump(); #endif script.collectGarbage(); rtLogInfo("pxobjectcount is [%d]",pxObjectCount); From aa1a5de6e6fdb8eed3c232b5a7976a4dfb0a3183 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 05:19:43 -0400 Subject: [PATCH 16/51] Update execute_osx.sh --- ci/execute_osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index ae9d9c9661..1ee6989b4b 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -162,6 +162,7 @@ fi echo "Sleeping to make terminate complete ..."; sleep 90s pkill -9 -f spark.sh +pkill -f Spark cp /var/tmp/spark.log $EXECLOGS if [ "$dumped_core" -eq 1 ] From 717efc0b91e4d7809e7b20369a352fa8861ab655 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 15:43:56 +0530 Subject: [PATCH 17/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 5bb9e656a5..9ae0b99ace 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -973,6 +973,7 @@ rtError JSObjectWrapper::Get(uint32_t i, rtValue* value) const return RT_ERROR_INVALID_ARG; JSValueRef exc = nullptr; JSValueRef valueRef = JSObjectGetPropertyAtIndex(context(), wrapped(), i, &exc); + if (JSValueGetType(context(), valueRef) == kJSTypeUndefined) { return RT_PROPERTY_NOT_FOUND; From fba5f0fdbed81872dce8e84e55ed511dd4d16623 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 16:06:07 +0530 Subject: [PATCH 18/51] Test --- src/rtScriptJSC/rtJSCWrappers.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 9ae0b99ace..bbc2a3e59a 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1066,6 +1066,8 @@ rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* resul } } JSValueRef exception = nullptr; + printf("jsfun send \n"); + fflush(stdout); JSValueRef jsResult = JSObjectCallAsFunction(context(), wrapped(), m_thisObj.wrapped(), numArgs, jsArgs, &exception); if (exception) { printException(context(), exception); From a21464beb2bd6cdf15ca5feae198ee5c00765c62 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 16:11:35 +0530 Subject: [PATCH 19/51] Test --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index bbc2a3e59a..73203983a9 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1066,6 +1066,7 @@ rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* resul } } JSValueRef exception = nullptr; + printf("jsfun send \n"); fflush(stdout); JSValueRef jsResult = JSObjectCallAsFunction(context(), wrapped(), m_thisObj.wrapped(), numArgs, jsArgs, &exception); From ba10bb4ed6d51b02cb54168168b0c3568b5af684 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 07:27:20 -0400 Subject: [PATCH 20/51] Update execute_osx.sh --- ci/execute_osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index 1ee6989b4b..f81052ca44 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -1,3 +1,4 @@ + #!/bin/sh #This script executes necessary javascript files and mesaures pxleak checks and memory leaks checks From e6e118b0a5f141ebc74e452da33f946d71380dd1 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 07:40:44 -0400 Subject: [PATCH 21/51] Update execute_osx.sh --- ci/execute_osx.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index f81052ca44..2bb36f4d3c 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -1,4 +1,3 @@ - #!/bin/sh #This script executes necessary javascript files and mesaures pxleak checks and memory leaks checks @@ -163,7 +162,7 @@ fi echo "Sleeping to make terminate complete ..."; sleep 90s pkill -9 -f spark.sh -pkill -f Spark +pkill -9 -f Spark cp /var/tmp/spark.log $EXECLOGS if [ "$dumped_core" -eq 1 ] From 883ea8c25364d2f272fb99fb80bc726ee70669a6 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 08:00:13 -0400 Subject: [PATCH 22/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 73203983a9..42f69e381c 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1033,17 +1033,23 @@ JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef thisObj, : rtJSCWrapperBase(context, funcObj) , m_thisObj(context, thisObj) { + printf("jsfun cons1 [%p]\n", this); + fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef funcObj) : rtJSCWrapperBase(context, funcObj) { + printf("jsfun cons2 [%p]\n", this); + fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::~JSFunctionWrapper() { + printf("jsfun dest [%p]\n", this); + fflush(stdout); RtJSC::assertIsMainThread(); } @@ -1067,7 +1073,7 @@ rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* resul } JSValueRef exception = nullptr; - printf("jsfun send \n"); + printf("jsfun send [%p]\n", this); fflush(stdout); JSValueRef jsResult = JSObjectCallAsFunction(context(), wrapped(), m_thisObj.wrapped(), numArgs, jsArgs, &exception); if (exception) { From 9d2fbdb9a3001167254c522710b1178ecbeea1ee Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 08:02:20 -0400 Subject: [PATCH 23/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 42f69e381c..ba0a6c9942 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,3 +1,4 @@ + /* pxCore Copyright 2005-2018 John Robinson From 04a70c38a4656d0ac23379368b4a37ae975bbe17 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 08:43:03 -0400 Subject: [PATCH 24/51] Update execute_osx.sh --- ci/execute_osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index 2bb36f4d3c..cfb61e9742 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -1,3 +1,4 @@ + #!/bin/sh #This script executes necessary javascript files and mesaures pxleak checks and memory leaks checks From 815741737cd43a774d077be206b852f079434c56 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 09:07:15 -0400 Subject: [PATCH 25/51] Update execute_osx.sh --- ci/execute_osx.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index cfb61e9742..2bb36f4d3c 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -1,4 +1,3 @@ - #!/bin/sh #This script executes necessary javascript files and mesaures pxleak checks and memory leaks checks From 65d5c4df4604fa2e1100a4816a6a39555a995780 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 10:20:23 -0400 Subject: [PATCH 26/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index ba0a6c9942..ef5b65ec75 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -272,12 +272,13 @@ static bool rtObjectWrapper_setProperty(JSContextRef context, JSObjectRef thisOb } rtValue val; + rtString name = jsToRtString(propertyName); + printf("rtobject set property [%s] \n", name.cString()); fflush(stdout); if (jsToRt(context, value, val, exception) != RT_OK) { printException(context, *exception); return false; } - rtString name = jsToRtString(propertyName); rtError e = objectRef.set(name, val); if (e != RT_OK) { rtLogDebug("Failed to set property: %s", name.cString()); From db6ca097f36ca4a53258eb6b92cad36b77ea4c2b Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 12:46:39 -0400 Subject: [PATCH 27/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index ef5b65ec75..f8ac9ef2f8 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -273,7 +273,6 @@ static bool rtObjectWrapper_setProperty(JSContextRef context, JSObjectRef thisOb rtValue val; rtString name = jsToRtString(propertyName); - printf("rtobject set property [%s] \n", name.cString()); fflush(stdout); if (jsToRt(context, value, val, exception) != RT_OK) { printException(context, *exception); return false; @@ -1035,23 +1034,17 @@ JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef thisObj, : rtJSCWrapperBase(context, funcObj) , m_thisObj(context, thisObj) { - printf("jsfun cons1 [%p]\n", this); - fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef funcObj) : rtJSCWrapperBase(context, funcObj) { - printf("jsfun cons2 [%p]\n", this); - fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::~JSFunctionWrapper() { - printf("jsfun dest [%p]\n", this); - fflush(stdout); RtJSC::assertIsMainThread(); } @@ -1075,8 +1068,6 @@ rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* resul } JSValueRef exception = nullptr; - printf("jsfun send [%p]\n", this); - fflush(stdout); JSValueRef jsResult = JSObjectCallAsFunction(context(), wrapped(), m_thisObj.wrapped(), numArgs, jsArgs, &exception); if (exception) { printException(context(), exception); From af8d70a6841e0243cd6bd3ec22ad672b9be6f6a9 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Fri, 10 Apr 2020 12:46:39 -0400 Subject: [PATCH 28/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index ef5b65ec75..a8a15cd891 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -273,7 +273,6 @@ static bool rtObjectWrapper_setProperty(JSContextRef context, JSObjectRef thisOb rtValue val; rtString name = jsToRtString(propertyName); - printf("rtobject set property [%s] \n", name.cString()); fflush(stdout); if (jsToRt(context, value, val, exception) != RT_OK) { printException(context, *exception); return false; @@ -353,7 +352,6 @@ static bool rtObjectWrapper_hasProperty(JSContextRef ctx, JSObjectRef object, JS { rtMethodMap* objMap = objectRef->getMap(); const char* className = objMap ? objMap->className : ""; - printf("rtObjectWrapper_hasProperty class=%s prop=%s\n", className, propName.cString()); } if ( !strcmp(propName.cString(), "Symbol.iterator") || @@ -1035,23 +1033,17 @@ JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef thisObj, : rtJSCWrapperBase(context, funcObj) , m_thisObj(context, thisObj) { - printf("jsfun cons1 [%p]\n", this); - fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef funcObj) : rtJSCWrapperBase(context, funcObj) { - printf("jsfun cons2 [%p]\n", this); - fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::~JSFunctionWrapper() { - printf("jsfun dest [%p]\n", this); - fflush(stdout); RtJSC::assertIsMainThread(); } @@ -1075,8 +1067,6 @@ rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* resul } JSValueRef exception = nullptr; - printf("jsfun send [%p]\n", this); - fflush(stdout); JSValueRef jsResult = JSObjectCallAsFunction(context(), wrapped(), m_thisObj.wrapped(), numArgs, jsArgs, &exception); if (exception) { printException(context(), exception); From 72d8c196dfc6490778483ea210e4005d54db1078 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 10:30:13 +0530 Subject: [PATCH 29/51] Tt --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 62b4a48a38..53e76b3b09 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,4 +1,3 @@ - /* pxCore Copyright 2005-2018 John Robinson From b7eceac98fde203b22b011c706a5d77cd8e3576e Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 11:48:46 +0530 Subject: [PATCH 30/51] Tt --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 53e76b3b09..62b4a48a38 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,3 +1,4 @@ + /* pxCore Copyright 2005-2018 John Robinson From f970f4ffce4cc6e57376d0a17360a0e4455c9426 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 11:48:46 +0530 Subject: [PATCH 31/51] Tt --- src/rtScriptJSC/rtJSCWrappers.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 53e76b3b09..6d13726895 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,3 +1,4 @@ + /* pxCore Copyright 2005-2018 John Robinson @@ -653,7 +654,9 @@ static JSValueRef rtObjectWrapper_wrapPromise(JSContextRef context, rtObjectRef return JSValueMakeUndefined(context); } rtValue resolveCallback; + printf("MADANA IT IS RESOLVE CB BEGIN \n");fflush(stdout); rtError rc = jsToRt(context, resolveVal, resolveCallback, &exception); + printf("MADANA IT IS RESOLVE CB END \n"); fflush(stdout); if (rc != RT_OK) { rtLogError("Failed to convert resove callback. rc = %d", rc); return JSValueMakeUndefined(context); @@ -667,7 +670,9 @@ static JSValueRef rtObjectWrapper_wrapPromise(JSContextRef context, rtObjectRef return JSValueMakeUndefined(context); } rtValue rejectCallback; + printf("MADANA IT IS REJECT CB BEGIN \n"); fflush(stdout); rc = jsToRt(context, rejectVal, rejectCallback, &exception); + printf("MADANA IT IS REJECT CB END \n"); fflush(stdout); if (rc != RT_OK) { rtLogError("Failed to convert reject callback. rc = %d", rc); return JSValueMakeUndefined(context); From 53e4ea13615eadec6cf5b6e8cc1c89a6c96589e4 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 03:34:12 -0400 Subject: [PATCH 32/51] Update execute_osx.sh --- ci/execute_osx.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index 2bb36f4d3c..cfb61e9742 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -1,3 +1,4 @@ + #!/bin/sh #This script executes necessary javascript files and mesaures pxleak checks and memory leaks checks From 5ffd3adb2b446cb702728e019069dbf0731e9df7 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 03:55:39 -0400 Subject: [PATCH 33/51] Update execute_osx.sh --- ci/execute_osx.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/execute_osx.sh b/ci/execute_osx.sh index cfb61e9742..2bb36f4d3c 100755 --- a/ci/execute_osx.sh +++ b/ci/execute_osx.sh @@ -1,4 +1,3 @@ - #!/bin/sh #This script executes necessary javascript files and mesaures pxleak checks and memory leaks checks From 03492b8ae708ff802316095f64dd552441897862 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 04:23:13 -0400 Subject: [PATCH 34/51] Update rtJSCMisc.cpp --- src/rtScriptJSC/rtJSCMisc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCMisc.cpp b/src/rtScriptJSC/rtJSCMisc.cpp index 266c79a357..01f9717188 100644 --- a/src/rtScriptJSC/rtJSCMisc.cpp +++ b/src/rtScriptJSC/rtJSCMisc.cpp @@ -113,7 +113,7 @@ void pumpMainLoop() } while(ret); } #endif - dispatchPending(); + //dispatchPending(); isPumping = false; } From c0d05713252eb6eafc2a580bbcc8d0c57e2a4458 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 05:20:14 -0400 Subject: [PATCH 35/51] Update rtJSCMisc.cpp --- src/rtScriptJSC/rtJSCMisc.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rtScriptJSC/rtJSCMisc.cpp b/src/rtScriptJSC/rtJSCMisc.cpp index 01f9717188..b5e2fe8412 100644 --- a/src/rtScriptJSC/rtJSCMisc.cpp +++ b/src/rtScriptJSC/rtJSCMisc.cpp @@ -113,6 +113,7 @@ void pumpMainLoop() } while(ret); } #endif + //dispatchPending(); isPumping = false; } From 1c5dd212df38cc1c8796826f02fca08d320fbcda Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 05:44:55 -0400 Subject: [PATCH 36/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 6d13726895..75571e339d 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,4 +1,3 @@ - /* pxCore Copyright 2005-2018 John Robinson From 1e573fdf771ffa5d59592a4dbb3ebcb65259c808 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 15:39:41 +0530 Subject: [PATCH 37/51] Tt --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 75571e339d..6d13726895 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,3 +1,4 @@ + /* pxCore Copyright 2005-2018 John Robinson From 2a775f5be9eb147e980cdbdfabba8c3e6e0defa4 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 15:39:41 +0530 Subject: [PATCH 38/51] Tt --- examples/pxScene2d/src/rcvrcore/Logger.js | 5 +++-- src/rtScriptJSC/rtJSCWrappers.cpp | 17 +++++++++-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/examples/pxScene2d/src/rcvrcore/Logger.js b/examples/pxScene2d/src/rcvrcore/Logger.js index fabc2fbeb0..0e4f72e393 100644 --- a/examples/pxScene2d/src/rcvrcore/Logger.js +++ b/examples/pxScene2d/src/rcvrcore/Logger.js @@ -20,7 +20,7 @@ limitations under the License. * Created by tcarro004 on 7/18/15, updated by sgladk001c on 3/07/19. */ -var loggingLevel = 1; +var loggingLevel = 4; var rtLogLevels = [ 'fatal' // 0 @@ -53,7 +53,8 @@ function setLoggingLevel(level) { levelNum = rtl('warn'); } - loggingLevel = levelNum; + //loggingLevel = levelNum; + loggingLevel = 4; } function Logger(name) { diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 75571e339d..1747210495 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,3 +1,4 @@ + /* pxCore Copyright 2005-2018 John Robinson @@ -653,9 +654,9 @@ static JSValueRef rtObjectWrapper_wrapPromise(JSContextRef context, rtObjectRef return JSValueMakeUndefined(context); } rtValue resolveCallback; - printf("MADANA IT IS RESOLVE CB BEGIN \n");fflush(stdout); + //printf("MADANA IT IS RESOLVE CB BEGIN \n");fflush(stdout); rtError rc = jsToRt(context, resolveVal, resolveCallback, &exception); - printf("MADANA IT IS RESOLVE CB END \n"); fflush(stdout); + //printf("MADANA IT IS RESOLVE CB END \n"); fflush(stdout); if (rc != RT_OK) { rtLogError("Failed to convert resove callback. rc = %d", rc); return JSValueMakeUndefined(context); @@ -669,9 +670,9 @@ static JSValueRef rtObjectWrapper_wrapPromise(JSContextRef context, rtObjectRef return JSValueMakeUndefined(context); } rtValue rejectCallback; - printf("MADANA IT IS REJECT CB BEGIN \n"); fflush(stdout); + //printf("MADANA IT IS REJECT CB BEGIN \n"); fflush(stdout); rc = jsToRt(context, rejectVal, rejectCallback, &exception); - printf("MADANA IT IS REJECT CB END \n"); fflush(stdout); + //printf("MADANA IT IS REJECT CB END \n"); fflush(stdout); if (rc != RT_OK) { rtLogError("Failed to convert reject callback. rc = %d", rc); return JSValueMakeUndefined(context); @@ -1036,26 +1037,26 @@ JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef thisObj, : rtJSCWrapperBase(context, funcObj) , m_thisObj(context, thisObj) { - printf("MADANA JSFunctionWrapper create 1 [%p] \n", this); fflush(stdout); + //printf("MADANA JSFunctionWrapper create 1 [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef funcObj) : rtJSCWrapperBase(context, funcObj) { - printf("MADANA JSFunctionWrapper create 2 [%p] \n", this); fflush(stdout); + //printf("MADANA JSFunctionWrapper create 2 [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::~JSFunctionWrapper() { - printf("MADANA JSFunctionWrapper destruct [%p] \n", this); fflush(stdout); + //printf("MADANA JSFunctionWrapper destruct [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* result) { - printf("MADANA JSFunctionWrapper::Send [%p] \n", this); fflush(stdout); + //printf("MADANA JSFunctionWrapper::Send [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); if (!context() || !wrapped()) { rtLogWarn("Lost JS context!"); From 5eb1252cbf4439d987538de9c2bcb29f851a0fa1 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 22:26:36 +0530 Subject: [PATCH 39/51] Hg --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 1747210495..67823ffe4e 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,4 +1,3 @@ - /* pxCore Copyright 2005-2018 John Robinson From fd70d3ae8f1242b57b18a7d7bc69cf01eb9825d7 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 23:40:12 +0530 Subject: [PATCH 40/51] Tt --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 67823ffe4e..1747210495 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,3 +1,4 @@ + /* pxCore Copyright 2005-2018 John Robinson From 7fbd7def8ca9aa9301e8eeff949c02e313467483 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sat, 11 Apr 2020 23:11:01 -0400 Subject: [PATCH 41/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 1747210495..67823ffe4e 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1,4 +1,3 @@ - /* pxCore Copyright 2005-2018 John Robinson From 0dec60e3352379cd6f47c533546027cec1a83c29 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sun, 12 Apr 2020 01:31:24 -0400 Subject: [PATCH 42/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 67823ffe4e..af7a399a1a 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1036,26 +1036,26 @@ JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef thisObj, : rtJSCWrapperBase(context, funcObj) , m_thisObj(context, thisObj) { - //printf("MADANA JSFunctionWrapper create 1 [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper create 1 [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef funcObj) : rtJSCWrapperBase(context, funcObj) { - //printf("MADANA JSFunctionWrapper create 2 [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper create 2 [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::~JSFunctionWrapper() { - //printf("MADANA JSFunctionWrapper destruct [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper destruct [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* result) { - //printf("MADANA JSFunctionWrapper::Send [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper::Send [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); if (!context() || !wrapped()) { rtLogWarn("Lost JS context!"); From 165b626d968333c9c199d57c7e655d87c9b83f1b Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sun, 12 Apr 2020 01:31:24 -0400 Subject: [PATCH 43/51] Update rtJSCWrappers.cpp --- ci/before_install.sh | 3 +++ src/rtScriptJSC/rtJSCWrappers.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/before_install.sh b/ci/before_install.sh index 9de65ca679..df150bf5b3 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -67,6 +67,9 @@ then lldb --help cmake --version man lldb + cat /System/Library/Frameworks/JavaScriptCore.framework/Resources/Info.plist + echo "version " + cat /System/Library/Frameworks/JavaScriptCore.framework/Resources/version.plist fi #install lighttpd, code coverage binaries for mac diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 67823ffe4e..af7a399a1a 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1036,26 +1036,26 @@ JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef thisObj, : rtJSCWrapperBase(context, funcObj) , m_thisObj(context, thisObj) { - //printf("MADANA JSFunctionWrapper create 1 [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper create 1 [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::JSFunctionWrapper(JSContextRef context, JSObjectRef funcObj) : rtJSCWrapperBase(context, funcObj) { - //printf("MADANA JSFunctionWrapper create 2 [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper create 2 [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } JSFunctionWrapper::~JSFunctionWrapper() { - //printf("MADANA JSFunctionWrapper destruct [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper destruct [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); } rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* result) { - //printf("MADANA JSFunctionWrapper::Send [%p] \n", this); fflush(stdout); + printf("MADANA JSFunctionWrapper::Send [%p] \n", this); fflush(stdout); RtJSC::assertIsMainThread(); if (!context() || !wrapped()) { rtLogWarn("Lost JS context!"); From d853063dabc59e437f544a2cc43e24e6cb31ac39 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sun, 12 Apr 2020 08:17:12 -0400 Subject: [PATCH 44/51] Update before_install.sh --- ci/before_install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/before_install.sh b/ci/before_install.sh index df150bf5b3..2b127c9f58 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -68,7 +68,6 @@ then cmake --version man lldb cat /System/Library/Frameworks/JavaScriptCore.framework/Resources/Info.plist - echo "version " cat /System/Library/Frameworks/JavaScriptCore.framework/Resources/version.plist fi From 1508f18287447e5f5ae39569b971259642869674 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sun, 12 Apr 2020 08:40:10 -0400 Subject: [PATCH 45/51] Update before_install.sh --- ci/before_install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/before_install.sh b/ci/before_install.sh index 2b127c9f58..e82826a40c 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -67,7 +67,6 @@ then lldb --help cmake --version man lldb - cat /System/Library/Frameworks/JavaScriptCore.framework/Resources/Info.plist cat /System/Library/Frameworks/JavaScriptCore.framework/Resources/version.plist fi From cdbd7892340ad2dd203059ed3b7410bdb659cfeb Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sun, 12 Apr 2020 09:08:01 -0400 Subject: [PATCH 46/51] Update before_install.sh --- ci/before_install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/before_install.sh b/ci/before_install.sh index e82826a40c..4d9b6e6547 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -1,3 +1,4 @@ + #!/bin/sh travis_retry() { From 01569322be7e3c44e7dbc6e5bea52a61f6b0afa3 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sun, 12 Apr 2020 11:12:44 -0400 Subject: [PATCH 47/51] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 95d5c7498b..9c4a44204d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: env: - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - os: osx - osx_image: xcode9.4 + osx_image: xcode11.3 language: c++ before_install: - eval "${MATRIX_EVAL}" From 23956c4c1885a92c3e537463c550ceb92abe89ad Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Sun, 12 Apr 2020 11:12:44 -0400 Subject: [PATCH 48/51] Update .travis.yml --- .travis.yml | 2 +- ci/before_install.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 95d5c7498b..9c4a44204d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: env: - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - os: osx - osx_image: xcode9.4 + osx_image: xcode11.3 language: c++ before_install: - eval "${MATRIX_EVAL}" diff --git a/ci/before_install.sh b/ci/before_install.sh index 4d9b6e6547..ceb03096bc 100755 --- a/ci/before_install.sh +++ b/ci/before_install.sh @@ -69,6 +69,7 @@ then cmake --version man lldb cat /System/Library/Frameworks/JavaScriptCore.framework/Resources/version.plist + find /Applications/ -name *clang_rt*osx* fi #install lighttpd, code coverage binaries for mac From 3b42877bd767a7e818e970a095017118887144ad Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 10:36:21 -0400 Subject: [PATCH 49/51] Update rtJSCMisc.cpp --- src/rtScriptJSC/rtJSCMisc.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/rtScriptJSC/rtJSCMisc.cpp b/src/rtScriptJSC/rtJSCMisc.cpp index 6b88312f6b..996b415a6e 100644 --- a/src/rtScriptJSC/rtJSCMisc.cpp +++ b/src/rtScriptJSC/rtJSCMisc.cpp @@ -112,8 +112,7 @@ void pumpMainLoop() ret = g_main_context_iteration(nullptr, false); } while(ret); } -#endif - +#endif dispatchPending(); isPumping = false; } From 640dffdb15b9a0853a4ccbd8d82b5ca2e7e6c0ff Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 10:36:58 -0400 Subject: [PATCH 50/51] Update rtJSCMisc.cpp --- src/rtScriptJSC/rtJSCMisc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCMisc.cpp b/src/rtScriptJSC/rtJSCMisc.cpp index 996b415a6e..266c79a357 100644 --- a/src/rtScriptJSC/rtJSCMisc.cpp +++ b/src/rtScriptJSC/rtJSCMisc.cpp @@ -112,7 +112,7 @@ void pumpMainLoop() ret = g_main_context_iteration(nullptr, false); } while(ret); } -#endif +#endif dispatchPending(); isPumping = false; } From 8293273553f8f6a378d3bc2db359c4091620e466 Mon Sep 17 00:00:00 2001 From: madanagopalt Date: Tue, 14 Apr 2020 10:37:44 -0400 Subject: [PATCH 51/51] Update rtJSCWrappers.cpp --- src/rtScriptJSC/rtJSCWrappers.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rtScriptJSC/rtJSCWrappers.cpp b/src/rtScriptJSC/rtJSCWrappers.cpp index 8ca4f4cb59..cde57ca372 100644 --- a/src/rtScriptJSC/rtJSCWrappers.cpp +++ b/src/rtScriptJSC/rtJSCWrappers.cpp @@ -1065,7 +1065,6 @@ rtError JSFunctionWrapper::Send(int numArgs, const rtValue* args, rtValue* resul } } JSValueRef exception = nullptr; - JSValueRef jsResult = JSObjectCallAsFunction(context(), wrapped(), m_thisObj.wrapped(), numArgs, jsArgs, &exception); if (exception) { printException(context(), exception);