debian-packages/eventcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #79 from vibe-d/nested_initialization

Browse source 
Fix initialization behavior when being loaded as a shared library.
This commit is contained in:
Sönke Ludwig 2018-05-05 12:16:57 +02:00 committed by GitHub
parent 242432c416 48b214dd09
commit 745e4ea2c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
source/eventcore/core.d
View file

@ -27,24 +27,35 @@ else alias NativeEventDriver = EventDriver;
static if (!is(NativeEventDriver == EventDriver)) {
static this()
{
if (!s_driver) s_driver = new NativeEventDriver;
if (!s_isMainThread) {
if (!s_initCount++) {
assert(s_driver is null);
s_driver = new NativeEventDriver;
}
}
}
static ~this()
{
if (!s_isMainThread)
s_driver.dispose();
if (!s_isMainThread) {
if (!--s_initCount)
s_driver.dispose();
}
}
shared static this()
{
s_driver = new NativeEventDriver;
s_isMainThread = true;
if (!s_initCount++) {
s_driver = new NativeEventDriver;
s_isMainThread = true;
}
}
shared static ~this()
{
s_driver.dispose();
if (!--s_initCount) {
s_driver.dispose();
}
}
} else {
void setupEventDriver(EventDriver driver)
@ -58,4 +69,7 @@ static if (!is(NativeEventDriver == EventDriver)) {
private {
NativeEventDriver s_driver;
bool s_isMainThread;
// keeps track of nested DRuntime initializations that happen when
// (un)loading shared libaries.
int s_initCount = 0;
}