Skip to content

Conditionally compile the pthread_t member in emscripten::val #25872

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

Open
xbcnn wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −3
Open

Conditionally compile the pthread_t member in emscripten::val #25872

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions system/include/emscripten/val.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,12 @@ class EMBIND_VISIBILITY_DEFAULT val {
// it just moves a value and doesn't need to go via incref/decref.
// This means it's safe to move values across threads - an error will
// only arise if you access or free it from the wrong thread later.
val(val&& v) : handle(v.handle), thread(v.thread) {
val(val&& v)
:
#ifdef _REENTRANT
thread(v.thread),
#endif
handle(v.handle) {
v.handle = 0;
}

Expand Down Expand Up @@ -558,8 +563,12 @@ class EMBIND_VISIBILITY_DEFAULT val {
private:
// takes ownership, assumes handle already incref'd and lives on the same thread
explicit val(EM_VAL handle)
: handle(handle), thread(pthread_self())
{}
:
#ifdef _REENTRANT
thread(pthread_self()),
#endif
handle(handle) {
}

// Whether this value is a uses incref/decref (true) or is a special reserved
// value (false).
Expand Down Expand Up @@ -625,7 +634,10 @@ class EMBIND_VISIBILITY_DEFAULT val {
return v;
}

#ifdef _REENTRANT
// It's used for thread checks and only under pthread environment.
pthread_t thread;
#endif
EM_VAL handle;

template <typename T, typename>
Expand Down
Loading