D: Use deterministic allocation on the D side in li_boost_shared_ptr_runme.i.

This commit is contained in:
David Nadlinger 2014-10-31 20:14:35 +01:00
commit 5d133ada91

View file

@ -32,15 +32,6 @@ void main() {
if (TRACE) if (TRACE)
writeln("---> NEARLY FINISHED <---"); writeln("---> NEARLY FINISHED <---");
// Try to get the GC to collect everything not referenced anymore.
int countdown = 100;
while (--countdown) {
GC.collect();
if (Klass.getTotal_count() == 1)
break;
Thread.sleep(100.usecs);
}
// A single remaining instance expected: the global variable (GlobalValue). // A single remaining instance expected: the global variable (GlobalValue).
if (Klass.getTotal_count() != 1) if (Klass.getTotal_count() != 1)
throw new Exception("Klass.total_count=" ~ to!string(Klass.getTotal_count())); throw new Exception("Klass.total_count=" ~ to!string(Klass.getTotal_count()));
@ -56,9 +47,15 @@ void main() {
} }
void runTest() { void runTest() {
// We want to check whether all the C++ Klass instances have been properly
// destructed after the tests have run. However, as it is legal for the GC
// to leave an object around even if it is unreachable, use deterministic
// memory management here.
import std.typecons : scoped;
// simple shared_ptr usage - created in C++ // simple shared_ptr usage - created in C++
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
string val = k.getValue(); string val = k.getValue();
verifyValue("me oh my", val); verifyValue("me oh my", val);
verifyCount(1, k); verifyCount(1, k);
@ -74,7 +71,7 @@ void runTest() {
// pass by shared_ptr // pass by shared_ptr
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = smartpointertest(k); auto kret = smartpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointertest", val); verifyValue("me oh my smartpointertest", val);
@ -84,7 +81,7 @@ void runTest() {
// pass by shared_ptr pointer // pass by shared_ptr pointer
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = smartpointerpointertest(k); auto kret = smartpointerpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointerpointertest", val); verifyValue("me oh my smartpointerpointertest", val);
@ -94,7 +91,7 @@ void runTest() {
// pass by shared_ptr reference // pass by shared_ptr reference
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = smartpointerreftest(k); auto kret = smartpointerreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointerreftest", val); verifyValue("me oh my smartpointerreftest", val);
@ -104,7 +101,7 @@ void runTest() {
// pass by shared_ptr pointer reference // pass by shared_ptr pointer reference
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = smartpointerpointerreftest(k); auto kret = smartpointerpointerreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointerpointerreftest", val); verifyValue("me oh my smartpointerpointerreftest", val);
@ -114,7 +111,7 @@ void runTest() {
// const pass by shared_ptr // const pass by shared_ptr
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = constsmartpointertest(k); auto kret = constsmartpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my", val); verifyValue("me oh my", val);
@ -124,7 +121,7 @@ void runTest() {
// const pass by shared_ptr pointer // const pass by shared_ptr pointer
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = constsmartpointerpointertest(k); auto kret = constsmartpointerpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my", val); verifyValue("me oh my", val);
@ -134,7 +131,7 @@ void runTest() {
// const pass by shared_ptr reference // const pass by shared_ptr reference
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = constsmartpointerreftest(k); auto kret = constsmartpointerreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my", val); verifyValue("me oh my", val);
@ -144,7 +141,7 @@ void runTest() {
// pass by value // pass by value
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = valuetest(k); auto kret = valuetest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my valuetest", val); verifyValue("me oh my valuetest", val);
@ -154,7 +151,7 @@ void runTest() {
// pass by pointer // pass by pointer
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = pointertest(k); auto kret = pointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my pointertest", val); verifyValue("me oh my pointertest", val);
@ -164,7 +161,7 @@ void runTest() {
// pass by reference // pass by reference
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = reftest(k); auto kret = reftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my reftest", val); verifyValue("me oh my reftest", val);
@ -174,7 +171,7 @@ void runTest() {
// pass by pointer reference // pass by pointer reference
{ {
auto k = new Klass("me oh my"); auto k = scoped!Klass("me oh my");
auto kret = pointerreftest(k); auto kret = pointerreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my pointerreftest", val); verifyValue("me oh my pointerreftest", val);
@ -216,7 +213,7 @@ void runTest() {
////////////////////////////////// Derived classes //////////////////////////////////////// ////////////////////////////////// Derived classes ////////////////////////////////////////
// derived pass by shared_ptr // derived pass by shared_ptr
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = derivedsmartptrtest(k); auto kret = derivedsmartptrtest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my derivedsmartptrtest-Derived", val); verifyValue("me oh my derivedsmartptrtest-Derived", val);
@ -225,7 +222,7 @@ void runTest() {
} }
// derived pass by shared_ptr pointer // derived pass by shared_ptr pointer
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = derivedsmartptrpointertest(k); auto kret = derivedsmartptrpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my derivedsmartptrpointertest-Derived", val); verifyValue("me oh my derivedsmartptrpointertest-Derived", val);
@ -234,7 +231,7 @@ void runTest() {
} }
// derived pass by shared_ptr ref // derived pass by shared_ptr ref
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = derivedsmartptrreftest(k); auto kret = derivedsmartptrreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my derivedsmartptrreftest-Derived", val); verifyValue("me oh my derivedsmartptrreftest-Derived", val);
@ -243,7 +240,7 @@ void runTest() {
} }
// derived pass by shared_ptr pointer ref // derived pass by shared_ptr pointer ref
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = derivedsmartptrpointerreftest(k); auto kret = derivedsmartptrpointerreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my derivedsmartptrpointerreftest-Derived", val); verifyValue("me oh my derivedsmartptrpointerreftest-Derived", val);
@ -252,7 +249,7 @@ void runTest() {
} }
// derived pass by pointer // derived pass by pointer
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = derivedpointertest(k); auto kret = derivedpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my derivedpointertest-Derived", val); verifyValue("me oh my derivedpointertest-Derived", val);
@ -261,7 +258,7 @@ void runTest() {
} }
// derived pass by ref // derived pass by ref
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = derivedreftest(k); auto kret = derivedreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my derivedreftest-Derived", val); verifyValue("me oh my derivedreftest-Derived", val);
@ -272,7 +269,7 @@ void runTest() {
////////////////////////////////// Derived and base class mixed //////////////////////////////////////// ////////////////////////////////// Derived and base class mixed ////////////////////////////////////////
// pass by shared_ptr (mixed) // pass by shared_ptr (mixed)
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = smartpointertest(k); auto kret = smartpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointertest-Derived", val); verifyValue("me oh my smartpointertest-Derived", val);
@ -282,7 +279,7 @@ void runTest() {
// pass by shared_ptr pointer (mixed) // pass by shared_ptr pointer (mixed)
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = smartpointerpointertest(k); auto kret = smartpointerpointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointerpointertest-Derived", val); verifyValue("me oh my smartpointerpointertest-Derived", val);
@ -292,7 +289,7 @@ void runTest() {
// pass by shared_ptr reference (mixed) // pass by shared_ptr reference (mixed)
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = smartpointerreftest(k); auto kret = smartpointerreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointerreftest-Derived", val); verifyValue("me oh my smartpointerreftest-Derived", val);
@ -302,7 +299,7 @@ void runTest() {
// pass by shared_ptr pointer reference (mixed) // pass by shared_ptr pointer reference (mixed)
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = smartpointerpointerreftest(k); auto kret = smartpointerpointerreftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my smartpointerpointerreftest-Derived", val); verifyValue("me oh my smartpointerpointerreftest-Derived", val);
@ -312,7 +309,7 @@ void runTest() {
// pass by value (mixed) // pass by value (mixed)
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = valuetest(k); auto kret = valuetest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my valuetest", val); // note slicing verifyValue("me oh my valuetest", val); // note slicing
@ -322,7 +319,7 @@ void runTest() {
// pass by pointer (mixed) // pass by pointer (mixed)
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = pointertest(k); auto kret = pointertest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my pointertest-Derived", val); verifyValue("me oh my pointertest-Derived", val);
@ -332,7 +329,7 @@ void runTest() {
// pass by ref (mixed) // pass by ref (mixed)
{ {
auto k = new KlassDerived("me oh my"); auto k = scoped!KlassDerived("me oh my");
auto kret = reftest(k); auto kret = reftest(k);
string val = kret.getValue(); string val = kret.getValue();
verifyValue("me oh my reftest-Derived", val); verifyValue("me oh my reftest-Derived", val);
@ -342,7 +339,7 @@ void runTest() {
// 3rd derived class // 3rd derived class
{ {
auto k = new Klass3rdDerived("me oh my"); auto k = scoped!Klass3rdDerived("me oh my");
string val = k.getValue(); string val = k.getValue();
verifyValue("me oh my-3rdDerived", val); verifyValue("me oh my-3rdDerived", val);
verifyCount(3, k); // 3 classes in inheritance chain == 3 swigCPtr values verifyCount(3, k); // 3 classes in inheritance chain == 3 swigCPtr values
@ -354,54 +351,61 @@ void runTest() {
////////////////////////////////// Member variables //////////////////////////////////////// ////////////////////////////////// Member variables ////////////////////////////////////////
// smart pointer by value // smart pointer by value
{ {
auto m = new MemberVariables(); auto k = scoped!Klass("smart member value");
auto k = new Klass("smart member value"); Klass kmember;
{
auto m = scoped!MemberVariables();
m.SmartMemberValue = k; m.SmartMemberValue = k;
string val = k.getValue(); string val = k.getValue();
verifyValue("smart member value", val); verifyValue("smart member value", val);
verifyCount(2, k); verifyCount(2, k);
auto kmember = m.SmartMemberValue; kmember = m.SmartMemberValue;
val = kmember.getValue(); val = kmember.getValue();
verifyValue("smart member value", val); verifyValue("smart member value", val);
verifyCount(3, kmember); verifyCount(3, kmember);
verifyCount(3, k); verifyCount(3, k);
}
delete m;
verifyCount(2, kmember); verifyCount(2, kmember);
verifyCount(2, k); verifyCount(2, k);
} }
// smart pointer by pointer // smart pointer by pointer
{ {
auto m = new MemberVariables(); auto k = scoped!Klass("smart member pointer");
auto k = new Klass("smart member pointer"); Klass kmember;
{
auto m = scoped!MemberVariables();
m.SmartMemberPointer = k; m.SmartMemberPointer = k;
string val = k.getValue(); string val = k.getValue();
verifyValue("smart member pointer", val); verifyValue("smart member pointer", val);
verifyCount(1, k); verifyCount(1, k);
auto kmember = m.SmartMemberPointer; kmember = m.SmartMemberPointer;
val = kmember.getValue(); val = kmember.getValue();
verifyValue("smart member pointer", val); verifyValue("smart member pointer", val);
verifyCount(2, kmember); verifyCount(2, kmember);
verifyCount(2, k); verifyCount(2, k);
}
delete m;
verifyCount(2, kmember); verifyCount(2, kmember);
verifyCount(2, k); verifyCount(2, k);
} }
// smart pointer by reference // smart pointer by reference
{ {
auto m = new MemberVariables(); auto k = scoped!Klass("smart member reference");
auto k = new Klass("smart member reference"); Klass kmember;
{
auto m = scoped!MemberVariables();
m.SmartMemberReference = k; m.SmartMemberReference = k;
string val = k.getValue(); string val = k.getValue();
verifyValue("smart member reference", val); verifyValue("smart member reference", val);
verifyCount(2, k); verifyCount(2, k);
auto kmember = m.SmartMemberReference; kmember = m.SmartMemberReference;
val = kmember.getValue(); val = kmember.getValue();
verifyValue("smart member reference", val); verifyValue("smart member reference", val);
verifyCount(3, kmember); verifyCount(3, kmember);
@ -414,68 +418,73 @@ void runTest() {
verifyCount(4, kmemberVal); verifyCount(4, kmemberVal);
verifyCount(4, kmember); verifyCount(4, kmember);
verifyCount(4, k); verifyCount(4, k);
}
delete m;
verifyCount(3, kmember); verifyCount(3, kmember);
verifyCount(3, k); verifyCount(3, k);
} }
// plain by value // plain by value
{ {
auto m = new MemberVariables(); auto k = scoped!Klass("plain member value");
auto k = new Klass("plain member value"); Klass kmember;
{
auto m = scoped!MemberVariables();
m.MemberValue = k; m.MemberValue = k;
string val = k.getValue(); string val = k.getValue();
verifyValue("plain member value", val); verifyValue("plain member value", val);
verifyCount(1, k); verifyCount(1, k);
auto kmember = m.MemberValue; kmember = m.MemberValue;
val = kmember.getValue(); val = kmember.getValue();
verifyValue("plain member value", val); verifyValue("plain member value", val);
verifyCount(1, kmember); verifyCount(1, kmember);
verifyCount(1, k); verifyCount(1, k);
}
delete m;
verifyCount(1, kmember); verifyCount(1, kmember);
verifyCount(1, k); verifyCount(1, k);
} }
// plain by pointer // plain by pointer
{ {
auto m = new MemberVariables(); auto k = scoped!Klass("plain member pointer");
auto k = new Klass("plain member pointer"); Klass kmember;
{
auto m = scoped!MemberVariables();
m.MemberPointer = k; m.MemberPointer = k;
string val = k.getValue(); string val = k.getValue();
verifyValue("plain member pointer", val); verifyValue("plain member pointer", val);
verifyCount(1, k); verifyCount(1, k);
auto kmember = m.MemberPointer; kmember = m.MemberPointer;
val = kmember.getValue(); val = kmember.getValue();
verifyValue("plain member pointer", val); verifyValue("plain member pointer", val);
verifyCount(1, kmember); verifyCount(1, kmember);
verifyCount(1, k); verifyCount(1, k);
}
delete m;
verifyCount(1, kmember); verifyCount(1, kmember);
verifyCount(1, k); verifyCount(1, k);
} }
// plain by reference // plain by reference
{ {
auto m = new MemberVariables(); auto k = scoped!Klass("plain member reference");
auto k = new Klass("plain member reference"); Klass kmember;
{
auto m = scoped!MemberVariables();
m.MemberReference = k; m.MemberReference = k;
string val = k.getValue(); string val = k.getValue();
verifyValue("plain member reference", val); verifyValue("plain member reference", val);
verifyCount(1, k); verifyCount(1, k);
auto kmember = m.MemberReference; kmember = m.MemberReference;
val = kmember.getValue(); val = kmember.getValue();
verifyValue("plain member reference", val); verifyValue("plain member reference", val);
verifyCount(1, kmember); verifyCount(1, kmember);
verifyCount(1, k); verifyCount(1, k);
}
delete m;
verifyCount(1, kmember); verifyCount(1, kmember);
verifyCount(1, k); verifyCount(1, k);
@ -483,7 +492,7 @@ void runTest() {
// null member variables // null member variables
{ {
auto m = new MemberVariables(); auto m = scoped!MemberVariables();
// shared_ptr by value // shared_ptr by value
auto k = m.SmartMemberValue; auto k = m.SmartMemberValue;
@ -505,7 +514,7 @@ void runTest() {
auto kglobal = GlobalSmartValue; auto kglobal = GlobalSmartValue;
enforce(kglobal is null, "expected null"); enforce(kglobal is null, "expected null");
auto k = new Klass("smart global value"); auto k = scoped!Klass("smart global value");
GlobalSmartValue = k; GlobalSmartValue = k;
verifyCount(2, k); verifyCount(2, k);
@ -521,7 +530,7 @@ void runTest() {
{ {
Klass kglobal; Klass kglobal;
auto k = new Klass("global value"); auto k = scoped!Klass("global value");
GlobalValue = k; GlobalValue = k;
verifyCount(1, k); verifyCount(1, k);
@ -539,7 +548,7 @@ void runTest() {
auto kglobal = GlobalPointer; auto kglobal = GlobalPointer;
enforce(kglobal is null, "expected null"); enforce(kglobal is null, "expected null");
auto k = new Klass("global pointer"); auto k = scoped!Klass("global pointer");
GlobalPointer = k; GlobalPointer = k;
verifyCount(1, k); verifyCount(1, k);
@ -554,7 +563,7 @@ void runTest() {
{ {
Klass kglobal; Klass kglobal;
auto k = new Klass("global reference"); auto k = scoped!Klass("global reference");
GlobalReference = k; GlobalReference = k;
verifyCount(1, k); verifyCount(1, k);