test MEMORY64 + pthread

Author: toyobayashi

.github/workflows/main.yml

@@ -37,7 +37,7 @@ jobs:
     - uses: mymindstorm/setup-emsdk@v11
       if: ${{ matrix.target == 'emscripten' }}
       with:
-        version: '3.1.29'
+        version: '3.1.32'
         # no-cache: true
         actions-cache-folder: 'emsdk-cache'
     - uses: actions-rs/toolchain@v1
@@ -79,7 +79,7 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: '18.12.1'
+        node-version: ${{ (matrix.target == 'emscripten' && '20.0.0-v8-canary202302081604228b65') || '18.12.1' }}
         registry-url: 'https://registry.npmjs.org'
       env:
         NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
@@ -165,7 +165,7 @@ jobs:
     - uses: mymindstorm/setup-emsdk@v11
       if: ${{ matrix.target == 'emscripten' }}
       with:
-        version: '3.1.29'
+        version: '3.1.32'
         # no-cache: true
         actions-cache-folder: 'emsdk-cache'
     - name: Install wasi-sdk

packages/test/CMakeLists.txt

@@ -82,7 +82,7 @@ if(IS_EMSCRIPTEN)
     "-sNODEJS_CATCH_EXIT=0"
     "-sWASM_BIGINT=1"
     "-sALLOW_MEMORY_GROWTH=1"
-    "-sMIN_CHROME_VERSION=67"
+    "-sMIN_CHROME_VERSION=84"
     "-sSTACK_SIZE=2MB"
     "-sDEFAULT_PTHREAD_STACK_SIZE=2MB"
     "-sSAFE_HEAP=1"
@@ -221,11 +221,11 @@ endfunction()
 add_test("env" "./env/binding.c" OFF OFF "")
 add_test("hello" "./hello/binding.c" OFF OFF "")
 
-if((NOT IS_WASM) OR IS_WASI OR (IS_EMSCRIPTEN AND NOT IS_MEMORY64))
+if((NOT IS_WASM) OR IS_WASI OR IS_EMSCRIPTEN)
   add_test("async" "./async/binding.c" OFF ON "")
 endif()
 
-if((NOT IS_WASM) OR (IS_EMSCRIPTEN AND NOT IS_MEMORY64))
+if((NOT IS_WASM) OR IS_EMSCRIPTEN)
   add_test("string_mt" "./string/binding.c" ON ON "")
   if(IS_EMSCRIPTEN)
   add_test("pool" "./pool/binding.c" OFF ON "--pre-js=../pool/pre.js")
@@ -281,11 +281,13 @@ add_test("version" "./version/binding.c" OFF OFF "")
 add_test("make_callback" "./make_callback/binding.c" OFF OFF "")
 add_test("async_context" "./async_context/binding.c" OFF OFF "")
 
-if(IS_EMSCRIPTEN AND NOT IS_MEMORY64)
+if(IS_EMSCRIPTEN)
   file(GLOB_RECURSE naa_binding_SRC
     "./node-addon-api/*.cc")
 
+  if(NOT IS_MEMORY64)
   add_naa_test("naa_binding" "${naa_binding_SRC}" "" ON)
+  endif()
   add_naa_test("naa_binding_noexcept" "${naa_binding_SRC}" "" OFF)
   add_naa_test("naa_binding_noexcept_maybe" "${naa_binding_SRC}" "NODE_ADDON_API_ENABLE_MAYBE" OFF)
   add_naa_test("naa_binding_custom_namespace" "${naa_binding_SRC}" "NAPI_CPP_CUSTOM_NAMESPACE=cstm" OFF)

packages/test/async/async.test.js

