Multithreading (reality layers)

.travis.yml

@@ -50,13 +50,13 @@ matrix:
   - os: osx
     osx_image: xcode10.1
     node_js:
-    - "11.6.0"
+    - "12.2.0"
     install:
-    - npm install -g appdmg
-    - curl "https://nodejs.org/dist/v11.6.0/node-v11.6.0-darwin-x64.tar.gz" >node.tar.gz
+    - npm install -g appdmg-exokit
+    - curl "https://nodejs.org/dist/v12.2.0/node-v12.2.0-darwin-x64.tar.gz" >node.tar.gz
     - tar -zxf node.tar.gz
     - rm node.tar.gz
-    - mv node-v11.6.0-darwin-x64 node
+    - mv node-v12.2.0-darwin-x64 node
     - export PATH="$(pwd)/node/bin:$PATH"
     - unset NVM_NODEJS_ORG_MIRROR
     - "./node/bin/npm install --no-optional"

BUILDING.md

@@ -8,9 +8,9 @@ Build targets :
 
 ## Windows
 
-**Requirements**: [Node.js 11.6.0](https://nodejs.org/dist/v11.6.0/), Python 2, Visual Studio 2015 or 2017
+**Requirements**: [Node.js 12.2.0](https://nodejs.org/dist/v12.2.0/), Python 2, Visual Studio 2015 or 2017
 
-**Alternative requirements**: Node.js 11.6.0, as administrator: `npm install -g windows-build-tools`
+**Alternative requirements**: Node.js 12.2.0, as administrator: `npm install -g windows-build-tools`
 
 ### Procedure
 1. open **Node.js command prompt**
@@ -19,7 +19,7 @@ Build targets :
 
 ## MacOS
 
-**Requirements**: Node.js 11.6.0, XCode
+**Requirements**: Node.js 12.2.0, XCode
 
 ### Procedure
 1. open **Terminal.app**
@@ -28,7 +28,7 @@ Build targets :
 
 ## Linux
 
-**Requirements**: Node.js 11.6.0
+**Requirements**: Node.js 12.2.0
 
 ### Procedure
 1. open **bash**
@@ -38,7 +38,7 @@ Build targets :
 
 ## Magic Leap
 
-**Requirements**: Windows Subsystem for Linux, Ubuntu Bash, Node.js 11.6.0 for Windows, Python 2, Python 3
+**Requirements**: Windows Subsystem for Linux, Ubuntu Bash, Node.js 11.15.0 for Windows, Python 2, Python 3
 
 > *NOTE: Due to combined usage of Ubuntu and Windows tools, you must check out Exokit to somewhere reachable from both; the easiest way is to do your `git clone` inside Ubuntu bash, since for example Ubuntu can reach `C:\exokit` as `/mnt/c/exokit`. (included in instructions below)*
 

Dockerfile

@@ -10,10 +10,10 @@ ADD . /app
 WORKDIR /app
 
 RUN \
-  wget "https://nodejs.org/dist/v11.6.0/node-v11.6.0-linux-x64.tar.gz" -O node.tar.gz && \
+  wget "https://nodejs.org/dist/v12.2.0/node-v12.2.0-linux-x64.tar.gz" -O node.tar.gz && \
   tar -zxf node.tar.gz && \
   rm node.tar.gz && \
-  mv node-v11.6.0-linux-x64 node
+  mv node-v12.2.0-linux-x64 node
 RUN \
   export PATH="$PATH:$(pwd)/node/bin" && \
   npm install --unsafe-perm --no-optional . && \
@@ -24,4 +24,4 @@ RUN \
   cp -R . /tmp/exokit-bin/lib/exokit && \
   cp scripts/exokit-bin.sh /tmp/exokit-bin/bin/exokit && \
   cd /tmp/exokit-bin && \
-  tar -czf /app/exokit-linux-bin.tar.gz --exclude=".*" --exclude="*.tar.gz" * 
+  tar -czf /app/exokit-linux-bin.tar.gz --exclude=".*" --exclude="*.tar.gz" *

android.Dockerfile

@@ -19,10 +19,10 @@ RUN chown -R appuser:appuser $HOME && \
 USER appuser
 
 RUN \
-  wget "https://nodejs.org/dist/v11.6.0/node-v11.6.0-linux-x64.tar.gz" -O node.tar.gz -q && \
+  wget "https://nodejs.org/dist/v11.15.0/node-v11.15.0-linux-x64.tar.gz" -O node.tar.gz -q && \
   tar -zxf node.tar.gz > /dev/null && \
   rm node.tar.gz && \
-  mv node-v11.6.0-linux-x64 node
+  mv node-v11.15.0-linux-x64 node
 RUN \
   wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -q && \
   unzip sdk-tools-linux-4333796.zip > /dev/null && \

android/CMakeLists.txt

@@ -5,7 +5,7 @@ add_library(native-main SHARED ${CMAKE_SOURCE_DIR}/../main.cpp ${ANDROID_NDK}/so
 
 include_directories( SYSTEM ${CMAKE_SOURCE_DIR}/../node_modules/nan )
 include_directories( SYSTEM ${CMAKE_SOURCE_DIR}/../deps/exokit-bindings/util/include )
-include_directories( SYSTEM ${CMAKE_SOURCE_DIR}/../.node-gyp/11.6.0/include/node )
+include_directories( SYSTEM ${CMAKE_SOURCE_DIR}/../.node-gyp/11.15.0/include/node )
 include_directories( SYSTEM ${CMAKE_SOURCE_DIR}/../build/libexokit )
 include_directories( SYSTEM ${ANDROID_NDK}/sources/android/native_app_glue )
 

appveyor.yml

@@ -27,10 +27,10 @@ test_script:
 
 after_test:
   - ps: |
-      wget "https://nodejs.org/dist/v11.6.0/node-v11.6.0-win-x64.zip" -OutFile node.zip
+      wget "https://nodejs.org/dist/v12.2.0/node-v12.2.0-win-x64.zip" -OutFile node.zip
       7z x node.zip
       rm node.zip
-      mv node-v11.6.0-win-x64 node
+      mv node-v12.2.0-win-x64 node
       $env:Path = "$pwd\node;$env:Path";
       .\node\npm install --no-optional
       $env:TEST_ENV = 'ci'
@@ -43,10 +43,6 @@ after_test:
       mv dist\*.exe exokit-win-x64.exe
       . "C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Bin\signtool.exe" sign /f .\metadata\codesign-windows.pfx /p "$env:PFX_KEY" exokit-win-x64.exe
 
-artifacts:
-  - path: "exokit-win-x64.exe"
-    name: exokit-windows-installer
-
 deploy:
   - provider: GitHub
     description: 'Exokit installer'

deps/exokit-bindings/browser/include/browser.h

@@ -9,6 +9,7 @@
 
 #include <defines.h>
 #include <browser-common.h>
+#include <windowsystem.h>
 
 #include <chrono>
 #include <deque>

deps/exokit-bindings/browser/src/browser.cpp

@@ -19,17 +19,12 @@ Browser::Browser(WebGLRenderingContext *gl, int width, int height, float scale)
 
   glGenTextures(1, &tex);
 
-  window = windowsystem::CreateNativeWindow(1, 1, false, gl->windowHandle);
+  window = windowsystem::CreateWindowHandle(1, 1, false);
 }
 
 Browser::~Browser() {}
 
 Local<Object> Browser::Initialize(Isolate *isolate) {
-  uv_async_init(uv_default_loop(), &mainThreadAsync, MainThreadAsync);
-  // uv_sem_init(&constructSem, 0);
-  uv_sem_init(&mainThreadSem, 0);
-  uv_sem_init(&browserThreadSem, 0);
-
   Nan::EscapableHandleScope scope;
 
   // constructor
@@ -87,6 +82,12 @@ NAN_METHOD(Browser::New) {
     std::string frameworkPath(*frameworkPathValue, frameworkPathValue.length());
 
     if (!embeddedInitialized) {
+      uv_loop_t *loop = windowsystembase::GetEventLoop();
+      uv_async_init(loop, &mainThreadAsync, MainThreadAsync);
+      // uv_sem_init(&constructSem, 0);
+      uv_sem_init(&mainThreadSem, 0);
+      uv_sem_init(&browserThreadSem, 0);
+
       browserThread = std::thread([dataPath{std::move(dataPath)}, frameworkPath{std::move(frameworkPath)}]() -> void {
         // exout << "initialize web core manager 1" << std::endl;
         const bool success = initializeEmbedded(dataPath, frameworkPath);

deps/exokit-bindings/canvascontext/include/image-context.h

@@ -13,6 +13,7 @@
 #include <SkImage.h>
 #include <nanosvg.h>
 #include <nanosvgrast.h>
+#include <windowsystem.h>
 #include <string>
 #include <thread>
 
@@ -47,7 +48,7 @@ class Image : public ObjectWrap {
   Nan::Persistent<ArrayBuffer> arrayBuffer;
   Nan::Persistent<Function> cbFn;
   std::string error;
-  uv_async_t *threadAsyncHandle;
+  uv_async_t threadAsyncHandle;
 
   friend class CanvasRenderingContext2D;
   friend class ImageData;

deps/exokit-bindings/canvascontext/src/image-context.cc

@@ -46,13 +46,10 @@ unsigned int Image::GetNumChannels() {
   }
 } */
 
-std::map<uv_async_t *, Image *> handleToImageMap;
 void Image::RunInMainThread(uv_async_t *handle) {
   Nan::HandleScope scope;
 
-  auto iter = handleToImageMap.find(handle);
-  Image *image = (*iter).second;
-  handleToImageMap.erase(iter);
+  Image *image = (Image *)handle->data;
 
   Local<Object> asyncObject = Nan::New<Object>();
   AsyncResource asyncResource(Isolate::GetCurrent(), asyncObject, "imageLoad");
@@ -68,9 +65,7 @@ void Image::RunInMainThread(uv_async_t *handle) {
   image->arrayBuffer.Reset();
   image->error = "";
 
-  uv_close((uv_handle_t *)handle, [](uv_handle_t *handle) {
-    free(handle);
-  });
+  uv_close((uv_handle_t *)handle, nullptr);
 }
 
 void Image::Load(Local<ArrayBuffer> arrayBuffer, size_t byteOffset, size_t byteLength, Local<Function> cbFn) {
@@ -81,10 +76,9 @@ void Image::Load(Local<ArrayBuffer> arrayBuffer, size_t byteOffset, size_t byteL
     this->cbFn.Reset(cbFn);
     this->error = "";
 
-    threadAsyncHandle = (uv_async_t *)malloc(sizeof(uv_async_t));
-    uv_async_init(uv_default_loop(), threadAsyncHandle, RunInMainThread);
-
-    handleToImageMap[threadAsyncHandle] = this;
+    uv_loop_t *loop = windowsystembase::GetEventLoop();
+    uv_async_init(loop, &this->threadAsyncHandle, RunInMainThread);
+    this->threadAsyncHandle.data = this;
 
     std::thread([this, buffer, byteLength]() -> void {
       sk_sp<SkData> data = SkData::MakeWithoutCopy(buffer, byteLength);
@@ -135,7 +129,7 @@ void Image::Load(Local<ArrayBuffer> arrayBuffer, size_t byteOffset, size_t byteL
         }
       }
 
-      uv_async_send(this->threadAsyncHandle);
+      uv_async_send(&this->threadAsyncHandle);
     }).detach();
   } else {
     Local<String> arg0 = Nan::New<String>("already loading").ToLocalChecked();

deps/exokit-bindings/egl/include/egl.h

@@ -15,6 +15,10 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 
+#define EGL_CONTEXT_RELEASE_BEHAVIOR_NONE_KHR 0
+#define EGL_CONTEXT_RELEASE_BEHAVIOR_KHR  0x2097
+#define EGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_KHR 0x2098
+
 using namespace v8;
 
 class WebGLRenderingContext;
@@ -30,8 +34,7 @@ class NATIVEwindow {
 #define windowsystem egl
 
 namespace egl {
-  NATIVEwindow *CreateNativeWindow(unsigned int width, unsigned int height, bool visible, NATIVEwindow *sharedWindow);
-  void GetScreenSize(int *width, int *height);
+  NATIVEwindow *CreateWindowHandle(unsigned int width, unsigned int height, bool visible);
   void GetWindowSize(NATIVEwindow *window, int *width, int *height);
   void GetFramebufferSize(NATIVEwindow *window, int *width, int *height);
   EGLContext GetGLContext(NATIVEwindow *window);