Skip to content

perf_hooks: fix function wrapped by performance.timerify to work correctly#43330

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

Merged
aduh95 merged 2 commits into from
Jun 12, 2022
+22 −15
Merged

perf_hooks: fix function wrapped by performance.timerify to work correctly #43330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3c7c4f
perf_hooks: fix function wrapped by timerify to work correctly
cola119 Jun 6, 2022
2e521c0
fixup! perf_hooks: fix function wrapped by timerify to work correctly
cola119 Jun 7, 2022
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
11 changes: 3 additions & 8 deletions lib/internal/perf/timerify.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,10 +20,6 @@ const {
isHistogram
} = require('internal/histogram');

const {
isConstructor,
} = internalBinding('util');

const {
codes: {
ERR_INVALID_ARG_TYPE,
Expand DownExpand Up@@ -68,14 +64,13 @@ function timerify(fn, options = {}) {
histogram);
}

const constructor = isConstructor(fn);

function timerified(...args) {
const isConstructorCall = new.target !== undefined;
const start = now();
const result = constructor ?
const result = isConstructorCall ?
ReflectConstruct(fn, args, fn) :
ReflectApply(fn, this, args);
if (!constructor && typeof result?.finally === 'function') {
if (!isConstructorCall && typeof result?.finally === 'function') {
return result.finally(
FunctionPrototypeBind(
processComplete,
Expand Down
7 changes: 0 additions & 7 deletions src/node_util.cc
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -289,11 +289,6 @@ static void GuessHandleType(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(OneByteString(env->isolate(), type));
}

static void IsConstructor(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsFunction());
args.GetReturnValue().Set(args[0].As<v8::Function>()->IsConstructor());
}

static void ToUSVString(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
CHECK_GE(args.Length(), 2);
Expand DownExpand Up@@ -344,7 +339,6 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
registry->Register(WeakReference::IncRef);
registry->Register(WeakReference::DecRef);
registry->Register(GuessHandleType);
registry->Register(IsConstructor);
registry->Register(ToUSVString);
}

Expand DownExpand Up@@ -384,7 +378,6 @@ void Initialize(Local<Object> target,
env->SetMethodNoSideEffect(target, "getConstructorName", GetConstructorName);
env->SetMethodNoSideEffect(target, "getExternalValue", GetExternalValue);
env->SetMethod(target, "sleep", Sleep);
env->SetMethodNoSideEffect(target, "isConstructor", IsConstructor);

env->SetMethod(target, "arrayBufferViewHasBuffer", ArrayBufferViewHasBuffer);
Local<Object> constants = Object::New(env->isolate());
Expand Down
19 changes: 19 additions & 0 deletions test/parallel/test-performance-function.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -123,3 +123,22 @@ const {
});
});
})().then(common.mustCall());

// Regression tests for https://github.com/nodejs/node/issues/40623
{
assert.strictEqual(performance.timerify(function func() {
return 1;
})(), 1);
assert.strictEqual(performance.timerify(function() {
return 1;
})(), 1);
assert.strictEqual(performance.timerify(() => {
return 1;
})(), 1);
class C {}
const wrap = performance.timerify(C);
assert.ok(new wrap() instanceof C);
assert.throws(() => wrap(), {
name: 'TypeError',
});
}