Skip to content

src: add typedef for CleanupHookCallback callback #36442

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
wants to merge 2 commits into from
Closed

src: add typedef for CleanupHookCallback callback #36442

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
88c83ad
src: add typedef for CleanupHookCallback callback
danbev Dec 8, 2020
0c833d4
squash! src: add typedef for CleanupHookCallback callback
danbev Dec 8, 2020
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
4 changes: 2 additions & 2 deletions src/env-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,15 +1024,15 @@ 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_++
});
// Make sure there was no existing element with these values.
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);
}
Expand Down
11 changes: 7 additions & 4 deletions src/env.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {}
Expand All @@ -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
Expand Down Expand Up @@ -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,
Expand Down