Skip to content

n-api: fix win32 main thread detection #32823

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

n-api: fix win32 main thread detection #32823

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55e9481
n-api: fix win32 main thread detection
Apr 13, 2020
eb3231f
ifdef the rest of the API
Apr 13, 2020
0678182
convert to class
Apr 13, 2020
8980c7b
simplify definition
Apr 13, 2020
2e61c71
add consts
Apr 14, 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
Prev Previous commit
Next Next commit
simplify definition
  • Loading branch information
Gabriel Schulhof committed Apr 13, 2020
commit 8980c7b27213aa0f76e83e9cacc70dbdea8f75f3
20 changes: 7 additions & 13 deletions src/node_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,30 +116,24 @@ static inline void trigger_fatal_exception(
class ThreadID {
public:
#ifdef _WIN32
typedef DWORD thread_id_t;
ThreadID(): _tid(GetCurrentThreadId()) {}
inline bool operator==(const ThreadID& other) { return _tid == other._tid; }
#else
typedef uv_thread_t thread_id_t;
ThreadID(): _tid(uv_thread_self()) {}
inline bool operator==(const ThreadID& other) {
return static_cast<bool>(uv_thread_equal(&_tid, &other._tid));
}
#endif // _WIN32

ThreadID(const ThreadID&) = delete;
ThreadID(ThreadID&&) = delete;
void operator= (const ThreadID&) = delete;
void operator= (const ThreadID&&) = delete;

#ifdef _WIN32
inline bool operator==(const ThreadID& other) { return _tid == other._tid; }
#else
inline bool operator==(const ThreadID& other) {
return static_cast<bool>(uv_thread_equal(&_tid, &other._tid));
}
#endif

private:
#ifdef _WIN32
DWORD _tid = 0;
#else
uv_thread_t _tid;
#endif // _WIN32
thread_id_t _tid;
};

class ThreadSafeFunction : public node::AsyncResource {
Expand Down