fs: improve error performance for fdatasyncSync

Author: pluris

lib/fs.js

@@ -1282,10 +1282,7 @@ function fdatasync(fd, callback) {
  * @returns {void}
  */
 function fdatasyncSync(fd) {
-  fd = getValidatedFd(fd);
-  const ctx = {};
-  binding.fdatasync(fd, undefined, ctx);
-  handleErrorFromBinding(ctx);
+  syncFs.fdatasync(fd);
 }
 
 /**

lib/internal/fs/sync.js

@@ -93,6 +93,10 @@ function unlink(path) {
   return binding.unlinkSync(path);
 }
 
+function fdatasync(fd) {
+  return binding.fdatasyncSync(fd);
+}
+
 module.exports = {
   readFileUtf8,
   exists,
@@ -103,4 +107,5 @@ module.exports = {
   open,
   close,
   unlink,
+  fdatasync,
 };

src/node_file.cc

@@ -116,6 +116,24 @@ inline int64_t GetOffset(Local<Value> value) {
   return IsSafeJsInt(value) ? value.As<Integer>()->Value() : -1;
 }
 
+inline int GetValidatedFd(Environment* env, Local<Value> value) {
+  if (!value->IsInt32()) {
+    env->isolate()->ThrowException(ERR_INVALID_ARG_TYPE(
+        env->isolate(), "Invalid argument. The fd must be int32."));
+    return 1 << 30;
+  }
+
+  const int fd = value.As<Int32>()->Value();
+
+  if (fd < 0 || fd > INT32_MAX) {
+    env->isolate()->ThrowException(ERR_OUT_OF_RANGE(
+        env->isolate(), "It must be >= 0 && <= INT32_MAX. Received %d", fd));
+    return 1 << 30;
+  }
+
+  return fd;
+}
+
 static const char* get_fs_func_name_by_type(uv_fs_type req_type) {
   switch (req_type) {
 #define FS_TYPE_TO_NAME(type, name)                                            \
@@ -1618,6 +1636,24 @@ static void Fdatasync(const FunctionCallbackInfo<Value>& args) {
   }
 }
 
+static void FdatasyncSync(const FunctionCallbackInfo<Value>& args) {
+  Environment* env = Environment::GetCurrent(args);
+
+  CHECK_EQ(args.Length(), 1);
+
+  const int fd = GetValidatedFd(env, args[0]);
+  if (fd == (1 << 30)) return;
+
+  uv_fs_t req;
+  auto make = OnScopeLeave([&req]() { uv_fs_req_cleanup(&req); });
+  FS_SYNC_TRACE_BEGIN(fdatasync);
+  int err = uv_fs_fdatasync(nullptr, &req, fd, nullptr);
+  FS_SYNC_TRACE_END(fdatasync);
+  if (err < 0) {
+    return env->ThrowUVException(err, "fdatasync");
+  }
+}
+
 static void Fsync(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
@@ -3393,6 +3429,7 @@ static void CreatePerIsolateProperties(IsolateData* isolate_data,
   SetMethod(isolate, target, "readFileUtf8", ReadFileUtf8);
   SetMethod(isolate, target, "readBuffers", ReadBuffers);
   SetMethod(isolate, target, "fdatasync", Fdatasync);
+  SetMethod(isolate, target, "fdatasyncSync", FdatasyncSync);
   SetMethod(isolate, target, "fsync", Fsync);
   SetMethod(isolate, target, "rename", Rename);
   SetMethod(isolate, target, "ftruncate", FTruncate);
@@ -3519,6 +3556,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
   registry->Register(ReadFileUtf8);
   registry->Register(ReadBuffers);
   registry->Register(Fdatasync);
+  registry->Register(FdatasyncSync);
   registry->Register(Fsync);
   registry->Register(Rename);
   registry->Register(FTruncate);

typings/internalBinding/fs.d.ts

@@ -84,6 +84,7 @@ declare namespace InternalFSBinding {
   function fdatasync(fd: number, req: FSReqCallback): void;
   function fdatasync(fd: number, req: undefined, ctx: FSSyncContext): void;
   function fdatasync(fd: number, usePromises: typeof kUsePromises): Promise<void>;
+  function fdatasyncSync(fd: number): void;
 
   function fstat(fd: number, useBigint: boolean, req: FSReqCallback<Float64Array | BigUint64Array>): void;
   function fstat(fd: number, useBigint: true, req: FSReqCallback<BigUint64Array>): void;