Merge branch 'main' into cw-audio-memory64

Author: cwoffenden

.circleci/config.yml

@@ -591,8 +591,6 @@ jobs:
             wasmfs.test_fs_write
             wasmfs.test_fs_writev
             wasmfs.test_fs_writev_rawfs
-            wasmfs.test_fs_writeFile
-            wasmfs.test_fs_writeFile_rawfs
             wasmfs.test_fs_readv
             wasmfs.test_fs_write
             wasmfs.test_fs_readv_rawfs
@@ -818,8 +816,7 @@ jobs:
             core2.test_fs_rename_on_existing_rawfs
             core2.test_fs_symlink_resolution_nodefs
             core2.test_fs_symlink_resolution_rawfs
-            core2.test_fs_writeFile_rawfs
-            core2.test_fs_writeFile_wasmfs_rawfs
+            core2.test_fs_writeFile*
             core2.test_fs_write_rawfs
             core2.test_fs_writev_rawfs
             core2.test_futimens_rawfs

.github/workflows/tag-release.yml

@@ -25,6 +25,7 @@ jobs:
           title: Mark ${{ env.RELEASE_VERSION }} as released
           body: Update changelog and emscripten-version.txt [ci skip]
           team-reviewers: release-reviewers
+          branch: release_${{ env.RELEASE_VERSION }}
           delete-branch: true
       - name: Enable auto-merge
         run: gh pr merge --squash --auto "${{ steps.cpr.outputs.pull-request-number }}"

ChangeLog.md

@@ -18,8 +18,16 @@ to browse the changes between the tags.
 
 See docs/process.md for more on how version tagging works.
 
-4.0.3 (in development)
+4.0.4 (in development)
 ----------------------
