Skip to content

Commit e597882

Browse files
danbevtargos
authored andcommitted
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: #36442 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 1330995 commit e597882

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/env-inl.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1028,15 +1028,15 @@ inline void Environment::SetInstanceMethod(v8::Local<v8::FunctionTemplate> that,
10281028
t->SetClassName(name_string);
10291029
}
10301030

1031-
void Environment::AddCleanupHook(void (*fn)(void*), void* arg) {
1031+
void Environment::AddCleanupHook(CleanupCallback fn, void* arg) {
10321032
auto insertion_info = cleanup_hooks_.emplace(CleanupHookCallback {
10331033
fn, arg, cleanup_hook_counter_++
10341034
});
10351035
// Make sure there was no existing element with these values.
10361036
CHECK_EQ(insertion_info.second, true);
10371037
}
10381038

1039-
void Environment::RemoveCleanupHook(void (*fn)(void*), void* arg) {
1039+
void Environment::RemoveCleanupHook(CleanupCallback fn, void* arg) {
10401040
CleanupHookCallback search { fn, arg, 0 };
10411041
cleanup_hooks_.erase(search);
10421042
}

src/env.h

+7-4
Original file line numberDiff line numberDiff line change
@@ -891,7 +891,9 @@ class ShouldNotAbortOnUncaughtScope {
891891

892892
class CleanupHookCallback {
893893
public:
894-
CleanupHookCallback(void (*fn)(void*),
894+
typedef void (*Callback)(void*);
895+
896+
CleanupHookCallback(Callback fn,
895897
void* arg,
896898
uint64_t insertion_order_counter)
897899
: fn_(fn), arg_(arg), insertion_order_counter_(insertion_order_counter) {}
@@ -911,7 +913,7 @@ class CleanupHookCallback {
911913

912914
private:
913915
friend class Environment;
914-
void (*fn_)(void*);
916+
Callback fn_;
915917
void* arg_;
916918

917919
// We keep track of the insertion order for these objects, so that we can
@@ -1319,8 +1321,9 @@ class Environment : public MemoryRetainer {
13191321
void ScheduleTimer(int64_t duration);
13201322
void ToggleTimerRef(bool ref);
13211323

1322-
inline void AddCleanupHook(void (*fn)(void*), void* arg);
1323-
inline void RemoveCleanupHook(void (*fn)(void*), void* arg);
1324+
using CleanupCallback = CleanupHookCallback::Callback;
1325+
inline void AddCleanupHook(CleanupCallback cb, void* arg);
1326+
inline void RemoveCleanupHook(CleanupCallback cb, void* arg);
13241327
void RunCleanup();
13251328

13261329
static size_t NearHeapLimitCallback(void* data,

0 commit comments

Comments
 (0)