This is an archive of the discontinued LLVM Phabricator instance.

[libcxx] Use mtx_plain | mtx_recursive following C11 API
ClosedPublic

Authored by phosek on Jan 15 2020, 2:00 PM.

Reviewers

EricWF
mclow.lists

Commits

Summary

The C11 API specifies that to initialize a recursive mutex,
mtx_plain | mtx_recursive should be used with mtx_init.

LGTM.

We should backport this into the LLVM 10 release.
@hans Is that OK by you?

This revision is now accepted and ready to land.Jan 15 2020, 3:13 PM

This revision was automatically updated to reflect the committed changes.

In D72809#1823003, @EricWF wrote:

LGTM.

We should backport this into the LLVM 10 release.
@hans Is that OK by you?

Yes. Cherry-picked in 729258062afeb587fcfaeebb76d5a0ff69cf58b9

Path

Size

libcxx/

include/

2 lines

	Show First 20 Lines • Show All 439 Lines • ▼ Show 20 Lines
	{			{
	return pthread_setspecific(__key, __p);			return pthread_setspecific(__key, __p);
	}			}

	#elif defined(_LIBCPP_HAS_THREAD_API_C11)			#elif defined(_LIBCPP_HAS_THREAD_API_C11)

	int __libcpp_recursive_mutex_init(__libcpp_recursive_mutex_t *__m)			int __libcpp_recursive_mutex_init(__libcpp_recursive_mutex_t *__m)
	{			{
	return mtx_init(__m, mtx_recursive) == thrd_success ? 0 : EINVAL;			return mtx_init(__m, mtx_plain \| mtx_recursive) == thrd_success ? 0 : EINVAL;
	}			}

	int __libcpp_recursive_mutex_lock(__libcpp_recursive_mutex_t *__m)			int __libcpp_recursive_mutex_lock(__libcpp_recursive_mutex_t *__m)
	{			{
	return mtx_lock(__m) == thrd_success ? 0 : EINVAL;			return mtx_lock(__m) == thrd_success ? 0 : EINVAL;
	}			}

	bool __libcpp_recursive_mutex_trylock(__libcpp_recursive_mutex_t *__m)			bool __libcpp_recursive_mutex_trylock(__libcpp_recursive_mutex_t *__m)
	▲ Show 20 Lines • Show All 235 Lines • Show Last 20 Lines