Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply segfault workaround to image optimizer as well #7461

Merged
merged 1 commit into from Dec 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/optimizers/image/package.json
Expand Up @@ -35,6 +35,7 @@
"@parcel/diagnostic": "^2.0.1",
"@parcel/plugin": "^2.0.1",
"@parcel/utils": "^2.0.1",
"@parcel/workers": "^2.0.1",
"detect-libc": "^1.0.3"
},
"devDependencies": {
Expand Down
26 changes: 26 additions & 0 deletions packages/optimizers/image/src/ImageOptimizer.js
Expand Up @@ -5,13 +5,15 @@ import {Optimizer} from '@parcel/plugin';
import {blobToBuffer} from '@parcel/utils';
import {md} from '@parcel/diagnostic';
import {optimize} from '../native';
import WorkerFarm from '@parcel/workers';

export default (new Optimizer({
async optimize({bundle, contents, logger}) {
if (!bundle.env.shouldOptimize) {
return {contents};
}

await loadOnMainThreadIfNeeded();
let buffer = await blobToBuffer(contents);

// Attempt to optimize it, if the optimize fails we log a warning...
Expand All @@ -34,3 +36,27 @@ export default (new Optimizer({
return {contents: buffer};
},
}): Optimizer);

// On linux with older versions of glibc (e.g. CentOS 7), we encounter a segmentation fault
// when worker threads exit due to thread local variables in Rust. A workaround is to
// also load the native module on the main thread, so that it is not unloaded until process exit.
// See https://github.com/rust-lang/rust/issues/91979.
let isLoadedOnMainThread = false;
async function loadOnMainThreadIfNeeded() {
if (
!isLoadedOnMainThread &&
process.platform === 'linux' &&
WorkerFarm.isWorker()
) {
let {family, version} = require('detect-libc');
if (family === 'glibc' && parseFloat(version) <= 2.17) {
let api = WorkerFarm.getWorkerApi();
await api.callMaster({
location: __dirname + '/loadNative.js',
args: [],
});

isLoadedOnMainThread = true;
}
}
}
6 changes: 6 additions & 0 deletions packages/optimizers/image/src/loadNative.js
@@ -0,0 +1,6 @@
// This function is called from the main thread to prevent unloading the module
// until the main thread exits. This avoids a segfault in older glibc versions.
// See https://github.com/rust-lang/rust/issues/91979
module.exports = () => {
require('../native');
};