Skip to content
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

src: allow non-copyable callbacks be finalizer parameters #915

Closed
wants to merge 2 commits into from
Closed

src: allow non-copyable callbacks be finalizer parameters #915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c4f61c
src: allow non-copyable callbacks be finalizer parameters
legendecas Feb 26, 2021
82e04e0
Update test/movable_callbacks.cc
mhdawson Mar 10, 2021
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
24 changes: 16 additions & 8 deletions napi-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,7 +1345,8 @@ inline bool Object::InstanceOf(const Function& constructor) const {
template <typename Finalizer, typename T>
inline void Object::AddFinalizer(Finalizer finalizeCallback, T* data) {
details::FinalizeData<T, Finalizer>* finalizeData =
new details::FinalizeData<T, Finalizer>({ finalizeCallback, nullptr });
new details::FinalizeData<T, Finalizer>(
{std::move(finalizeCallback), nullptr});
napi_status status =
details::AttachData(_env,
*this,
Expand All @@ -1363,7 +1364,8 @@ inline void Object::AddFinalizer(Finalizer finalizeCallback,
T* data,
Hint* finalizeHint) {
details::FinalizeData<T, Finalizer, Hint>* finalizeData =
new details::FinalizeData<T, Finalizer, Hint>({ finalizeCallback, finalizeHint });
new details::FinalizeData<T, Finalizer, Hint>(
{std::move(finalizeCallback), finalizeHint});
napi_status status =
details::AttachData(_env,
*this,
Expand Down Expand Up @@ -1395,7 +1397,8 @@ inline External<T> External<T>::New(napi_env env,
Finalizer finalizeCallback) {
napi_value value;
details::FinalizeData<T, Finalizer>* finalizeData =
new details::FinalizeData<T, Finalizer>({ finalizeCallback, nullptr });
new details::FinalizeData<T, Finalizer>(
{std::move(finalizeCallback), nullptr});
napi_status status = napi_create_external(
env,
data,
Expand All @@ -1417,7 +1420,8 @@ inline External<T> External<T>::New(napi_env env,
Hint* finalizeHint) {
napi_value value;
details::FinalizeData<T, Finalizer, Hint>* finalizeData =
new details::FinalizeData<T, Finalizer, Hint>({ finalizeCallback, finalizeHint });
new details::FinalizeData<T, Finalizer, Hint>(
{std::move(finalizeCallback), finalizeHint});
napi_status status = napi_create_external(
env,
data,
Expand Down Expand Up @@ -1509,7 +1513,8 @@ inline ArrayBuffer ArrayBuffer::New(napi_env env,
Finalizer finalizeCallback) {
napi_value value;
details::FinalizeData<void, Finalizer>* finalizeData =
new details::FinalizeData<void, Finalizer>({ finalizeCallback, nullptr });
new details::FinalizeData<void, Finalizer>(
{std::move(finalizeCallback), nullptr});
napi_status status = napi_create_external_arraybuffer(
env,
externalData,
Expand All @@ -1533,7 +1538,8 @@ inline ArrayBuffer ArrayBuffer::New(napi_env env,
Hint* finalizeHint) {
napi_value value;
details::FinalizeData<void, Finalizer, Hint>* finalizeData =
new details::FinalizeData<void, Finalizer, Hint>({ finalizeCallback, finalizeHint });
new details::FinalizeData<void, Finalizer, Hint>(
{std::move(finalizeCallback), finalizeHint});
napi_status status = napi_create_external_arraybuffer(
env,
externalData,
Expand Down Expand Up @@ -2153,7 +2159,8 @@ inline Buffer<T> Buffer<T>::New(napi_env env,
Finalizer finalizeCallback) {
napi_value value;
details::FinalizeData<T, Finalizer>* finalizeData =
new details::FinalizeData<T, Finalizer>({ finalizeCallback, nullptr });
new details::FinalizeData<T, Finalizer>(
{std::move(finalizeCallback), nullptr});
napi_status status = napi_create_external_buffer(
env,
length * sizeof (T),
Expand All @@ -2177,7 +2184,8 @@ inline Buffer<T> Buffer<T>::New(napi_env env,
Hint* finalizeHint) {
napi_value value;
details::FinalizeData<T, Finalizer, Hint>* finalizeData =
new details::FinalizeData<T, Finalizer, Hint>({ finalizeCallback, finalizeHint });
new details::FinalizeData<T, Finalizer, Hint>(
{std::move(finalizeCallback), finalizeHint});
napi_status status = napi_create_external_buffer(
env,
length * sizeof (T),
Expand Down
2 changes: 2 additions & 0 deletions test/binding.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Object InitError(Env env);
Object InitExternal(Env env);
Object InitFunction(Env env);
Object InitHandleScope(Env env);
Object InitMovableCallbacks(Env env);
Object InitMemoryManagement(Env env);
Object InitName(Env env);
Object InitObject(Env env);
Expand Down Expand Up @@ -101,6 +102,7 @@ Object Init(Env env, Object exports) {
exports.Set("function", InitFunction(env));
exports.Set("name", InitName(env));
exports.Set("handlescope", InitHandleScope(env));
exports.Set("movable_callbacks", InitMovableCallbacks(env));
exports.Set("memory_management", InitMemoryManagement(env));
exports.Set("object", InitObject(env));
#ifndef NODE_ADDON_API_DISABLE_DEPRECATED
Expand Down
1 change: 1 addition & 0 deletions test/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
'external.cc',
'function.cc',
'handlescope.cc',
'movable_callbacks.cc',
'memory_management.cc',
'name.cc',
'object/delete_property.cc',
Expand Down
21 changes: 21 additions & 0 deletions test/movable_callbacks.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#include "napi.h"

using namespace Napi;

Value createExternal(const CallbackInfo& info) {
FunctionReference ref = Reference<Function>::New(info[0].As<Function>(), 1);
auto ret = External<char>::New(
info.Env(), nullptr, [ref = std::move(ref)](Napi::Env env, char* data) {
Copy link
Member

Choose a reason for hiding this comment

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

This fails to compile for me with:

../movable_callbacks.cc:8:61: error: unused parameter ‘env’ [-Werror=unused-parameter]
       info.Env(), nullptr, [ref = std::move(ref)](Napi::Env env, char* data) {
                                                   ~~~~~~~~~~^~~
../movable_callbacks.cc:8:72: error: unused parameter ‘data’ [-Werror=unused-parameter]
       info.Env(), nullptr, [ref = std::move(ref)](Napi::Env env, char* data) {
                                                                  ~~~~~~^~~~

Copy link
Member

@mhdawson mhdawson Mar 10, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Pushed a commit to fix

mhdawson marked this conversation as resolved.
Show resolved Hide resolved
ref.Call({});
});

return ret;
}

Object InitMovableCallbacks(Env env) {
Object exports = Object::New(env);

exports["createExternal"] = Function::New(env, createExternal);

return exports;
}
27 changes: 27 additions & 0 deletions test/movable_callbacks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
'use strict';
const buildType = process.config.target_defaults.default_configuration;
const common = require('./common');
const testUtil = require('./testUtil');

Promise.all([
test(require(`./build/${buildType}/binding.node`).movable_callbacks),
test(require(`./build/${buildType}/binding_noexcept.node`).movable_callbacks),
]).catch(e => {
console.error(e);
process.exitCode = 1;
});

async function test(binding) {
await testUtil.runGCTests([
'External',
() => {
const fn = common.mustCall(() => {
// noop
}, 1);
const external = binding.createExternal(fn);
},
() => {
// noop, wait for gc
}
]);
}