src: add typedef for CleanupHookCallback callback

This commit adds a typedef for the callback parameter used in
CleanupHookCallback's constructor, AddCleanupHook, and
RemoveCleanupHook.

PR-URL: https://github.com/nodejs/node/pull/36442
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
This commit is contained in:
Daniel Bevenius committed 2020-12-11 07:31:41 +01:00
1 parent 7e5bf48998
commit f49cef549c
2 files changed
+9 -6

No files matched your search

+2 -2
View File
@@ -1024,7 +1024,7 @@ inline void Environment::SetInstanceMethod(v8::Local<v8::FunctionTemplate> that,
t->SetClassName(name_string);
}
void Environment::AddCleanupHook(void (*fn)(void*), void* arg) {
void Environment::AddCleanupHook(CleanupCallback fn, void* arg) {
auto insertion_info = cleanup_hooks_.emplace(CleanupHookCallback {
fn, arg, cleanup_hook_counter_++
});
@@ -1032,7 +1032,7 @@ void Environment::AddCleanupHook(void (*fn)(void*), void* arg) {
CHECK_EQ(insertion_info.second, true);
}
void Environment::RemoveCleanupHook(void (*fn)(void*), void* arg) {
void Environment::RemoveCleanupHook(CleanupCallback fn, void* arg) {
CleanupHookCallback search { fn, arg, 0 };
cleanup_hooks_.erase(search);
}
+7 -4
View File
@@ -891,7 +891,9 @@ class ShouldNotAbortOnUncaughtScope {
class CleanupHookCallback {
public:
CleanupHookCallback(void (*fn)(void*),
typedef void (*Callback)(void*);
CleanupHookCallback(Callback fn,
void* arg,
uint64_t insertion_order_counter)
: fn_(fn), arg_(arg), insertion_order_counter_(insertion_order_counter) {}
@@ -911,7 +913,7 @@ class CleanupHookCallback {
private:
friend class Environment;
void (*fn_)(void*);
Callback fn_;
void* arg_;
// We keep track of the insertion order for these objects, so that we can
@@ -1316,8 +1318,9 @@ class Environment : public MemoryRetainer {
void ScheduleTimer(int64_t duration);
void ToggleTimerRef(bool ref);
inline void AddCleanupHook(void (*fn)(void*), void* arg);
inline void RemoveCleanupHook(void (*fn)(void*), void* arg);
using CleanupCallback = CleanupHookCallback::Callback;
inline void AddCleanupHook(CleanupCallback cb, void* arg);
inline void RemoveCleanupHook(CleanupCallback cb, void* arg);
void RunCleanup();
static size_t NearHeapLimitCallback(void* data,