fs: improve error performance for rmdirSync

PR-URL: #49846 Refs: nodejs/performance#106 Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Vinícius Lourenço Claro Cardoso <[email protected]>

Author: CanadaHonk

benchmark/fs/bench-rmdirSync.js

@@ -0,0 +1,42 @@
+'use strict';
+
+constcommon=require('../common');
+constfs=require('fs');
+consttmpdir=require('../../test/common/tmpdir');
+tmpdir.refresh();
+
+constbench=common.createBenchmark(main,{
+type: ['existing','non-existing'],
+n: [1e4],
+});
+
+functionmain({ n, type }){
+switch(type){
+case'existing': {
+for(leti=0;i<n;i++){
+fs.mkdirSync(tmpdir.resolve(`rmdirsync-bench-dir-${i}`));
+}
+
+bench.start();
+for(leti=0;i<n;i++){
+fs.rmdirSync(tmpdir.resolve(`rmdirsync-bench-dir-${i}`));
+}
+bench.end(n);
+break;
+}
+case'non-existing': {
+bench.start();
+for(leti=0;i<n;i++){
+try{
+fs.rmdirSync(tmpdir.resolve(`.non-existent-folder-${i}`));
+}catch{
+// do nothing
+}
+}
+bench.end(n);
+break;
+}
+default:
+newError('Invalid type');
+}
+}

lib/fs.js

@@ -1218,9 +1218,7 @@ function rmdirSync(path, options){
 validateRmdirOptions(options);
 }
 
-constctx={ path };
-binding.rmdir(pathModule.toNamespacedPath(path),undefined,ctx);
-returnhandleErrorFromBinding(ctx);
+binding.rmdir(pathModule.toNamespacedPath(path));
 }
 
 /**

src/node_file.cc

@@ -1562,25 +1562,23 @@ static void RMDir(const FunctionCallbackInfo<Value>& args){
  Environment* env = Environment::GetCurrent(args);
 
 constint argc = args.Length();
-CHECK_GE(argc, 2);
+CHECK_GE(argc, 1);
 
  BufferValue path(env->isolate(), args[0]);
 CHECK_NOT_NULL(*path);
 THROW_IF_INSUFFICIENT_PERMISSIONS(
  env, permission::PermissionScope::kFileSystemWrite, path.ToStringView());
 
-FSReqBase* req_wrap_async = GetReqWrap(args, 1); // rmdir(path, req)
-if (req_wrap_async != nullptr){
+if (argc > 1){
+ FSReqBase* req_wrap_async = GetReqWrap(args, 1); // rmdir(path, req)
 FS_ASYNC_TRACE_BEGIN1(
  UV_FS_RMDIR, req_wrap_async, "path", TRACE_STR_COPY(*path))
 AsyncCall(env, req_wrap_async, args, "rmdir", UTF8, AfterNoArgs,
  uv_fs_rmdir, *path);
- } else{// rmdir(path, undefined, ctx)
-CHECK_EQ(argc, 3);
- FSReqWrapSync req_wrap_sync;
+ } else{// rmdir(path)
+ FSReqWrapSync req_wrap_sync("rmdir", *path);
 FS_SYNC_TRACE_BEGIN(rmdir);
-SyncCall(env, args[2], &req_wrap_sync, "rmdir",
- uv_fs_rmdir, *path);
+SyncCallAndThrowOnError(env, &req_wrap_sync, uv_fs_rmdir, *path);
 FS_SYNC_TRACE_END(rmdir);
  }
 }

typings/internalBinding/fs.d.ts

@@ -192,7 +192,7 @@ declare namespace InternalFSBinding{
 functionrename(oldPath: string,newPath: string): void;
 
 functionrmdir(path: string,req: FSReqCallback): void;
-functionrmdir(path: string,req: undefined,ctx: FSSyncContext): void;
+functionrmdir(path: string): void;
 functionrmdir(path: string,usePromises: typeofkUsePromises): Promise<void>;
 
 functionstat(path: StringOrBuffer,useBigint: boolean,req: FSReqCallback<Float64Array|BigUint64Array>): void;