fs: improve error performance of writevSync

IlyasShabi · targos · commit eb52f73e3e17 · 2023-11-11T20:01:58.000+01:00
PR-URL: #50038 Refs: nodejs/performance#106 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
diff --git a/benchmark/fs/bench-writevSync.js b/benchmark/fs/bench-writevSync.js
@@ -0,0 +1,55 @@
+'use strict';
+
+const common = require('../common');
+const fs = require('fs');
+const assert = require('assert');
+const tmpdir = require('../../test/common/tmpdir');
+tmpdir.refresh();
+
+const path = tmpdir.resolve(`new-file-${process.pid}`);
+fs.writeFileSync(path, 'Some content.');
+
+const bench = common.createBenchmark(main, {
+  type: ['valid', 'invalid'],
+  n: [1e5],
+});
+
+const buffer = Buffer.from('Benchmark data.');
+
+function main({ n, type }) {
+  let fd;
+  let result;
+
+  switch (type) {
+    case 'valid':
+      fd = fs.openSync(path, 'r+');
+
+      bench.start();
+      for (let i = 0; i < n; i++) {
+        result = fs.writevSync(fd, [buffer]);
+      }
+
+      bench.end(n);
+      assert(result);
+      fs.closeSync(fd);
+      break;
+    case 'invalid': {
+      fd = 1 << 30;
+      let hasError = false;
+      bench.start();
+      for (let i = 0; i < n; i++) {
+        try {
+          result = fs.writevSync(fd, [buffer]);
+        } catch {
+          hasError = true;
+        }
+      }
+
+      bench.end(n);
+      assert(hasError);
+      break;
+    }
+    default:
+      throw new Error('Invalid type');
+  }
+}
diff --git a/lib/fs.js b/lib/fs.js
@@ -996,15 +996,10 @@ function writevSync(fd, buffers, position) {
     return 0;
   }
 
-  const ctx = {};
-
   if (typeof position !== 'number')
     position = null;
 
-  const result = binding.writeBuffers(fd, buffers, position, undefined, ctx);
-
-  handleErrorFromBinding(ctx);
-  return result;
+  return binding.writeBuffers(fd, buffers, position);
 }
 
 /**
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -2238,18 +2238,29 @@ static void WriteBuffers(const FunctionCallbackInfo<Value>& args) {
     iovs[i] = uv_buf_init(Buffer::Data(chunk), Buffer::Length(chunk));
   }
 
-  FSReqBase* req_wrap_async = GetReqWrap(args, 3);
-  if (req_wrap_async != nullptr) {  // writeBuffers(fd, chunks, pos, req)
+  if (argc > 3) {  // writeBuffers(fd, chunks, pos, req)
+    FSReqBase* req_wrap_async = GetReqWrap(args, 3);
     FS_ASYNC_TRACE_BEGIN0(UV_FS_WRITE, req_wrap_async)
-    AsyncCall(env, req_wrap_async, args, "write", UTF8, AfterInteger,
-              uv_fs_write, fd, *iovs, iovs.length(), pos);
-  } else {  // writeBuffers(fd, chunks, pos, undefined, ctx)
-    CHECK_EQ(argc, 5);
-    FSReqWrapSync req_wrap_sync;
+    AsyncCall(env,
+              req_wrap_async,
+              args,
+              "write",
+              UTF8,
+              AfterInteger,
+              uv_fs_write,
+              fd,
+              *iovs,
+              iovs.length(),
+              pos);
+  } else {  // writeBuffers(fd, chunks, pos)
+    FSReqWrapSync req_wrap_sync("write");
     FS_SYNC_TRACE_BEGIN(write);
-    int bytesWritten = SyncCall(env, args[4], &req_wrap_sync, "write",
-                                uv_fs_write, fd, *iovs, iovs.length(), pos);
+    int bytesWritten = SyncCallAndThrowOnError(
+        env, &req_wrap_sync, uv_fs_write, fd, *iovs, iovs.length(), pos);
     FS_SYNC_TRACE_END(write, "bytesWritten", bytesWritten);
+    if (is_uv_error(bytesWritten)) {
+      return;
+    }
     args.GetReturnValue().Set(bytesWritten);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -996,15 +996,10 @@ function writevSync(fd, buffers, position) {`
`996`	`996`	`return 0;`
`997`	`997`	`}`
`998`	`998`
`999`		`- const ctx = {};`
`1000`		`-`
`1001`	`999`	`if (typeof position !== 'number')`
`1002`	`1000`	`position = null;`
`1003`	`1001`
`1004`		`- const result = binding.writeBuffers(fd, buffers, position, undefined, ctx);`
`1005`		`-`
`1006`		`- handleErrorFromBinding(ctx);`
`1007`		`- return result;`
	`1002`	`+ return binding.writeBuffers(fd, buffers, position);`
`1008`	`1003`	`}`
`1009`	`1004`
`1010`	`1005`	`/**`