Skip to content

fs: Optimizations 3: The Revenge #12105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mscdex wants to merge 15 commits into from
Closed

fs: Optimizations 3: The Revenge #12105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e0b983f
benchmark: add filename arg for fs.WriteStream
mscdex Mar 22, 2017
0f16b5a
benchmark: fs benchmark cleanup/refactor
mscdex Mar 22, 2017
cc7a93e
test: include stderr in npm test assertions
mscdex Mar 22, 2017
ac679c0
fs: optimize fs.readFile()
mscdex Mar 23, 2017
30bb04e
src: cleanup/reorganize fs code
mscdex Mar 23, 2017
b1e5723
fs: remove confusing comment
mscdex Mar 23, 2017
457e30b
fs: optimize read/write streams
mscdex Mar 23, 2017
d5c7653
fs: optimize readFileSync() and openSync()
mscdex Mar 25, 2017
1285414
fs: optimize fd checking
mscdex Mar 25, 2017
5df97a3
fs: optimize appendFile*()
mscdex Mar 25, 2017
87592ab
fs: add optimizations for more methods
mscdex Mar 25, 2017
22345d4
fs: use faster shallow object cloner
mscdex Mar 26, 2017
85f2c1f
fs: more misc optimizations
mscdex Mar 28, 2017
b46177c
test: fix fs tests affected by optimizations
mscdex Mar 28, 2017
53a7974
benchmark: add a few more fs benchmarks
mscdex Mar 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fs: use faster shallow object cloner
  • Loading branch information
@mscdex
mscdex committed Apr 30, 2017
commit 22345d4727af0e93202da75b4a6d809a7c7d57fe
9 changes: 1 addition & 8 deletions lib/fs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const constants = process.binding('constants').fs;
const { S_IFMT, S_IFREG, S_IFLNK } = constants;
const util = require('util');
const pathModule = require('path');
const { isUint8Array } = process.binding('util');
const { isUint8Array, shallowClone: copyObject } = process.binding('util');

const binding = process.binding('fs');
const fs = exports;
Expand Down Expand Up @@ -93,13 +93,6 @@ function getOptions(options, defaultOptions) {
return options;
}

function copyObject(source) {
const target = {};
for (const key in source)
target[key] = source[key];
return target;
}

function rethrow() {
// TODO(thefourtheye) Throw error instead of warning in major version > 7
process.emitWarning(
Expand Down
11 changes: 11 additions & 0 deletions src/node_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,15 @@ void WatchdogHasPendingSigint(const FunctionCallbackInfo<Value>& args) {
}


void ShallowClone(const FunctionCallbackInfo<Value>& args) {
if (!args[0]->IsObject()) {
Environment* env = Environment::GetCurrent(args);
return env->ThrowTypeError("obj must be an object");
}
args.GetReturnValue().Set(args[0].As<Object>()->Clone());
Copy link
Copy Markdown
Member

@TimothyGu TimothyGu Apr 15, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure how much we should care about it, but Object::Clone crashes with some special objects, like Map iterators (e.g. new Map().entries()) and possibly proxies.

Copy link
Copy Markdown
Contributor Author

@mscdex mscdex May 2, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FWIW: https://bugs.chromium.org/p/v8/issues/detail?id=6332

}


void Initialize(Local<Object> target,
Local<Value> unused,
Local<Context> context) {
Expand Down Expand Up @@ -192,6 +201,8 @@ void Initialize(Local<Object> target,
env->SetMethod(target, "startSigintWatchdog", StartSigintWatchdog);
env->SetMethod(target, "stopSigintWatchdog", StopSigintWatchdog);
env->SetMethod(target, "watchdogHasPendingSigint", WatchdogHasPendingSigint);

env->SetMethod(target, "shallowClone", ShallowClone);
}

} // namespace util
Expand Down