Merge branch 'main' into enotdir

Author: hoodmane

ChangeLog.md

@@ -18,8 +18,11 @@ to browse the changes between the tags.
 
 See docs/process.md for more on how version tagging works.
 
-3.1.73 (in development)
+3.1.74 (in development)
 -----------------------
+
+3.1.73 - 11/28/24
+-----------------
 - libunwind was updated to LLVM 19.1.4. (#22394)
 - mimalloc was updated to 2.1.7. (#21548)
 

emscripten-version.txt

@@ -1 +1 @@
-3.1.73-git
+3.1.74-git

src/library_fs.js

@@ -669,6 +669,29 @@ FS.staticInit();
       }
       return parent.node_ops.mknod(parent, name, mode, dev);
     },
+    statfs(path) {
+
+      // NOTE: None of the defaults here are true. We're just returning safe and
+      //       sane values.
+      var rtn = {
+        bsize: 4096,
+        frsize: 4096,
+        blocks: 1e6,
+        bfree: 5e5,
+        bavail: 5e5,
+        files: FS.nextInode,
+        ffree: FS.nextInode - 1,
+        fsid: 42,
+        flags: 2,
+        namelen: 255,
+      };
+
+      var parent = FS.lookupPath(path, {follow: true}).node;
+      if (parent?.node_ops.statfs) {
+        Object.assign(rtn, parent.node_ops.statfs(parent.mount.opts.root));
+      }
+      return rtn;
+    },
     // helpers to create specific types of nodes
     create(path, mode = 0o666) {
       mode &= {{{ cDefs.S_IALLUGO }}};
@@ -810,7 +833,7 @@ FS.staticInit();
       // do the underlying fs rename
       try {
         old_dir.node_ops.rename(old_node, new_dir, new_name);
-        // update old node (we do this here to avoid each backend 
+        // update old node (we do this here to avoid each backend
         // needing to)
         old_node.parent = new_dir;
       } catch (e) {

src/library_nodefs.js

@@ -219,6 +219,13 @@ addToLibrary({
         var path = NODEFS.realPath(node);
         return NODEFS.tryFSOperation(() => fs.readlinkSync(path));
       },
+      statfs(path) {
+        var stats = NODEFS.tryFSOperation(() => fs.statfsSync(path));
+        // Node.js doesn't provide frsize (fragment size). Set it to bsize (block size)
+        // as they're often the same in many file systems. May not be accurate for all.
+        stats.frsize = stats.bsize;
+        return stats;
+      }
     },
     stream_ops: {
       open(stream) {

src/library_sdl.js

@@ -2762,11 +2762,13 @@ var LibrarySDL = {
 
     if (bytes !== undefined && SDL.webAudioAvailable() && canPlayWithWebAudio) {
       audio = undefined;
-      webAudio = {};
-      // The audio decoding process is asynchronous, which gives trouble if user code plays the audio data back immediately
-      // after loading. Therefore prepare an array of callback handlers to run when this audio decoding is complete, which
-      // will then start the playback (with some delay).
-      webAudio.onDecodeComplete = []; // While this member array exists, decoding hasn't finished yet.
+      webAudio = {
+        // The audio decoding process is asynchronous, which gives trouble if user
+        // code plays the audio data back immediately after loading. Therefore
+        // prepare an array of callback handlers to run when this audio decoding
+        // is complete, which will then start the playback (with some delay).
+        onDecodeComplete: [], // While this member array exists, decoding hasn't finished yet.
+      }
       var onDecodeComplete = (data) => {
         webAudio.decodedBuffer = data;
         // Call all handlers that were waiting for this decode to finish, and clear the handler list.
@@ -2815,8 +2817,7 @@ var LibrarySDL = {
     }
 
     if (SDL.webAudioAvailable()) {
-      webAudio = {};
-      webAudio.decodedBuffer = buffer;
+      webAudio = { decodedBuffer: buffer };
     } else {
       audio = new Audio();
       audio.mozAudioChannelType = 'content'; // bugzilla 910340
@@ -2873,13 +2874,14 @@ var LibrarySDL = {
     var audio;
     if (info.webAudio) {
       // Create an instance of the WebAudio object.
-      audio = {};
-      audio.resource = info; // This new object is an instance that refers to this existing resource.
-      audio.paused = false;
-      audio.currentPosition = 0;
       // Make our instance look similar to the instance of a <media> to make api simple.
-      audio.play = function() { SDL.playWebAudio(this); }
-      audio.pause = function() { SDL.pauseWebAudio(this); }
+      audio = {
+        resource: info, // This new object is an instance that refers to this existing resource.
+        paused: false,
+        currentPosition: 0,
+        play() { SDL.playWebAudio(this); },
+        pause() { SDL.pauseWebAudio(this); },
+      };
     } else {
       // We clone the audio node to utilize the preloaded audio buffer, since
       // the browser has already preloaded the audio file.
@@ -2964,12 +2966,13 @@ var LibrarySDL = {
     var audio;
     if (info.webAudio) { // Play via Web Audio API
       // Create an instance of the WebAudio object.
-      audio = {};
-      audio.resource = info; // This new webAudio object is an instance that refers to this existing resource.
-      audio.paused = false;
-      audio.currentPosition = 0;
-      audio.play = function() { SDL.playWebAudio(this); }
-      audio.pause = function() { SDL.pauseWebAudio(this); }
+      audio = {
+        resource: info, // This new webAudio object is an instance that refers to this existing resource.
+        paused: false,
+        currentPosition: 0,
+        play() { SDL.playWebAudio(this); },
+        pause() { SDL.pauseWebAudio(this); },
+      };
     } else if (info.audio) { // Play via the <audio> element
       audio = info.audio;
     }

src/library_syscall.js

@@ -790,22 +790,20 @@ var SyscallsLibrary = {
   },
 
   __syscall_statfs64: (path, size, buf) => {
-    path = SYSCALLS.getStr(path);
 #if ASSERTIONS
     assert(size === {{{ C_STRUCTS.statfs.__size__ }}});
 #endif
-    // NOTE: None of the constants here are true. We're just returning safe and
-    //       sane values.
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bsize, '4096', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_frsize, '4096', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_blocks, '1000000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bfree, '500000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bavail, '500000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_files, 'FS.nextInode', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_ffree, '1000000', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_fsid, '42', 'i32') }}};
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_flags, '2', 'i32') }}};  // ST_NOSUID
-    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_namelen, '255', 'i32') }}};
+    var stats = FS.statfs(SYSCALLS.getStr(path));
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bsize, 'stats.bsize', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_frsize, 'stats.bsize', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_blocks, 'stats.blocks', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bfree, 'stats.bfree', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_bavail, 'stats.bavail', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_files, 'stats.files', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_ffree, 'stats.ffree', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_fsid, 'stats.fsid', 'i32') }}};
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_flags, 'stats.flags', 'i32') }}};  // ST_NOSUID
+    {{{ makeSetValue('buf', C_STRUCTS.statfs.f_namelen, 'stats.namelen', 'i32') }}};
     return 0;
   },
   __syscall_fstatfs64__deps: ['__syscall_statfs64'],