+- An initial port of SDL3 was added.  Use it with `-sUSE_SDL=3`.  This port
+  is still experimental. (#23630)
+- The `--output_eol` command line flag was renamed `--output-eol` for
+  consistency with other flags. The old name continues to work as an alias.
+  (#20735)
+
+4.0.3 - 02/07/25
+----------------
 - emscan-deps tools was added.  This tool wraps clang-scan-deps and injects the
   needed `--target` and `--sysroot` argument that would normally be injected by
   emcc itself.  This enables support for C++20 in cmake projects. (#21987)
@@ -31,6 +39,12 @@ See docs/process.md for more on how version tagging works.
   source maps, so it has not worked in many years, and there have been no
   requests for it. This has no impact on the source map support in browser
   devtools. (#23553)
+- The WASMFS fetch backend now fetches files in chunks using HTTP range
+  requests (if supported by the server). `wasmfs_create_fetch_backend` now
+  takes a second parameter (`uint32_t chunk_size`) to configure the size of
+  each chunk. If a file is read a few times with random accesses, a small
+  chunk size will minimize bandwidth; if a file is read in larger contiguous
+  ranges, a larger chunk size will reduce the number of requests. (#23021)
 
 4.0.2 - 01/30/25
 ----------------

docs/emcc.txt

@@ -574,12 +574,12 @@ Options that are modified or new in *emcc* are listed below:
    [compile] Tells *emcc* to emit an object file which can then be
    linked with other object files to produce an executable.
 
-"--output_eol windows|linux"
+"--output-eol windows|linux"
    [link] Specifies the line ending to generate for the text files
-   that are outputted. If "--output_eol windows" is passed, the final
-   output files will have Windows rn line endings in them. With "--
-   output_eol linux", the final generated files will be written with
-   Unix n line endings.
+   that are outputted. If "--output-eol windows" is passed, the final
+   output files will have Windows "\r\n" line endings in them. With "
+   --output-eol linux", the final generated files will be written with
+   Unix "\n" line endings.
 
 "--cflags"
    [other] Prints out the flags "emcc" would pass to "clang" to

emcc.py

@@ -82,7 +82,7 @@
     '--bind', '--closure', '--cpuprofiler', '--embed-file',
     '--emit-symbol-map', '--emrun', '--exclude-file', '--extern-post-js',
     '--extern-pre-js', '--ignore-dynamic-linking', '--js-library',
-    '--js-transform', '--oformat', '--output_eol',
+    '--js-transform', '--oformat', '--output_eol', '--output-eol',
     '--post-js', '--pre-js', '--preload-file', '--profiling-funcs',
     '--proxy-to-worker', '--shell-file', '--source-map-base',
     '--threadprofiler', '--use-preload-plugins'
@@ -1348,14 +1348,14 @@ def consume_arg_file():
       exit_with_error('--default-obj-ext is no longer supported by emcc')
     elif arg.startswith('-fsanitize=cfi'):
       exit_with_error('emscripten does not currently support -fsanitize=cfi')
-    elif check_arg('--output_eol'):
+    elif check_arg('--output_eol') or check_arg('--output-eol'):
       style = consume_arg()
       if style.lower() == 'windows':
         options.output_eol = '\r\n'
       elif style.lower() == 'linux':
         options.output_eol = '\n'
       else:
-        exit_with_error(f'Invalid value "{style}" to --output_eol!')
+        exit_with_error(f'invalid value for --output-eol: `{style}`')
     # Record PTHREADS setting because it controls whether --shared-memory is passed to lld
     elif arg == '-pthread':
       settings.PTHREADS = 1

emscripten-version.txt

@@ -1 +1 @@
-4.0.3-git
+4.0.4-git

site/source/docs/contributing/developers_guide.rst

@@ -82,7 +82,7 @@ The :ref:`Emscripten Compiler Frontend (emcc) <emccdoc>` is a python script that
 - **emcc** then calls `emscripten.py <https://github.com/emscripten-core/emscripten/blob/main/tools/emscripten.py>`_
   which performs the final transformation to Wasm (including invoking
   **wasm-emscripten-finalize** from Binaryen) and calls the JS compiler
-  (see ``src/compiler.mjs`` and related files) which emits the JS.
+  (see ``tools/compiler.mjs`` and related files) which emits the JS.
 - If optimizing Wasm, **emcc** will then call **wasm-opt**, run meta-dce, and
   other useful things. It will also run JS optimizations on the JS that is
   emitted alongside the Wasm.

site/source/docs/tools_reference/emcc.rst

@@ -566,9 +566,9 @@ Options that are modified or new in *emcc* are listed below:
   [compile]
   Tells *emcc* to emit an object file which can then be linked with other object files to produce an executable.
 
-``--output_eol windows|linux``
+``--output-eol windows|linux``
   [link]
-  Specifies the line ending to generate for the text files that are outputted. If "--output_eol windows" is passed, the final output files will have Windows \r\n line endings in them. With "--output_eol linux", the final generated files will be written with Unix \n line endings.
+  Specifies the line ending to generate for the text files that are outputted. If "--output-eol windows" is passed, the final output files will have Windows ``\r\n`` line endings in them. With "--output-eol linux", the final generated files will be written with Unix ``\n`` line endings.
 
 ``--cflags``
   [other]

src/lib/libdylink.js

@@ -627,6 +627,7 @@ var LibraryDylink = {
     // loadModule loads the wasm module after all its dependencies have been loaded.
     // can be called both sync/async.
     function loadModule() {
+#if PTHREADS
       // The first thread to load a given module needs to allocate the static
       // table and memory regions.  Later threads re-use the same table region
       // and can ignore the memory region (since memory is shared between
@@ -636,6 +637,7 @@ var LibraryDylink = {
       // locking in `dynlink.c`.
       var firstLoad = !handle || !{{{ makeGetValue('handle', C_STRUCTS.dso.mem_allocated, 'i8') }}};
       if (firstLoad) {
+#endif
         // alignments are powers of 2
         var memAlign = Math.pow(2, metadata.memoryAlign);
         // prepare memory
@@ -648,21 +650,27 @@ var LibraryDylink = {
           {{{ makeSetValue('handle', C_STRUCTS.dso.table_addr, 'tableBase', '*') }}};
           {{{ makeSetValue('handle', C_STRUCTS.dso.table_size, 'metadata.tableSize', 'i32') }}};
         }
+#if PTHREADS
       } else {
+        // Read the values for tableBase and memoryBase from shared memory. The
+        // thread that first loaded the DLL already set these values.
         memoryBase = {{{ makeGetValue('handle', C_STRUCTS.dso.mem_addr, '*') }}};
         tableBase = {{{ makeGetValue('handle', C_STRUCTS.dso.table_addr, '*') }}};
       }
+#endif
 
-      var tableGrowthNeeded = tableBase + metadata.tableSize - {{{ from64Expr('wasmTable.length') }}};
-      if (tableGrowthNeeded > 0) {
+      if (metadata.tableSize) {
+#if ASSERTIONS
+        assert({{{ from64Expr('wasmTable.length') }}} == tableBase, `unexpected table size while loading ${libName}: ${wasmTable.length}`);
+#endif
 #if DYLINK_DEBUG
-        dbg("loadModule: growing table: " + tableGrowthNeeded);
+        dbg("loadModule: growing table by: " + metadata.tableSize);
 #endif
-        wasmTable.grow({{{ toIndexType('tableGrowthNeeded') }}});
+        wasmTable.grow({{{ toIndexType('metadata.tableSize') }}});
       }
 #if DYLINK_DEBUG
-      dbg("loadModule: memory[" + memoryBase + ":" + (memoryBase + metadata.memorySize) + "]" +
-                     " table[" + tableBase + ":" + (tableBase + metadata.tableSize) + "]");
+      dbg(`loadModule: memory[${memoryBase}:${memoryBase + metadata.memorySize}]` +
+                     ` table[${tableBasex}:${tableBase + metadata.tableSize}]`);
 #endif
 
       // This is the export map that we ultimately return.  We declare it here

src/lib/libfetchfs.js

@@ -8,8 +8,13 @@ addToLibrary({
   $FETCHFS__deps: ['$stringToUTF8OnStack', 'wasmfs_create_fetch_backend'],
   $FETCHFS: {
     createBackend(opts) {
-      return _wasmfs_create_fetch_backend(stringToUTF8OnStack(opts.base_url));
-    }
+      return withStackSave(
+        () => _wasmfs_create_fetch_backend(
+          stringToUTF8OnStack(opts.base_url ?? ""),
+          opts.chunkSize | 0
+        )
+      );
+    },
   },
 });