ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: improve the API

Browse source
This commit is contained in:
Fischlurch 2013-10-18 01:10:03 +02:00
parent f93c7f8930
commit 319da4bff6
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/lib/depend.hpp
View file

@ -60,7 +60,7 @@ namespace lib {
template<class SI>
class Depend
{
typedef ClassLock<SI> ThreadLock;
typedef ClassLock<SI> SyncLock;
typedef DependencyFactory<SI> Factory;
static SI* volatile instance;
@ -78,7 +78,7 @@ namespace lib {
{
if (!instance)
{
ThreadLock guard;
SyncLock guard;
if (!instance)
instance = factory.buildInstance();
@ -90,7 +90,7 @@ namespace lib {
void
shutdown()
{
ThreadLock guard;
SyncLock guard;
factory.deconfigure (instance);
instance = NULL;
@ -99,25 +99,26 @@ namespace lib {
void
injectReplacement (SI* mock)
{
if (mock)
{
factory.takeOwnership (mock); // EX_SANE
ThreadLock guard;
factory.shaddow (instance);
instance = mock;
}
else
{
factory.discardMock (instance); // EX_FREE
ThreadLock guard;
instance = factory.restore (); // EX_SANE
}
REQUIRE (mock);
factory.takeOwnership (mock); // EX_SANE
SyncLock guard;
factory.shaddow (instance); // EX_FREE
instance = mock;
}
Depend ();
Depend (typename Factory::Constructor ctor);
void
dropReplacement()
{
SyncLock guard;
factory.discardMock (instance); // EX_FREE
instance = factory.restore (); // EX_SANE
}
typedef typename Factory::InstanceConstructor Constructor;
Depend (Constructor ctor = buildSingleton<SI>());
private:
};

2
tests/library/dependency-factory-test.cpp
View file

@ -213,7 +213,7 @@ namespace test{
CHECK(!isSameObject (replacement, special() ));
CHECK(!isSameObject (replacement, custom() ));
genericAccessor.injectReplacement (NULL);
genericAccessor.dropReplacement();
Sub& nextFetch = genericAccessor();
CHECK (isSameObject (original, nextFetch));