generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix a race in the construction of future. This fixes http://llvm.org/bugs/show_bug.cgi?id=14934.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@172456 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-01-14 20:01:24 +00:00
parent 3e3ae9ec41
commit 1b031c947f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/future
View File

@ -470,7 +470,11 @@ public:
{return (__state_ & __constructed) || (__exception_ != nullptr);} {return (__state_ & __constructed) || (__exception_ != nullptr);}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
void __set_future_attached() {__state_ |= __future_attached;} void __set_future_attached()
{
lock_guard<mutex> __lk(__mut_);
__state_ |= __future_attached;
}
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
bool __has_future_attached() const {return __state_ & __future_attached;} bool __has_future_attached() const {return __state_ & __future_attached;}

2
src/future.cpp
View File

@ -78,8 +78,8 @@ __assoc_sub_state::set_value()
throw future_error(make_error_code(future_errc::promise_already_satisfied)); throw future_error(make_error_code(future_errc::promise_already_satisfied));
#endif #endif
__state_ |= __constructed | ready; __state_ |= __constructed | ready;
__lk.unlock();
__cv_.notify_all(); __cv_.notify_all();
__lk.unlock();
} }
void void