--HG--
extra : transplant_source : %20%83%FE%ED1N%00Xg6D%A9%FC%1E%B1%7E%BD%14xQ
This commit is contained in:
Chris Jones 2010-01-14 23:25:56 -06:00
Родитель 67a20cfb76
Коммит e32ed2f501
3 изменённых файлов: 18 добавлений и 10 удалений

Просмотреть файл

@ -10,7 +10,7 @@ sync protocol PTestShutdownSub {
parent: parent:
PTestShutdownSubsub(bool expectParentDeleted); PTestShutdownSubsub(bool expectParentDeleted);
__delete__(); sync __delete__();
state CREATING: state CREATING:
recv PTestShutdownSubsub goto CREATING; recv PTestShutdownSubsub goto CREATING;

Просмотреть файл

@ -7,7 +7,7 @@ sync protocol PTestShutdownSubsub {
manager PTestShutdownSub; manager PTestShutdownSub;
parent: parent:
__delete__(); sync __delete__();
state LIVE: state LIVE:
recv __delete__; recv __delete__;

Просмотреть файл

@ -94,13 +94,19 @@ TestShutdownChild::RecvStart()
if (!c2s2) if (!c2s2)
fail("problem sending ctor"); fail("problem sending ctor");
PTestShutdownSubsubChild::Send__delete__(c1s1); if (!PTestShutdownSubsubChild::Send__delete__(c1s1))
PTestShutdownSubsubChild::Send__delete__(c1s2); fail("problem sending dtor");
PTestShutdownSubsubChild::Send__delete__(c2s1); if (!PTestShutdownSubsubChild::Send__delete__(c1s2))
PTestShutdownSubsubChild::Send__delete__(c2s2); fail("problem sending dtor");
if (!PTestShutdownSubsubChild::Send__delete__(c2s1))
fail("problem sending dtor");
if (!PTestShutdownSubsubChild::Send__delete__(c2s2))
fail("problem sending dtor");
PTestShutdownSubChild::Send__delete__(c1); if (!PTestShutdownSubChild::Send__delete__(c1))
PTestShutdownSubChild::Send__delete__(c2); fail("problem sending dtor");
if (!PTestShutdownSubChild::Send__delete__(c2))
fail("problem sending dtor");
} }
// test 2: alloc some actors and subactors, delete managers first // test 2: alloc some actors and subactors, delete managers first
@ -136,8 +142,10 @@ TestShutdownChild::RecvStart()
fail("problem sending ctor"); fail("problem sending ctor");
// delete parents without deleting kids // delete parents without deleting kids
PTestShutdownSubChild::Send__delete__(c1); if (!PTestShutdownSubChild::Send__delete__(c1))
PTestShutdownSubChild::Send__delete__(c2); fail("problem sending dtor");
if (!PTestShutdownSubChild::Send__delete__(c2))
fail("problem sending dtor");
} }
// test 3: alloc some actors and subactors, then crash // test 3: alloc some actors and subactors, then crash