GeezerVison

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

GeezerVison is showing github.com — fs: improve error performance for `rmdirSync` · nodejs/node@483200f

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

benchmark/fs
- bench-rmdirSync.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-rmdirSync.js‎`

Copy file name to clipboard

+42Lines changed: 42 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,42 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+const common = require('../common');`
	`4`	`+const fs = require('fs');`
	`5`	`+const tmpdir = require('../../test/common/tmpdir');`
	`6`	`+tmpdir.refresh();`
	`7`	`+`
	`8`	`+const bench = common.createBenchmark(main, {`
	`9`	`+ type: ['existing', 'non-existing'],`
	`10`	`+ n: [1e4],`
	`11`	`+});`
	`12`	`+`
	`13`	`+function main({ n, type }) {`
	`14`	`+ switch (type) {`
	`15`	`+ case 'existing': {`
	`16`	`+ for (let i = 0; i < n; i++) {`
	`17`	+ fs.mkdirSync(tmpdir.resolve(`rmdirsync-bench-dir-${i}`));
	`18`	`+ }`
	`19`	`+`
	`20`	`+ bench.start();`
	`21`	`+ for (let i = 0; i < n; i++) {`
	`22`	+ fs.rmdirSync(tmpdir.resolve(`rmdirsync-bench-dir-${i}`));
	`23`	`+ }`
	`24`	`+ bench.end(n);`
	`25`	`+ break;`
	`26`	`+ }`
	`27`	`+ case 'non-existing': {`
	`28`	`+ bench.start();`
	`29`	`+ for (let i = 0; i < n; i++) {`
	`30`	`+ try {`
	`31`	+ fs.rmdirSync(tmpdir.resolve(`.non-existent-folder-${i}`));
	`32`	`+ } catch {`
	`33`	`+ // do nothing`
	`34`	`+ }`
	`35`	`+ }`
	`36`	`+ bench.end(n);`
	`37`	`+ break;`
	`38`	`+ }`
	`39`	`+ default:`
	`40`	`+ new Error('Invalid type');`
	`41`	`+ }`
	`42`	`+}`

Collapse file

`‎lib/fs.js‎`

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

+1-3Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1218,9 +1218,7 @@ function rmdirSync(path, options) {`
`1218`	`1218`	`validateRmdirOptions(options);`
`1219`	`1219`	`}`
`1220`	`1220`
`1221`		`- const ctx = { path };`
`1222`		`- binding.rmdir(pathModule.toNamespacedPath(path), undefined, ctx);`
`1223`		`- return handleErrorFromBinding(ctx);`
	`1221`	`+ binding.rmdir(pathModule.toNamespacedPath(path));`
`1224`	`1222`	`}`
`1225`	`1223`
`1226`	`1224`	`/**`

Collapse file

`‎src/node_file.cc‎`

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

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

Original file line number	Diff line number	Diff line change
`@@ -1562,25 +1562,23 @@ static void RMDir(const FunctionCallbackInfo<Value>& args) {`
`1562`	`1562`	`Environment* env = Environment::GetCurrent(args);`
`1563`	`1563`
`1564`	`1564`	`const int argc = args.Length();`
`1565`		`- CHECK_GE(argc, 2);`
	`1565`	`+ CHECK_GE(argc, 1);`
`1566`	`1566`
`1567`	`1567`	`BufferValue path(env->isolate(), args[0]);`
`1568`	`1568`	`CHECK_NOT_NULL(*path);`
`1569`	`1569`	`THROW_IF_INSUFFICIENT_PERMISSIONS(`
`1570`	`1570`	`env, permission::PermissionScope::kFileSystemWrite, path.ToStringView());`
`1571`	`1571`
`1572`		`- FSReqBase* req_wrap_async = GetReqWrap(args, 1); // rmdir(path, req)`
`1573`		`- if (req_wrap_async != nullptr) {`
	`1572`	`+ if (argc > 1) {`
	`1573`	`+ FSReqBase* req_wrap_async = GetReqWrap(args, 1); // rmdir(path, req)`
`1574`	`1574`	`FS_ASYNC_TRACE_BEGIN1(`
`1575`	`1575`	`UV_FS_RMDIR, req_wrap_async, "path", TRACE_STR_COPY(*path))`
`1576`	`1576`	`AsyncCall(env, req_wrap_async, args, "rmdir", UTF8, AfterNoArgs,`
`1577`	`1577`	`uv_fs_rmdir, *path);`
`1578`		`- } else { // rmdir(path, undefined, ctx)`
`1579`		`- CHECK_EQ(argc, 3);`
`1580`		`- FSReqWrapSync req_wrap_sync;`
	`1578`	`+ } else { // rmdir(path)`
	`1579`	`+ FSReqWrapSync req_wrap_sync("rmdir", *path);`
`1581`	`1580`	`FS_SYNC_TRACE_BEGIN(rmdir);`
`1582`		`- SyncCall(env, args[2], &req_wrap_sync, "rmdir",`
`1583`		`- uv_fs_rmdir, *path);`
	`1581`	`+ SyncCallAndThrowOnError(env, &req_wrap_sync, uv_fs_rmdir, *path);`
`1584`	`1582`	`FS_SYNC_TRACE_END(rmdir);`
`1585`	`1583`	`}`
`1586`	`1584`	`}`

Collapse file

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

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ declare namespace InternalFSBinding {`
`192`	`192`	`function rename(oldPath: string, newPath: string): void;`
`193`	`193`
`194`	`194`	`function rmdir(path: string, req: FSReqCallback): void;`
`195`		`- function rmdir(path: string, req: undefined, ctx: FSSyncContext): void;`
	`195`	`+ function rmdir(path: string): void;`
`196`	`196`	`function rmdir(path: string, usePromises: typeof kUsePromises): Promise<void>;`
`197`	`197`
`198`	`198`	`function stat(path: StringOrBuffer, useBigint: boolean, req: FSReqCallback<Float64Array \| 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.