@andersbakken/fisk 4.0.62 → 4.0.64

package/daemon/fisk-daemon.js

@@ -7,10 +7,10 @@ var require$$0 = require('constants');
 var require$$0$1 = require('stream');
 var require$$4 = require('util');
 var assert$1 = require('assert');
-var require$$1$1 = require('path');
+var path$h = require('path');
 var os$1 = require('os');
 var net = require('net');
-var require$$1$2 = require('module');
+var require$$1$1 = require('module');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -20,10 +20,10 @@ var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var require$$4__default = /*#__PURE__*/_interopDefaultLegacy(require$$4);
 var assert__default = /*#__PURE__*/_interopDefaultLegacy(assert$1);
-var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
+var path__default = /*#__PURE__*/_interopDefaultLegacy(path$h);
 var os__default = /*#__PURE__*/_interopDefaultLegacy(os$1);
 var net__default = /*#__PURE__*/_interopDefaultLegacy(net);
-var require$$1__default$2 = /*#__PURE__*/_interopDefaultLegacy(require$$1$2);
+var require$$1__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$1$1);
 
 const Constants = {
     // client codes
@@ -42,6 +42,12 @@ const Constants = {
     get JSON() {
         return 5;
     },
+    get AcquireSlot() {
+        return 6;
+    },
+    get ReleaseLocalSlot() {
+        return 7;
+    },
     // daemon codes
     get CppSlotAcquired() {
         return 10;
@@ -51,6 +57,9 @@ const Constants = {
     },
     get JSONResponse() {
         return 12;
+    },
+    get LocalSlotAcquired() {
+        return 13;
     }
 };
 
@@ -208,6 +217,12 @@ class Compile extends EventEmitter__default["default"] {
                     case Constants.ReleaseCompileSlot:
                         emit("releaseCompileSlot");
                         continue;
+                    case Constants.AcquireSlot:
+                        emit("acquireSlot");
+                        continue;
+                    case Constants.ReleaseLocalSlot:
+                        emit("releaseLocalSlot");
+                        continue;
                     case Constants.JSON:
                         if (available < 5) {
                             break;
@@ -1332,7 +1347,7 @@ function retry () {
 	};
 } (fs$j));
 
-const path$g = require$$1__default$1["default"];
+const path$g = path__default["default"];
 
 // get drive on windows
 function getRootPath (p) {
@@ -1357,7 +1372,7 @@ var win32 = {
 };
 
 const fs$h = gracefulFs;
-const path$f = require$$1__default$1["default"];
+const path$f = path__default["default"];
 const invalidWin32Path$1 = win32.invalidWin32Path;
 
 const o777$1 = parseInt('0777', 8);
@@ -1419,7 +1434,7 @@ function mkdirs$2 (p, opts, callback, made) {
 var mkdirs_1$1 = mkdirs$2;
 
 const fs$g = gracefulFs;
-const path$e = require$$1__default$1["default"];
+const path$e = path__default["default"];
 const invalidWin32Path = win32.invalidWin32Path;
 
 const o777 = parseInt('0777', 8);
@@ -1487,7 +1502,7 @@ var mkdirs_1 = {
 
 const fs$f = gracefulFs;
 const os = os__default["default"];
-const path$d = require$$1__default$1["default"];
+const path$d = path__default["default"];
 
 // HFS, ext{2,3}, FAT do not, Node.js v0.10 does not
 function hasMillisResSync () {
@@ -1576,7 +1591,7 @@ var buffer$1 = function (size) {
 };
 
 const fs$e = gracefulFs;
-const path$c = require$$1__default$1["default"];
+const path$c = path__default["default"];
 const mkdirpSync$1 = mkdirs_1.mkdirsSync;
 const utimesSync = utimes$1.utimesMillisSync;
 
@@ -1810,7 +1825,7 @@ var pathExists_1 = {
 };
 
 const fs$c = gracefulFs;
-const path$b = require$$1__default$1["default"];
+const path$b = path__default["default"];
 const mkdirp$1 = mkdirs_1.mkdirs;
 const pathExists$7 = pathExists_1.pathExists;
 const utimes = utimes$1.utimesMillis;
@@ -2090,7 +2105,7 @@ var copy$1 = {
 };
 
 const fs$b = gracefulFs;
-const path$a = require$$1__default$1["default"];
+const path$a = path__default["default"];
 const assert = assert__default["default"];
 
 const isWindows = (process.platform === 'win32');
@@ -2412,7 +2427,7 @@ var remove$2 = {
 
 const u$7 = universalify.fromCallback;
 const fs$a = require$$1__default["default"];
-const path$9 = require$$1__default$1["default"];
+const path$9 = path__default["default"];
 const mkdir$5 = mkdirs_1;
 const remove$1 = remove$2;
 
@@ -2458,7 +2473,7 @@ var empty = {
 };
 
 const u$6 = universalify.fromCallback;
-const path$8 = require$$1__default$1["default"];
+const path$8 = path__default["default"];
 const fs$9 = gracefulFs;
 const mkdir$4 = mkdirs_1;
 const pathExists$6 = pathExists_1.pathExists;
@@ -2506,7 +2521,7 @@ var file$1 = {
 };
 
 const u$5 = universalify.fromCallback;
-const path$7 = require$$1__default$1["default"];
+const path$7 = path__default["default"];
 const fs$8 = gracefulFs;
 const mkdir$3 = mkdirs_1;
 const pathExists$5 = pathExists_1.pathExists;
@@ -2565,7 +2580,7 @@ var link$1 = {
   createLinkSync
 };
 
-const path$6 = require$$1__default$1["default"];
+const path$6 = path__default["default"];
 const fs$7 = gracefulFs;
 const pathExists$4 = pathExists_1.pathExists;
 
@@ -2694,7 +2709,7 @@ var symlinkType_1 = {
 };
 
 const u$4 = universalify.fromCallback;
-const path$5 = require$$1__default$1["default"];
+const path$5 = path__default["default"];
 const fs$5 = gracefulFs;
 const _mkdirs = mkdirs_1;
 const mkdirs = _mkdirs.mkdirs;
@@ -2923,7 +2938,7 @@ var jsonfile = {
   writeJsonSync: jsonFile$3.writeFileSync
 };
 
-const path$4 = require$$1__default$1["default"];
+const path$4 = path__default["default"];
 const mkdir$2 = mkdirs_1;
 const pathExists$2 = pathExists_1.pathExists;
 const jsonFile$2 = jsonfile;
@@ -2950,7 +2965,7 @@ function outputJson (file, data, options, callback) {
 var outputJson_1 = outputJson;
 
 const fs$4 = gracefulFs;
-const path$3 = require$$1__default$1["default"];
+const path$3 = path__default["default"];
 const mkdir$1 = mkdirs_1;
 const jsonFile$1 = jsonfile;
 
@@ -2982,7 +2997,7 @@ jsonFile.readJSONSync = jsonFile.readJsonSync;
 var json = jsonFile;
 
 const fs$3 = gracefulFs;
-const path$2 = require$$1__default$1["default"];
+const path$2 = path__default["default"];
 const copySync = copySync$1.copySync;
 const removeSync = remove$2.removeSync;
 const mkdirpSync = mkdirs_1.mkdirsSync;
@@ -3099,7 +3114,7 @@ var moveSync_1 = {
 
 const u$1 = universalify.fromCallback;
 const fs$2 = gracefulFs;
-const path$1 = require$$1__default$1["default"];
+const path$1 = path__default["default"];
 const copy = copy$1.copy;
 const remove = remove$2.remove;
 const mkdirp = mkdirs_1.mkdirp;
@@ -3180,7 +3195,7 @@ var move_1 = {
 
 const u = universalify.fromCallback;
 const fs$1 = gracefulFs;
-const path = require$$1__default$1["default"];
+const path = path__default["default"];
 const mkdir = mkdirs_1;
 const pathExists = pathExists_1.pathExists;
 
@@ -3254,7 +3269,7 @@ class Server extends EventEmitter__default["default"] {
         super();
         this.option = option;
         this.debug = option("debug");
-        this.file = option("socket", require$$1__default$1["default"].join(common.cacheDir(), "socket"));
+        this.file = option("socket", path__default["default"].join(common.cacheDir(), "socket"));
         this.server = undefined;
         this.option = option;
         this._connections = {};
@@ -3330,16 +3345,40 @@ class Slots extends EventEmitter__default["default"] {
         this.debug = debug;
         this.used = new Map();
         this.pending = new Map();
+        this._totalAcquired = 0;
         if (this.debug) {
             console.log("Slots created", this.toString());
         }
     }
+    get capacity() {
+        return this.count;
+    }
+    get active() {
+        return this.used.size;
+    }
+    get totalAcquired() {
+        return this._totalAcquired;
+    }
+    tryAcquire(id, data) {
+        if (this.used.size < this.count) {
+            this.used.set(id, data);
+            ++this._totalAcquired;
+            if (this.debug) {
+                console.log("tryAcquire succeeded", id, data, this.toString());
+            }
+            this.emit("changed");
+            return true;
+        }
+        return false;
+    }
     acquire(id, data, cb) {
         if (this.used.size < this.count) {
             this.used.set(id, data);
+            ++this._totalAcquired;
             if (this.debug) {
                 console.log("acquired slot", id, data, this.toString());
             }
+            this.emit("changed");
             cb();
         }
         else {
@@ -3363,9 +3402,11 @@ class Slots extends EventEmitter__default["default"] {
             for (const p of this.pending) {
                 this.used.set(p[0], p[1].data);
                 this.pending.delete(p[0]);
+                ++this._totalAcquired;
                 p[1].cb();
                 break;
             }
+            this.emit("changed");
         }
     }
     toString() {
@@ -3385,16 +3426,17 @@ class Slots extends EventEmitter__default["default"] {
 }
 
 const Version = 5;
+const ObjectCacheFormatVersion = 2;
 function cacheDir(option) {
     let dir = option("cache-dir");
     if (!dir) {
-        dir = require$$1__default$1["default"].join(os__default["default"].homedir(), ".cache", "fisk", require$$1__default$1["default"].basename(option.prefix || ""));
+        dir = path__default["default"].join(os__default["default"].homedir(), ".cache", "fisk", path__default["default"].basename(option.prefix || ""));
     }
     return dir;
 }
 function validateCache(option) {
     const dir = cacheDir(option);
-    const file = require$$1__default$1["default"].join(dir, "version");
+    const file = path__default["default"].join(dir, "version");
     // console.log(dir);
     let version;
     try {
@@ -3415,11 +3457,36 @@ function validateCache(option) {
     buf.writeUInt32BE(Version);
     fs.writeFileSync(file, buf);
 }
+function validateObjectCache(option) {
+    const dir = cacheDir(option);
+    const objectCacheDir = option.string("object-cache-dir") || path__default["default"].join(dir, "objectcache");
+    const file = path__default["default"].join(objectCacheDir, "version");
+    let version;
+    try {
+        version = fs.readFileSync(file);
+        if (version.readUInt32BE() === ObjectCacheFormatVersion) {
+            return;
+        }
+    }
+    catch (err) {
+        /* */
+    }
+    if (version) {
+        console.log(`Wrong object cache version. Destroying object cache ${objectCacheDir}`);
+    }
+    fs.removeSync(objectCacheDir);
+    fs.mkdirpSync(objectCacheDir);
+    const buf = Buffer.allocUnsafe(4);
+    buf.writeUInt32BE(ObjectCacheFormatVersion);
+    fs.writeFileSync(file, buf);
+}
 function common$1(option) {
     validateCache(option);
+    validateObjectCache(option);
     return {
         cacheDir: cacheDir.bind(undefined, option),
-        Version
+        Version,
+        ObjectCacheFormatVersion
     };
 }
 
@@ -3431,10 +3498,10 @@ function requireResolve () {
 	hasRequiredResolve = 1;
 
 	// Dependencies
-	var path = require$$1__default$1["default"];
+	var path = path__default["default"];
 
 	// Load global paths
-	var globalPaths = require$$1__default$2["default"].globalPaths;
+	var globalPaths = require$$1__default$1["default"].globalPaths;
 
 	// Guess at NPM's global install dir
 	var npmGlobalPrefix;
@@ -3524,7 +3591,7 @@ function requireResolve () {
 }
 
 var appRootPath$1 = function(dirname) {
-	var path = require$$1__default$1["default"];
+	var path = path__default["default"];
 	var resolve = requireResolve();
 	var appRootPath = resolve(dirname);
 
@@ -3559,7 +3626,7 @@ var xdgBasedir = {};
 
 (function (exports) {
 	const os = os__default["default"];
-	const path = require$$1__default$1["default"];
+	const path = path__default["default"];
 
 	const home = os.homedir();
 	const env = process.env;
@@ -3931,7 +3998,7 @@ class Engine {
     _homedir() {
         let home = process.env.home;
         if (home) {
-            return require$$1__default$1["default"].join(home, ".config");
+            return path__default["default"].join(home, ".config");
         }
         return undefined;
     }
@@ -3966,12 +4033,12 @@ class Engine {
             return 0 /* OptionsReadResult.Failed */;
         };
         // console.log("about to read file", file, "additionalFiles", this.additionalFiles, "configDirs", this.configDirs, "applicationPath", this.applicationPath, "homedir", this._homedir());
-        if (require$$1__default$1["default"].isAbsolute(file)) {
+        if (path__default["default"].isAbsolute(file)) {
             read(file);
         }
         else {
             this.additionalFiles.forEach(file => {
-                if (require$$1__default$1["default"].isAbsolute(file) && read(file) == 0 /* OptionsReadResult.Failed */) {
+                if (path__default["default"].isAbsolute(file) && read(file) == 0 /* OptionsReadResult.Failed */) {
                     read(file + ".conf");
                 }
             });
@@ -3981,13 +4048,13 @@ class Engine {
                     return;
                 }
                 this.additionalFiles.forEach(additional => {
-                    if (!require$$1__default$1["default"].isAbsolute(additional)) {
-                        let file = require$$1__default$1["default"].join(root, additional);
+                    if (!path__default["default"].isAbsolute(additional)) {
+                        let file = path__default["default"].join(root, additional);
                         if (read(file) == 0 /* OptionsReadResult.Failed */)
                             read(file + ".conf");
                     }
                 });
-                let filePath = require$$1__default$1["default"].join(root, file);
+                let filePath = path__default["default"].join(root, file);
                 if (read(filePath) == 0 /* OptionsReadResult.Failed */) {
                     read(filePath + ".conf");
                 }
@@ -4084,6 +4151,22 @@ function createOptions (optionsOptions, argv) {
     });
 }
 
+if (process.argv.includes("--help") || process.argv.includes("-h")) {
+    console.log(`Usage: fisk-daemon [options]
+
+Options:
+  --debug                Enable debug logging
+  --socket=PATH          Unix socket path (default: ~/.cache/fisk/daemon/socket)
+  --cpp-slots=N          Preprocess slot count (default: cpus * 2)
+  --slots=N              Compile slot count (default: cpus)
+  --local-slots=N        Local compile slot count (default: 0, disabled)
+  --local-slots-max-load=N  Max system load average (1-min) to allow local compiles (default: 0, no limit)
+  --cache-dir=PATH       Cache directory (default: ~/.cache/fisk/daemon)
+
+Config files: ~/.config/fisk/daemon.conf, /etc/xdg/fisk/daemon.conf
+Environment variables: FISK_DAEMON_DEBUG, FISK_DAEMON_SLOTS, etc.`);
+    process.exit(0);
+}
 const option = createOptions({
     prefix: "fisk/daemon",
     noApplicationPath: true,
@@ -4113,15 +4196,87 @@ server.on("error", (err) => {
 });
 const cppSlots = new Slots(option.int("cpp-slots", Math.max(os__default["default"].cpus().length * 2, 1)), "cpp", debug);
 const compileSlots = new Slots(option.int("slots", Math.max(os__default["default"].cpus().length, 1)), "compile", debug);
+const localSlotCount = option.int("local-slots", 0);
+const localSlots = new Slots(localSlotCount, "local", debug);
+const localSlotsMaxLoad = option("local-slots-max-load") || 0;
+const slotSubscribers = [];
+function slotsInfo() {
+    return {
+        type: "slotsInfo",
+        local: {
+            active: localSlots.active,
+            capacity: localSlots.capacity,
+            total: localSlots.totalAcquired
+        },
+        cpp: {
+            active: cppSlots.active,
+            capacity: cppSlots.capacity,
+            total: cppSlots.totalAcquired
+        },
+        compile: {
+            active: compileSlots.active,
+            capacity: compileSlots.capacity,
+            total: compileSlots.totalAcquired
+        }
+    };
+}
+function broadcastSlotsInfo() {
+    if (slotSubscribers.length === 0) {
+        return;
+    }
+    const info = slotsInfo();
+    for (const sub of slotSubscribers) {
+        sub.compile.send(info);
+    }
+}
+for (const slots of [localSlots, cppSlots, compileSlots]) {
+    slots.on("changed", broadcastSlotsInfo);
+}
+function canAcquireLocalSlot() {
+    if (localSlotCount <= 0) {
+        return false;
+    }
+    if (localSlotsMaxLoad > 0) {
+        const loadAvg = os__default["default"].loadavg()[0];
+        if (loadAvg > localSlotsMaxLoad) {
+            if (debug) {
+                console.log(`Local slot denied: load ${loadAvg.toFixed(2)} > max ${localSlotsMaxLoad}`);
+            }
+            return false;
+        }
+    }
+    return true;
+}
 server.on("compile", (compile) => {
     compile.on("dumpSlots", () => {
-        const ret = { cpp: cppSlots.dump(), compile: compileSlots.dump() };
+        const ret = { cpp: cppSlots.dump(), compile: compileSlots.dump(), local: localSlots.dump() };
         if (debug) {
             console.log("sending dump", ret);
         }
         compile.send(ret);
     });
+    compile.on("subscribeSlots", () => {
+        if (debug) {
+            console.log("subscribeSlots from", compile.id);
+        }
+        const subscriber = {
+            compile,
+            handler: () => {
+                // Remove subscriber on disconnect
+                const idx = slotSubscribers.indexOf(subscriber);
+                if (idx !== -1) {
+                    slotSubscribers.splice(idx, 1);
+                }
+            }
+        };
+        slotSubscribers.push(subscriber);
+        compile.on("end", subscriber.handler);
+        compile.on("error", subscriber.handler);
+        // Send current state immediately
+        compile.send(slotsInfo());
+    });
     let requestedCppSlot = false;
+    let requestedLocalSlot = false;
     compile.on("acquireCppSlot", () => {
         if (debug) {
             console.log("acquireCppSlot");
@@ -4165,6 +4320,38 @@ server.on("compile", (compile) => {
             compileSlots.release(compile.id);
         }
     });
+    compile.on("acquireSlot", () => {
+        if (debug) {
+            console.log("acquireSlot");
+        }
+        if (canAcquireLocalSlot() && localSlots.tryAcquire(compile.id, { pid: compile.pid })) {
+            if (debug) {
+                console.log("acquireSlot -> local slot granted");
+            }
+            requestedLocalSlot = true;
+            compile.send(Constants.LocalSlotAcquired);
+        }
+        else {
+            if (debug) {
+                console.log("acquireSlot -> falling back to cpp slot");
+            }
+            assert__default["default"](!requestedCppSlot);
+            requestedCppSlot = true;
+            cppSlots.acquire(compile.id, { pid: compile.pid }, () => {
+                compile.send(Constants.CppSlotAcquired);
+            });
+        }
+    });
+    compile.on("releaseLocalSlot", () => {
+        if (debug) {
+            console.log("releaseLocalSlot");
+        }
+        assert__default["default"](requestedLocalSlot);
+        if (requestedLocalSlot) {
+            requestedLocalSlot = false;
+            localSlots.release(compile.id);
+        }
+    });
     compile.on("error", (err) => {
         if (debug) {
             console.error("Got error from fiskc", compile.id, compile.pid, err);
@@ -4177,6 +4364,10 @@ server.on("compile", (compile) => {
             requestedCompileSlot = false;
             compileSlots.release(compile.id);
         }
+        if (requestedLocalSlot) {
+            requestedLocalSlot = false;
+            localSlots.release(compile.id);
+        }
     });
     compile.on("end", () => {
         if (debug) {
@@ -4190,6 +4381,10 @@ server.on("compile", (compile) => {
             requestedCompileSlot = false;
             compileSlots.release(compile.id);
         }
+        if (requestedLocalSlot) {
+            requestedLocalSlot = false;
+            localSlots.release(compile.id);
+        }
     });
 });
 process.on("exit", () => {