Skip to content

lib: reset the cwd cache before execution #49684

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.

Sign up for GitHub

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

Merged
nodejs-github-bot merged 11 commits into from
Sep 21, 2023
Merged

lib: reset the cwd cache before execution #49684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d6d6eab
lib: reset the cwd cache before execution
arcanis Sep 17, 2023
7b2cfac
test: add a cwd cache bust test
arcanis Sep 17, 2023
f02a6ab
fix lint
arcanis Sep 17, 2023
851b29a
leverage addSerializeCallback
arcanis Sep 18, 2023
a74d68d
leverage spawnSyncAndExitWithoutError
arcanis Sep 18, 2023
3736efe
use trim
arcanis Sep 18, 2023
9b9b520
Update test/parallel/test-snapshot-cwd.js
arcanis Sep 18, 2023
d4b132b
Update test/parallel/test-snapshot-cwd.js
arcanis Sep 18, 2023
12eab3d
Update test/parallel/test-snapshot-cwd.js
arcanis Sep 18, 2023
e2109f7
Update test/parallel/test-snapshot-cwd.js
arcanis Sep 18, 2023
f02b286
Update test-snapshot-cwd.js
arcanis Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
leverage addSerializeCallback
  • Loading branch information
@arcanis
arcanis committed Sep 18, 2023
commit 851b29a2549fdd22af98a35496ee2cbe449fd49b
1 change: 0 additions & 1 deletion lib/internal/bootstrap/switches/does_not_own_process_state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ process.abort = unavailable('process.abort()');
process.chdir = unavailable('process.chdir()');
process.umask = wrappedUmask;
process.cwd = rawMethods.cwd;
process.cwd.resetCwdCache = () => {};

if (credentials.implementsPosixCredentials) {
process.initgroups = unavailable('process.initgroups()');
Expand Down
13 changes: 10 additions & 3 deletions lib/internal/bootstrap/switches/does_own_process_state.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@

const credentials = internalBinding('credentials');
const rawMethods = internalBinding('process_methods');
const {
namespace: {
addSerializeCallback,
isBuildingSnapshot,
},
} = require('internal/v8/startup_snapshot');

process.abort = rawMethods.abort;
process.umask = wrappedUmask;
process.chdir = wrappedChdir;
process.cwd = wrappedCwd;
process.cwd.resetCwdCache = resetCwdCache;

if (credentials.implementsPosixCredentials) {
const wrapped = wrapPosixCredentialSetters(credentials);
Expand Down Expand Up @@ -108,8 +113,10 @@ function wrapPosixCredentialSetters(credentials) {
// directory is changed by `chdir`, it'll be updated.
let cachedCwd = '';

function resetCwdCache() {
cachedCwd = '';
if (isBuildingSnapshot()) {
addSerializeCallback(() => {
cachedCwd = '';
});
}

function wrappedChdir(directory) {
Expand Down
1 change: 0 additions & 1 deletion lib/internal/process/pre_execution.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,6 @@ function patchProcessObject(expandArgv1) {
process.exitCode = undefined;
process._exiting = false;
process.argv[0] = process.execPath;
process.cwd.resetCwdCache();

if (expandArgv1 && process.argv[1] &&
!StringPrototypeStartsWith(process.argv[1], '-')) {
Expand Down