boost/thread
2
0
Fork 0
mirror of https://github.com/boostorg/thread.git synced 2026-02-11 12:12:12 +00:00
Code Issues Projects Releases Wiki Activity

Ensure thread handle is closed correctly. Fix race conditions on notify.

Browse Source 
[SVN r35272]
This commit is contained in:
Anthony Williams
2006-09-22 09:41:34 +00:00
parent c2cfd16c6c
commit ce384ef3d8
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/thread/win32/condition.hpp
View File

@@ -18,6 +18,7 @@
#include <boost/thread/win32/thread_primitives.hpp>
#include <boost/thread/win32/xtime_utils.hpp>
#include <boost/thread/win32/interlocked_read.hpp>
#include <boost/assert.hpp>
namespace boost
{
@@ -55,6 +56,7 @@ namespace boost
add_entry_to_list(condition* self_,waiting_list_entry& entry_,scoped_lock_type& m_):
self(self_),entry(entry_),m(m_)
{
entry.previous=&self->waiting_list;
gate_scoped_lock lock(self->state_change_gate);
entry.next=self->waiting_list.next;
@@ -65,21 +67,17 @@ namespace boost
}
~add_entry_to_list()
{
void* thread_handle;
if(!entry.notified)
{
gate_scoped_lock lock(self->state_change_gate);
thread_handle=entry.waiting_thread_handle;
if(!entry.notified)
{
entry.unlink();
}
entry.waiting_thread_handle=0;
}
BOOST_CLOSE_HANDLE(entry.waiting_thread_handle);
m.lock();
BOOST_CLOSE_HANDLE(thread_handle);
}
};
@@ -91,9 +89,8 @@ namespace boost
void* const currentProcess=BOOST_GET_CURRENT_PROCESS();
long const same_access_flag=2;
BOOST_DUPLICATE_HANDLE(currentProcess,BOOST_GET_CURRENT_THREAD(),currentProcess,&entry.waiting_thread_handle,0,false,same_access_flag);
entry.previous=&waiting_list;
bool const success=BOOST_DUPLICATE_HANDLE(currentProcess,BOOST_GET_CURRENT_THREAD(),currentProcess,&entry.waiting_thread_handle,0,false,same_access_flag)!=0;
BOOST_ASSERT(success);
{
add_entry_to_list<scoped_lock_type> list_guard(this,entry,m);
@@ -131,8 +128,9 @@ namespace boost
gate_scoped_lock lock(state_change_gate);
if(waiting_list.previous!=&waiting_list)
{
notify_entry(waiting_list.previous);
waiting_list.previous->unlink();
waiting_list_entry* const entry=waiting_list.previous;
entry->unlink();
notify_entry(entry);
}
}
@@ -144,8 +142,9 @@ namespace boost
waiting_list.next=&waiting_list;
while(head!=&waiting_list)
{
waiting_list_entry* const previous=head->previous;
notify_entry(head);
head=head->previous;
head=previous;
}
}