@andersbakken/fisk 5.0.12 → 5.0.13

package/builder/VM_runtime.js

@@ -3039,6 +3039,16 @@ var fs = libExports;
 const FISK_PAD_LENGTH = 4096;
 const FISK_NAME_PAD = "/fisk-name" + "_".repeat(FISK_PAD_LENGTH - "/fisk-name".length);
 const FISK_CDIR_PAD = "/fisk-cdir" + "_".repeat(FISK_PAD_LENGTH - "/fisk-cdir".length);
+// Flags asking the compiler to record its own argv, mapped to the negation the
+// same compiler spells it with. -g* forms land in DW_AT_producer, -f* forms in a
+// .GCC.command.line section; clang uses the command-line names and also accepts
+// the gcc-switches ones as aliases.
+const RECORD_FLAG_NEGATIONS = {
+    "-grecord-command-line": "-gno-record-command-line",
+    "-frecord-command-line": "-fno-record-command-line",
+    "-grecord-gcc-switches": "-gno-record-gcc-switches",
+    "-frecord-gcc-switches": "-fno-record-gcc-switches"
+};
 class Compile extends EventEmitter__default["default"] {
     constructor(args, argv0, dir, debug, sourceFileName, paddedPaths) {
         super();
@@ -3165,20 +3175,52 @@ class Compile extends EventEmitter__default["default"] {
             throw new Error("No sourcefile");
         }
         const sourceFileInDir = path__default["default"].join(dir, sourceFileName || path__default["default"].basename(sourcePath));
+        // Padding only pays off where the client's byte scan can reach the pads,
+        // and it is only *needed* for LLVM bitcode, which DwarfPatcher cannot
+        // load. Everywhere else DwarfPatcher already works, and padding actively
+        // breaks it: it matches on the old /compiles path still being in
+        // .debug_str, so once the pads have replaced it there is nothing for the
+        // fallback to match and the pads stay in the debug info.
+        //
+        //   - non-clang: gcc never emits bitcode, and some gcc builds (the nrdp
+        //     desktop toolchain, for one) compress .debug_str by default with no
+        //     flag asking for it, which the byte scan cannot see into.
+        //   - -gz: same problem, explicitly requested. -Wl, forms are link-time
+        //     and do not affect the object we hand back, so they do not count.
+        const wantsCompressedDebug = args.some((arg) => {
+            if (arg.startsWith("-Wl,")) {
+                return false;
+            }
+            return (arg.startsWith("-gz") && arg !== "-gz=none") || arg.includes("compress-debug-sections");
+        });
+        if (paddedPaths && (!isClang || wantsCompressedDebug)) {
+            if (debug) {
+                console.log("Not padding paths, leaving them to DwarfPatcher:", "isClang", isClang, "wantsCompressedDebug", wantsCompressedDebug);
+            }
+            paddedPaths = false;
+        }
         if (paddedPaths) {
-            // -grecord-command-line embeds our own argv verbatim into
-            // DW_AT_producer, which would (a) add two PATH_MAX pads to every CU
-            // and (b) leave the builder's /compiles path in the producer, where
-            // the client's byte scan would hit the embedded pad and NUL-truncate
-            // the rest of the recorded command line. The recorded line would be
-            // the builder's rewritten argv anyway -- not the client's -- so drop
-            // it rather than record something both wrong and mangled.
-            for (let i = args.length - 1; i >= 0; --i) {
-                if (args[i] === "-grecord-command-line" || args[i] === "-frecord-command-line") {
-                    args.splice(i, 1);
+            // -grecord-command-line (clang) / -frecord-gcc-switches (gcc) embed
+            // our own argv verbatim into DW_AT_producer or .GCC.command.line,
+            // which would (a) add two PATH_MAX pads to every CU and (b) leave
+            // the builder's /compiles path in there, where the client's byte
+            // scan would hit the embedded pad and NUL-truncate the rest of the
+            // recorded command line. The recorded line would be the builder's
+            // rewritten argv anyway -- not the client's -- so turn it off rather
+            // than record something both wrong and mangled.
+            //
+            // Negate each flag in place instead of dropping it and appending one
+            // fixed negation: whichever compiler accepted the positive spelling
+            // necessarily accepts its own negation, whereas a fixed flag is a
+            // guess about the compiler. That guess is what put
+            // -gno-record-command-line (clang 11+, and gcc spells it
+            // -gno-record-gcc-switches) on gcc command lines.
+            for (let i = 0; i < args.length; ++i) {
+                const negation = RECORD_FLAG_NEGATIONS[args[i]];
+                if (negation) {
+                    args[i] = negation;
                 }
             }
-            args.push("-gno-record-command-line");
             // The more specific source-file rule must come last: both clang and
             // gcc let a later -fdebug-prefix-map win over an earlier one, and
             // the directory rule is a prefix of the source-file rule.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@andersbakken/fisk",
-    "version": "5.0.12",
+    "version": "5.0.13",
     "description": "Fisk, a distributed compile system",
     "scripts": {
         "lint": "eslint . --ext .ts",

package/scheduler/fisk-scheduler.js

@@ -57998,7 +57998,31 @@ const option = options({
 const common = common$1(option);
 let nextCommandId = 0;
 const server = new Server(option, common.Version);
-const clientMinimumVersion = "5.0.6";
+// 5.0.11 is the first client that asks for padded paths and can patch them out
+// of LTO bitcode. An older client silently produces objects with the builder's
+// /compiles paths baked into the debug info -- and because paddedPaths is not
+// part of the object cache key, those objects are then served to up-to-date
+// clients too, so one stale client poisons everyone's backtraces.
+const clientMinimumVersion = "5.0.11";
+// compareVersions throws on an empty or malformed version rather than returning
+// an ordering, and npmVersion is "" for any client that sends no
+// x-fisk-npm-version header. Thrown out of the compile handler that would be a
+// silent hang: uncaughtException keeps the scheduler up, but the request is
+// abandoned half-handled, so the client waits for a reply that never comes
+// instead of being told to update. A version we cannot read is not >= the
+// minimum, so treat it as too old and reject it properly.
+function clientTooOld(npmVersion) {
+    if (!npmVersion) {
+        return true;
+    }
+    try {
+        return compareVersions(clientMinimumVersion, npmVersion) >= 1;
+    }
+    catch (err) {
+        console.error(`Unparseable client npm version: "${npmVersion}"`, err);
+        return true;
+    }
+}
 const serverStartTime = Date.now();
 // A stalled event loop stops calling accept(), the listen backlog fills and the
 // kernel then silently drops SYNs, which clients see as a connect timeout rather
@@ -58848,7 +58872,7 @@ function requestEnvironment(compile) {
     return true;
 }
 server.on("clientVerify", (clientVerify) => {
-    if (compareVersions(clientMinimumVersion, clientVerify.npmVersion) >= 1) {
+    if (clientTooOld(clientVerify.npmVersion)) {
         clientVerify.send("version_mismatch", { minimum_version: `${clientMinimumVersion}` });
     }
     else {
@@ -58859,7 +58883,7 @@ server.on("compile", (compile) => {
     compile.on("log", (event) => {
         addLogFile({ source: "client", ip: compile.ip, contents: event.message });
     });
-    if (compareVersions(clientMinimumVersion, compile.npmVersion) >= 1) {
+    if (clientTooOld(compile.npmVersion)) {
         ++jobsFailed;
         compile.send("version_mismatch", { minimum_version: `${clientMinimumVersion}` });
         return;