1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fs: use SyncCall in OpenFileHandle

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/18871
Refs: https://github.com/nodejs/node/issues/18106
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
This commit is contained in:
Joyee Cheung 2018-02-14 11:29:05 -08:00
parent fea5dda1d1
commit e8ec898a7d
No known key found for this signature in database
GPG Key ID: F586868AAD831D0C
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/node_file.cc
View File

@ -1197,26 +1197,33 @@ static void Open(const FunctionCallbackInfo<Value>& args) {
static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) { static void OpenFileHandle(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);
Local<Context> context = env->context();
CHECK_GE(args.Length(), 3); const int argc = args.Length();
CHECK(args[1]->IsInt32()); CHECK_GE(argc, 3);
CHECK(args[2]->IsInt32());
BufferValue path(env->isolate(), args[0]); BufferValue path(env->isolate(), args[0]);
CHECK_NE(*path, nullptr); CHECK_NE(*path, nullptr);
int flags = args[1]->Int32Value(context).ToChecked(); CHECK(args[1]->IsInt32());
int mode = args[2]->Int32Value(context).ToChecked(); const int flags = args[1].As<Int32>()->Value();
CHECK(args[2]->IsInt32());
const int mode = args[2].As<Int32>()->Value();
FSReqBase* req_wrap = GetReqWrap(env, args[3]); FSReqBase* req_wrap = GetReqWrap(env, args[3]);
if (req_wrap != nullptr) { if (req_wrap != nullptr) { // openFileHandle(path, flags, mode, req)
AsyncCall(env, req_wrap, args, "open", UTF8, AfterOpenFileHandle, AsyncCall(env, req_wrap, args, "open", UTF8, AfterOpenFileHandle,
uv_fs_open, *path, flags, mode); uv_fs_open, *path, flags, mode);
} else { } else { // openFileHandle(path, flags, mode, undefined, ctx)
SYNC_CALL(open, *path, *path, flags, mode) CHECK_EQ(argc, 5);
fs_req_wrap req_wrap;
int result = SyncCall(env, args[4], &req_wrap, "open",
uv_fs_open, *path, flags, mode);
if (result < 0) {
return; // syscall failed, no need to continue, error info is in ctx
}
HandleScope scope(env->isolate()); HandleScope scope(env->isolate());
FileHandle* fd = new FileHandle(env, SYNC_RESULT); FileHandle* fd = new FileHandle(env, result);
args.GetReturnValue().Set(fd->object()); args.GetReturnValue().Set(fd->object());
} }
} }

5
test/parallel/test-fs-filehandle.js
View File

@ -2,6 +2,7 @@
'use strict'; 'use strict';
const common = require('../common'); const common = require('../common');
const assert = require('assert');
const path = require('path'); const path = require('path');
const fs = process.binding('fs'); const fs = process.binding('fs');
const { stringToFlags } = require('internal/fs'); const { stringToFlags } = require('internal/fs');
@ -11,8 +12,10 @@ const { stringToFlags } = require('internal/fs');
let fdnum; let fdnum;
{ {
const ctx = {};
fdnum = fs.openFileHandle(path.toNamespacedPath(__filename), fdnum = fs.openFileHandle(path.toNamespacedPath(__filename),
stringToFlags('r'), 0o666).fd; stringToFlags('r'), 0o666, undefined, ctx).fd;
assert.strictEqual(ctx.errno, undefined);
} }
common.expectWarning( common.expectWarning(