mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-23 02:05:42 +00:00
e930b89c34
*** Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8 This changes the behavior of ChromeUtils.import() to return an exports object, rather than a module global, in all cases except when `null` is passed as a second argument, and changes the default behavior not to pollute the global scope with the module's exports. Thus, the following code written for the old model: ChromeUtils.import("resource://gre/modules/Services.jsm"); is approximately the same as the following, in the new model: var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm"); Since the two behaviors are mutually incompatible, this patch will land with a scripted rewrite to update all existing callers to use the new model rather than the old. *** Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs This was done using the followng script: https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm *** Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8 Differential Revision: https://phabricator.services.mozilla.com/D16747 *** Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D16748 *** Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D16749 *** Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs *** Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs Differential Revision: https://phabricator.services.mozilla.com/D16750 --HG-- extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895 extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
190 lines
5.1 KiB
JavaScript
190 lines
5.1 KiB
JavaScript
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* vim: set sts=2 sw=2 et tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
"use strict";
|
|
|
|
/* eslint-disable mozilla/balanced-listeners */
|
|
|
|
var EXPORTED_SYMBOLS = ["SubprocessImpl"];
|
|
|
|
const {ctypes} = ChromeUtils.import("resource://gre/modules/ctypes.jsm");
|
|
const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
const {BaseProcess, PromiseWorker} = ChromeUtils.import("resource://gre/modules/subprocess/subprocess_common.jsm");
|
|
|
|
/* import-globals-from subprocess_shared.js */
|
|
/* import-globals-from subprocess_shared_unix.js */
|
|
Services.scriptloader.loadSubScript("resource://gre/modules/subprocess/subprocess_shared.js", this);
|
|
Services.scriptloader.loadSubScript("resource://gre/modules/subprocess/subprocess_shared_unix.js", this);
|
|
|
|
class UnixPromiseWorker extends PromiseWorker {
|
|
constructor(...args) {
|
|
super(...args);
|
|
|
|
let fds = ctypes.int.array(2)();
|
|
let res = libc.pipe(fds);
|
|
if (res == -1) {
|
|
throw new Error("Unable to create pipe");
|
|
}
|
|
|
|
this.signalFd = fds[1];
|
|
|
|
libc.fcntl(fds[0], LIBC.F_SETFL, LIBC.O_NONBLOCK);
|
|
libc.fcntl(fds[0], LIBC.F_SETFD, LIBC.FD_CLOEXEC);
|
|
libc.fcntl(fds[1], LIBC.F_SETFD, LIBC.FD_CLOEXEC);
|
|
|
|
this.call("init", [{signalFd: fds[0]}]);
|
|
}
|
|
|
|
closePipe() {
|
|
if (this.signalFd) {
|
|
libc.close(this.signalFd);
|
|
this.signalFd = null;
|
|
}
|
|
}
|
|
|
|
onClose() {
|
|
this.closePipe();
|
|
super.onClose();
|
|
}
|
|
|
|
signalWorker() {
|
|
libc.write(this.signalFd, new ArrayBuffer(1), 1);
|
|
}
|
|
|
|
postMessage(...args) {
|
|
this.signalWorker();
|
|
return super.postMessage(...args);
|
|
}
|
|
}
|
|
|
|
|
|
class Process extends BaseProcess {
|
|
static get WORKER_URL() {
|
|
return "resource://gre/modules/subprocess/subprocess_worker_unix.js";
|
|
}
|
|
|
|
static get WorkerClass() {
|
|
return UnixPromiseWorker;
|
|
}
|
|
}
|
|
|
|
// Convert a null-terminated char pointer into a sized char array, and then
|
|
// convert that into a JS typed array.
|
|
// The resulting array will not be null-terminated.
|
|
function ptrToUint8Array(input) {
|
|
let {cast, uint8_t} = ctypes;
|
|
|
|
let len = 0;
|
|
for (let ptr = cast(input, uint8_t.ptr); ptr.contents; ptr = ptr.increment()) {
|
|
len++;
|
|
}
|
|
|
|
let aryPtr = cast(input, uint8_t.array(len).ptr);
|
|
return new Uint8Array(aryPtr.contents);
|
|
}
|
|
|
|
var SubprocessUnix = {
|
|
Process,
|
|
|
|
call(options) {
|
|
return Process.create(options);
|
|
},
|
|
|
|
* getEnvironment() {
|
|
let environ;
|
|
if (OS.Constants.Sys.Name == "Darwin") {
|
|
environ = libc._NSGetEnviron().contents;
|
|
} else {
|
|
environ = libc.environ;
|
|
}
|
|
|
|
const EQUAL = "=".charCodeAt(0);
|
|
let decoder = new TextDecoder("utf-8", {fatal: true});
|
|
|
|
function decode(array) {
|
|
try {
|
|
return decoder.decode(array);
|
|
} catch (e) {
|
|
return array;
|
|
}
|
|
}
|
|
|
|
for (let envp = environ; !envp.contents.isNull(); envp = envp.increment()) {
|
|
let buf = ptrToUint8Array(envp.contents);
|
|
|
|
for (let i = 0; i < buf.length; i++) {
|
|
if (buf[i] == EQUAL) {
|
|
yield [decode(buf.subarray(0, i)),
|
|
decode(buf.subarray(i + 1))];
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
},
|
|
|
|
isExecutableFile: async function isExecutable(path) {
|
|
if (!OS.Path.split(path).absolute) {
|
|
return false;
|
|
}
|
|
|
|
try {
|
|
let info = await OS.File.stat(path);
|
|
|
|
// FIXME: We really want access(path, X_OK) here, but OS.File does not
|
|
// support it.
|
|
return !info.isDir && (info.unixMode & 0o111);
|
|
} catch (e) {
|
|
return false;
|
|
}
|
|
},
|
|
|
|
/**
|
|
* Searches for the given executable file in the system executable
|
|
* file paths as specified by the PATH environment variable.
|
|
*
|
|
* On Windows, if the unadorned filename cannot be found, the
|
|
* extensions in the semicolon-separated list in the PATHEXT
|
|
* environment variable are successively appended to the original
|
|
* name and searched for in turn.
|
|
*
|
|
* @param {string} bin
|
|
* The name of the executable to find.
|
|
* @param {object} environment
|
|
* An object containing a key for each environment variable to be used
|
|
* in the search.
|
|
* @returns {Promise<string>}
|
|
*/
|
|
async pathSearch(bin, environment) {
|
|
let split = OS.Path.split(bin);
|
|
if (split.absolute) {
|
|
if (await this.isExecutableFile(bin)) {
|
|
return bin;
|
|
}
|
|
let error = new Error(`File at path "${bin}" does not exist, or is not executable`);
|
|
error.errorCode = SubprocessConstants.ERROR_BAD_EXECUTABLE;
|
|
throw error;
|
|
}
|
|
|
|
let dirs = [];
|
|
if (typeof environment.PATH === "string") {
|
|
dirs = environment.PATH.split(":");
|
|
}
|
|
|
|
for (let dir of dirs) {
|
|
let path = OS.Path.join(dir, bin);
|
|
|
|
if (await this.isExecutableFile(path)) {
|
|
return path;
|
|
}
|
|
}
|
|
let error = new Error(`Executable not found: ${bin}`);
|
|
error.errorCode = SubprocessConstants.ERROR_BAD_EXECUTABLE;
|
|
throw error;
|
|
},
|
|
};
|
|
|
|
var SubprocessImpl = SubprocessUnix;
|