@@ -30,6 +30,7 @@ async function main () {
   const p = child_process.spawnSync(
     process.execPath, [
       ...(process.env.EMNAPI_TEST_WASI ? ['--experimental-wasi-unstable-preview1'] : []),
+      ...(process.env.MEMORY64 ? ['--experimental-wasm-memory64'] : []),
       __filename,
       'child'
     ])

packages/test/async_cleanup_hook/async_cleanup_hook.test.js

@@ -7,7 +7,13 @@ module.exports = new Promise((resolve, reject) => {
   const w = new Worker(`
     const { load } = require(${JSON.stringify(require.resolve('../util.js'))})
     load('async_cleanup_hook')
-  `, { eval: true, env: process.env, execArgv: process.env.EMNAPI_TEST_WASI ? ['--experimental-wasi-unstable-preview1'] : [] })
+  `, {
+    eval: true,
+    env: process.env,
+    execArgv: [
+      ...(process.env.EMNAPI_TEST_WASI ? ['--experimental-wasi-unstable-preview1'] : [])
+    ]
+  })
   w.on('exit', common.mustCall((code) => {
     console.log('Worker exit')
     if (code !== 0) {

packages/test/hello/hello.test.js

@@ -20,7 +20,9 @@ module.exports = new Promise((resolve, reject) => {
   load('hello').then((binding) => { const msg = binding.hello(); parentPort.postMessage(msg) });`, {
         eval: true,
         env: process.env,
-        execArgv: process.env.EMNAPI_TEST_WASI ? ['--experimental-wasi-unstable-preview1'] : []
+        execArgv: [
+          ...(process.env.EMNAPI_TEST_WASI ? ['--experimental-wasi-unstable-preview1'] : [])
+        ]
       })
         .on('message', common.mustCall((msg) => {
           try {

packages/test/node-addon-api/common/index.js

@@ -84,7 +84,7 @@ async function runTest (test, buildType, buildPathRoot = process.env.BUILD_PATH
     // path.join(buildPathRoot, `../build/${buildType}/binding_noexcept.node`),
     // path.join(buildPathRoot, `../build/${buildType}/binding_noexcept_maybe.node`),
     // path.join(buildPathRoot, `../build/${buildType}/binding_custom_namespace.node`)
-    'naa_binding',
+    ...(!process.env.MEMORY64 ? ['naa_binding'] : []),
     'naa_binding_noexcept',
     'naa_binding_noexcept_maybe',
     'naa_binding_custom_namespace'

packages/test/pool/binding.c

@@ -11,15 +11,16 @@ typedef struct {
   napi_async_work _request;
 } carrier;
 
-static void F(void* data) {
+static void* F(void* data) {
   uv_sleep(1000);
+  return NULL;
 }
 
 static void some_method() {
   uv_thread_t pid[3];
   printf("some_method()\n");
   for (int i = 0; i < 3; ++i) {
-    uv_thread_create(pid + i, F, NULL);
+    uv_thread_create(pid + i, (uv_thread_cb)F, NULL);
   }
   for (int i = 0; i < 3; ++i) {
     uv_thread_join(pid + i);

packages/test/script/test.js

@@ -16,13 +16,6 @@ const pthread = [
   'string/string-pthread.test.js'
 ]
 
-if (process.env.MEMORY64) {
-  ignore = [...new Set([
-    ...ignore,
-    ...pthread
-  ])]
-}
-
 if (process.env.EMNAPI_TEST_NATIVE) {
   ignore = [...new Set([
     ...ignore,

packages/test/tsfn/binding.c

@@ -30,17 +30,18 @@ static ts_fn_hint ts_info;
 // Thread data to transmit to JS
 static int ints[ARRAY_LENGTH];
 
-static void secondary_thread(void* data) {
+static void* secondary_thread(void* data) {
   napi_threadsafe_function ts_fn = data;
 
   if (napi_release_threadsafe_function(ts_fn, napi_tsfn_release) != napi_ok) {
     napi_fatal_error("secondary_thread", NAPI_AUTO_LENGTH,
         "napi_release_threadsafe_function failed", NAPI_AUTO_LENGTH);
   }
+  return NULL;
 }
 
 // Source thread producing the data
-static void data_source_thread(void* data) {
+static void* data_source_thread(void* data) {
   napi_threadsafe_function ts_fn = data;
   int index;
   void* hint;
@@ -67,7 +68,7 @@ static void data_source_thread(void* data) {
         "napi_acquire_threadsafe_function failed", NAPI_AUTO_LENGTH);
     }
 
-    if (uv_thread_create(&uv_threads[1], secondary_thread, ts_fn) != 0) {
+    if (uv_thread_create(&uv_threads[1], (uv_thread_cb)secondary_thread, ts_fn) != 0) {
       napi_fatal_error("data_source_thread", NAPI_AUTO_LENGTH,
         "failed to start secondary thread", NAPI_AUTO_LENGTH);
     }
@@ -126,6 +127,7 @@ static void data_source_thread(void* data) {
     napi_fatal_error("data_source_thread", NAPI_AUTO_LENGTH,
         "napi_release_threadsafe_function failed", NAPI_AUTO_LENGTH);
   }
+  return NULL;
 }
 
 // Getting the data into JS
@@ -239,7 +241,7 @@ static napi_value StartThreadInternal(napi_env env,
       napi_get_value_bool(env, argv[2], &(ts_info.start_secondary)));
 
   NAPI_ASSERT(env,
-      (uv_thread_create(&uv_threads[0], data_source_thread, ts_fn) == 0),
+      (uv_thread_create(&uv_threads[0], (uv_thread_cb)data_source_thread, ts_fn) == 0),
       "Thread creation");
 
   return NULL;