Rename errno constants to use the wasi values (#9545)

Redefine errno values to be consistent with wasi. This will let us avoid
needing to convert the values back and forth as we use more wasi APIs (which
I experiemented with and it adds 1K or so).

This is an ABI change, which should not be noticeable from user code
unless you use errno defines (like EAGAIN) and keep around binaries
compiled with an older version that you link against. In that case, you
should rebuild them.

Fix NODEFS, which basically just routed the node errno code to ours, which
only worked when the underlying system had codes similar to musl - which seems
to have been the case on some linuxes. This does make NODEFS larger, as it
uses the ERRNO lookup table now, I'll look into a way to avoid including
it unnecessarily as a followup (would be a breaking change).

Most of the changes in this PR are test changes, places where we printed
raw errno codes.

Author: kripken

ChangeLog.md

@@ -18,6 +18,12 @@ See docs/process.md for how version tagging works.
 
 Current Trunk
 -------------
+ - Redefine errno values to be consistent with wasi. This will let us avoid
+   needing to convert the values back and forth as we use more wasi APIs.
+   This is an ABI change, which should not be noticeable from user code
+   unless you use errno defines (like EAGAIN) *and* keep around binaries
+   compiled with an older version that you link against. In that case, you
+   should rebuild them. See #9545.
 
 v.1.38.46: 09/25/2019
 ---------------------

src/library_nodefs.js

@@ -4,7 +4,7 @@
 // found in the LICENSE file.
 
 mergeInto(LibraryManager.library, {
-  $NODEFS__deps: ['$FS', '$PATH'],
+  $NODEFS__deps: ['$FS', '$PATH', '$ERRNO_CODES'],
   $NODEFS__postset: 'if (ENVIRONMENT_HAS_NODE) { var fs = require("fs"); var NODEJS_PATH = require("path"); NODEFS.staticInit(); }',
   $NODEFS: {
     isWindows: false,
@@ -32,6 +32,11 @@ mergeInto(LibraryManager.library, {
       // Buffer.alloc has been added with Buffer.from together, so check it instead
       return Buffer["alloc"] ? Buffer.from(arrayBuffer) : new Buffer(arrayBuffer);
     },
+    convertNodeCode: function(e) {
+      var code = e.code;
+      assert(code in ERRNO_CODES);
+      return ERRNO_CODES[code];
+    },
     mount: function (mount) {
       assert(ENVIRONMENT_HAS_NODE);
       return NODEFS.createNode(null, '/', NODEFS.getMode(mount.opts.root), 0);
@@ -56,7 +61,7 @@ mergeInto(LibraryManager.library, {
         }
       } catch (e) {
         if (!e.code) throw e;
-        throw new FS.ErrnoError(-e.errno); // syscall errnos are negated, node's are not
+        throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
       }
       return stat.mode;
     },
@@ -99,7 +104,7 @@ mergeInto(LibraryManager.library, {
           stat = fs.lstatSync(path);
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
         // node.js v0.10.20 doesn't report blksize and blocks on Windows. Fake them with default blksize of 4096.
         // See http://support.microsoft.com/kb/140365
@@ -142,7 +147,7 @@ mergeInto(LibraryManager.library, {
           }
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       lookup: function (parent, name) {
@@ -162,7 +167,7 @@ mergeInto(LibraryManager.library, {
           }
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
         return node;
       },
@@ -173,7 +178,7 @@ mergeInto(LibraryManager.library, {
           fs.renameSync(oldPath, newPath);
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       unlink: function(parent, name) {
@@ -182,7 +187,7 @@ mergeInto(LibraryManager.library, {
           fs.unlinkSync(path);
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       rmdir: function(parent, name) {
@@ -191,7 +196,7 @@ mergeInto(LibraryManager.library, {
           fs.rmdirSync(path);
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       readdir: function(node) {
@@ -200,7 +205,7 @@ mergeInto(LibraryManager.library, {
           return fs.readdirSync(path);
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       symlink: function(parent, newName, oldPath) {
@@ -209,7 +214,7 @@ mergeInto(LibraryManager.library, {
           fs.symlinkSync(oldPath, newPath);
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       readlink: function(node) {
@@ -220,7 +225,7 @@ mergeInto(LibraryManager.library, {
           return path;
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
     },
@@ -233,7 +238,7 @@ mergeInto(LibraryManager.library, {
           }
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       close: function (stream) {
@@ -243,7 +248,7 @@ mergeInto(LibraryManager.library, {
           }
         } catch (e) {
           if (!e.code) throw e;
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       read: function (stream, buffer, offset, length, position) {
@@ -252,14 +257,14 @@ mergeInto(LibraryManager.library, {
         try {
           return fs.readSync(stream.nfd, NODEFS.bufferFrom(buffer.buffer), offset, length, position);
         } catch (e) {
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       write: function (stream, buffer, offset, length, position) {
         try {
           return fs.writeSync(stream.nfd, NODEFS.bufferFrom(buffer.buffer), offset, length, position);
         } catch (e) {
-          throw new FS.ErrnoError(-e.errno);
+          throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
         }
       },
       llseek: function (stream, offset, whence) {
@@ -272,7 +277,7 @@ mergeInto(LibraryManager.library, {
               var stat = fs.fstatSync(stream.nfd);
               position += stat.size;
             } catch (e) {
-              throw new FS.ErrnoError(-e.errno);
+              throw new FS.ErrnoError(NODEFS.convertNodeCode(e));
             }
           }
         }

system/lib/compiler-rt/lib/sanitizer_common/sanitizer_errno_codes.h

@@ -20,11 +20,14 @@
 #ifndef SANITIZER_ERRNO_CODES_H
 #define SANITIZER_ERRNO_CODES_H
 
+// XXX EMSCRIPTEN: use wasi errno codes, which is what our musl port now uses
+#include <wasi/wasi.h>
+
 namespace __sanitizer {
 
-#define errno_ENOMEM 12
-#define errno_EBUSY 16
-#define errno_EINVAL 22
+#define errno_ENOMEM __WASI_ENOMEM
+#define errno_EBUSY  __WASI_EBUSY
+#define errno_EINVAL __WASI_EINVAL
 
 // Those might not present or their value differ on different platforms.
 extern const int errno_EOWNERDEAD;