King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

asserts to catch >static initialization order fiasco<

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@180 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp 2005-07-27 16:32:20 +00:00
parent dddd95d48d
commit c4e9df64c2
1 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

25
include/loki/Threads.h
View file

@ -140,20 +140,16 @@ namespace Loki
CRITICAL_SECTION mtx_; CRITICAL_SECTION mtx_;
bool init_; bool init_;
Initializer() Initializer():init_(false)
{
init();
}
~Initializer()
{
assert( init_ );
::DeleteCriticalSection(&mtx_);
}
void init()
{ {
::InitializeCriticalSection(&mtx_); ::InitializeCriticalSection(&mtx_);
init_=true; init_=true;
} }
~Initializer()
{
assert(init_);
::DeleteCriticalSection(&mtx_);
}
}; };
static Initializer initializer_; static Initializer initializer_;
@ -169,18 +165,17 @@ namespace Loki
public: public:
Lock() Lock()
{ {
assert( initializer_.init_ ); assert(initializer_.init_);
//if(!initializer_.init_) initializer_.init(); ::EnterCriticalSection(&initializer_.mtx_);
::EnterCriticalSection(&initializer_.mtx_);
} }
explicit Lock(const ClassLevelLockable&) explicit Lock(const ClassLevelLockable&)
{ {
assert( initializer_.init_ ); assert(initializer_.init_);
::EnterCriticalSection(&initializer_.mtx_); ::EnterCriticalSection(&initializer_.mtx_);
} }
~Lock() ~Lock()
{ {
assert( initializer_.init_ ); assert(initializer_.init_);
::LeaveCriticalSection(&initializer_.mtx_); ::LeaveCriticalSection(&initializer_.mtx_);
} }
}; };