GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — fs: improve error performance of `linkSync` · nodejs/node@9dba771

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

benchmark/fs
- bench-linkSync.js
lib
- fs.js
src
- node_file.cc
typings/internalBinding
- fs.d.ts

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎benchmark/fs/bench-linkSync.js‎`

Copy file name to clipboard

+50Lines changed: 50 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,50 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+const common = require('../common');`
	`4`	`+const fs = require('fs');`
	`5`	`+const assert = require('assert');`
	`6`	`+const tmpdir = require('../../test/common/tmpdir');`
	`7`	`+`
	`8`	`+tmpdir.refresh();`
	`9`	+const tmpfile = tmpdir.resolve(`.bench-file-data-${Date.now()}`);
	`10`	`+fs.writeFileSync(tmpfile, 'bench-file', 'utf-8');`
	`11`	`+`
	`12`	`+const bench = common.createBenchmark(main, {`
	`13`	`+ type: ['valid', 'invalid'],`
	`14`	`+ n: [1e3],`
	`15`	`+});`
	`16`	`+`
	`17`	`+function main({ n, type }) {`
	`18`	`+ switch (type) {`
	`19`	`+ case 'valid': {`
	`20`	`+ bench.start();`
	`21`	`+ for (let i = 0; i < n; i++) {`
	`22`	+ fs.linkSync(tmpfile, tmpdir.resolve(`.valid-${i}`), 'file');
	`23`	`+ }`
	`24`	`+ bench.end(n);`
	`25`	`+`
	`26`	`+ break;`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ case 'invalid': {`
	`30`	`+ let hasError = false;`
	`31`	`+ bench.start();`
	`32`	`+ for (let i = 0; i < n; i++) {`
	`33`	`+ try {`
	`34`	`+ fs.linkSync(`
	`35`	+ tmpdir.resolve(`.non-existing-file-for-linkSync-${i}`),
	`36`	`+ __filename,`
	`37`	`+ 'file',`
	`38`	`+ );`
	`39`	`+ } catch {`
	`40`	`+ hasError = true;`
	`41`	`+ }`
	`42`	`+ }`
	`43`	`+ bench.end(n);`
	`44`	`+ assert(hasError);`
	`45`	`+ break;`
	`46`	`+ }`
	`47`	`+ default:`
	`48`	`+ new Error('Invalid type');`
	`49`	`+ }`
	`50`	`+}`

Collapse file

`‎lib/fs.js‎`

Copy file name to clipboardExpand all lines: lib/fs.js

+4-6Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1845,12 +1845,10 @@ function linkSync(existingPath, newPath) {`
`1845`	`1845`	`existingPath = getValidatedPath(existingPath, 'existingPath');`
`1846`	`1846`	`newPath = getValidatedPath(newPath, 'newPath');`
`1847`	`1847`
`1848`		`- const ctx = { path: existingPath, dest: newPath };`
`1849`		`- const result = binding.link(pathModule.toNamespacedPath(existingPath),`
`1850`		`- pathModule.toNamespacedPath(newPath),`
`1851`		`- undefined, ctx);`
`1852`		`- handleErrorFromBinding(ctx);`
`1853`		`- return result;`
	`1848`	`+ binding.link(`
	`1849`	`+ pathModule.toNamespacedPath(existingPath),`
	`1850`	`+ pathModule.toNamespacedPath(newPath),`
	`1851`	`+ );`
`1854`	`1852`	`}`
`1855`	`1853`
`1856`	`1854`	`/**`

Collapse file

`‎src/node_file.cc‎`

Copy file name to clipboardExpand all lines: src/node_file.cc

+5-7Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1377,7 +1377,7 @@ static void Link(const FunctionCallbackInfo<Value>& args) {`
`1377`	`1377`	`Isolate* isolate = env->isolate();`
`1378`	`1378`
`1379`	`1379`	`const int argc = args.Length();`
`1380`		`- CHECK_GE(argc, 3);`
	`1380`	`+ CHECK_GE(argc, 2);`
`1381`	`1381`
`1382`	`1382`	`BufferValue src(isolate, args[0]);`
`1383`	`1383`	`CHECK_NOT_NULL(*src);`
`@@ -1395,8 +1395,8 @@ static void Link(const FunctionCallbackInfo<Value>& args) {`
`1395`	`1395`	`THROW_IF_INSUFFICIENT_PERMISSIONS(`
`1396`	`1396`	`env, permission::PermissionScope::kFileSystemWrite, dest_view);`
`1397`	`1397`
`1398`		`- FSReqBase* req_wrap_async = GetReqWrap(args, 2);`
`1399`		`- if (req_wrap_async != nullptr) { // link(src, dest, req)`
	`1398`	`+ if (argc > 2) { // link(src, dest, req)`
	`1399`	`+ FSReqBase* req_wrap_async = GetReqWrap(args, 2);`
`1400`	`1400`	`FS_ASYNC_TRACE_BEGIN2(UV_FS_LINK,`
`1401`	`1401`	`req_wrap_async,`
`1402`	`1402`	`"src",`
`@@ -1406,11 +1406,9 @@ static void Link(const FunctionCallbackInfo<Value>& args) {`
`1406`	`1406`	`AsyncDestCall(env, req_wrap_async, args, "link", *dest, dest.length(), UTF8,`
`1407`	`1407`	`AfterNoArgs, uv_fs_link, src, dest);`
`1408`	`1408`	`} else { // link(src, dest)`
`1409`		`- CHECK_EQ(argc, 4);`
`1410`		`- FSReqWrapSync req_wrap_sync;`
	`1409`	`+ FSReqWrapSync req_wrap_sync("link", src, dest);`
`1411`	`1410`	`FS_SYNC_TRACE_BEGIN(link);`
`1412`		`- SyncCall(env, args[3], &req_wrap_sync, "link",`
`1413`		`- uv_fs_link, src, dest);`
	`1411`	`+ SyncCallAndThrowOnError(env, &req_wrap_sync, uv_fs_link, src, dest);`
`1414`	`1412`	`FS_SYNC_TRACE_END(link);`
`1415`	`1413`	`}`
`1416`	`1414`	`}`

Collapse file

`‎typings/internalBinding/fs.d.ts‎`

Copy file name to clipboardExpand all lines: typings/internalBinding/fs.d.ts

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ declare namespace InternalFSBinding {`
`121`	`121`	`function link(existingPath: string, newPath: string, req: FSReqCallback): void;`
`122`	`122`	`function link(existingPath: string, newPath: string, req: undefined, ctx: FSSyncContext): void;`
`123`	`123`	`function link(existingPath: string, newPath: string, usePromises: typeof kUsePromises): Promise<void>;`
	`124`	`+ function link(existingPath: string, newPath: string): void;`
`124`	`125`
`125`	`126`	`function lstat(path: StringOrBuffer, useBigint: boolean, req: FSReqCallback<Float64Array \| BigUint64Array>): void;`
`126`	`127`	`function lstat(path: StringOrBuffer, useBigint: true, req: FSReqCallback<BigUint64Array>): void;`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.