test/core/test_statvfs.c

@@ -8,10 +8,13 @@
 #include <stdio.h>
 #include <errno.h>
 #include <sys/statvfs.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 int main() {
   struct statvfs s;
 
+  mkdir("/test", S_IRWXU | S_IRWXG | S_IRWXO);
   printf("result: %d\n", statvfs("/test", &s));
   printf("errno: %d\n", errno);
 
@@ -21,8 +24,8 @@ int main() {
   printf("f_bfree: %u\n", s.f_bfree);
   printf("f_bavail: %u\n", s.f_bavail);
   printf("f_files: %d\n", s.f_files > 5);
-  printf("f_ffree: %u\n", s.f_ffree);
-  printf("f_favail: %u\n", s.f_favail);
+  printf("f_ffree: %u\n", s.f_ffree <= s.f_files && s.f_ffree > 0);
+  printf("f_favail: %u\n", s.f_favail <= s.f_files && s.f_favail > 0);
   printf("f_fsid: %lu\n", s.f_fsid);
   printf("f_flag: %lu\n", s.f_flag);
   printf("f_namemax: %lu\n", s.f_namemax);

test/core/test_statvfs.out

@@ -6,8 +6,8 @@ f_blocks: 1000000
 f_bfree: 500000
 f_bavail: 500000
 f_files: 1
-f_ffree: 1000000
-f_favail: 1000000
+f_ffree: 1
+f_favail: 1
 f_fsid: 42
 f_flag: 2
 f_namemax: 255

test/fs/test_nodefs_statvfs.c

@@ -0,0 +1,35 @@
+#include <assert.h>
+#include <stdio.h>
+#include <sys/statvfs.h>
+#include <emscripten.h>
+
+void test_statvfs(const char *path) {
+  printf("Testing statfs for path: %s\n", path);
+  struct statvfs st;
+  int result = statvfs(path, &st);
+
+  assert(result == 0 && "statvfs should succeed");
+
+  // Basic sanity checks
+  assert(st.f_bsize > 0 && "Block size should be positive");
+  assert(st.f_blocks > 0 && "Total blocks should be positive");
+  assert(st.f_bfree <= st.f_blocks && "Free blocks should not exceed total blocks");
+  assert(st.f_bavail <= st.f_bfree && "Available blocks should not exceed free blocks");
+  assert(st.f_files >= 0 && "Total inodes should be 0 or positive");
+  assert(st.f_ffree <= st.f_files && "Free inodes should not exceed total inodes");
+}
+
+void setup() {
+  EM_ASM(
+    FS.mkdir('/working');
+    FS.mount(NODEFS, { root: '.' }, '/working');
+  );
+}
+
+int main() {
+  setup();
+  // Test the root filesystem (which should be MEMFS by default)
+  test_statvfs("/");
+  test_statvfs("/working");
+  puts("success");
+}

test/test_core.py

@@ -5784,10 +5784,20 @@ def test_fs_nodefs_readdir(self):
     # externally setup an existing folder structure: existing/a
     if self.get_setting('WASMFS'):
       self.set_setting('FORCE_FILESYSTEM')
-    os.makedirs(os.path.join(self.working_dir, 'existing', 'a'))
+    os.makedirs('existing/a')
     self.emcc_args += ['-lnodefs.js']
     self.do_runf('fs/test_nodefs_readdir.c', 'success')
 
+  @requires_node
+  @crossplatform
+  def test_fs_nodefs_statvfs(self):
+    # externally setup an existing folder structure: existing/a
+    if self.get_setting('WASMFS'):
+      self.set_setting('FORCE_FILESYSTEM')
+    os.makedirs('existing/a')
+    self.emcc_args += ['-lnodefs.js']
+    self.do_runf('fs/test_nodefs_statvfs.c', 'success')
+
   @no_windows('no symlink support on windows')
   @requires_node
   def test_fs_noderawfs_nofollow(self):