Bug 1316757, part 6 - Comment out various race-related state machines. r=billm
The state machine stuff provides a decent compact overview of where
races are supposed to happen, so I just commented them out.
MozReview-Commit-ID: 1K5mw2kyXWb
--- a/ipc/ipdl/test/cxx/PTestHangs.ipdl
+++ b/ipc/ipdl/test/cxx/PTestHangs.ipdl
@@ -9,17 +9,17 @@ both:
parent:
async Nonce();
child:
async Start();
intr Hang();
async __delete__();
-
+/*
state START:
send Start goto RACE;
state RACE:
recv Nonce goto RACE1;
call StackFrame goto RACE2;
state RACE1:
call StackFrame goto FRAME2;
@@ -29,12 +29,13 @@ state RACE2:
// So as to test unwinding the RPC stack
state FRAME2: answer StackFrame goto FRAME3;
state FRAME3: call StackFrame goto FRAME4;
state FRAME4: answer StackFrame goto HANG;
state HANG: call Hang goto DEATH;
state DEATH:
send __delete__;
+*/
};
} // namespace _ipdltest
} // namespace mozilla
--- a/ipc/ipdl/test/cxx/PTestInterruptRaces.ipdl
+++ b/ipc/ipdl/test/cxx/PTestInterruptRaces.ipdl
@@ -14,16 +14,17 @@ parent:
child:
async Start();
async Wakeup();
async Wakeup3();
intr Child();
async __delete__();
+/*
state START:
send Start goto TEST1;
// First test: race while no other messages are on the Interrupt stack
state TEST1:
recv StartRace goto RACE1;
state RACE1:
call Race goto DUMMY1_1;
@@ -71,12 +72,14 @@ state CHECK:
recv GetAnsweredParent goto DYING;
// because of deferred processing, the parent receives the child's
// message here
answer Parent goto DYING;
state DYING:
send __delete__;
+*/
+
};
} // namespace _ipdltest
} // namespace mozilla
--- a/ipc/ipdl/test/cxx/PTestInterruptShutdownRace.ipdl
+++ b/ipc/ipdl/test/cxx/PTestInterruptShutdownRace.ipdl
@@ -6,16 +6,17 @@ parent:
sync StartDeath();
async Orphan();
child:
async Start();
intr Exit();
async __delete__();
+/*
state START:
send Start goto START_DEATH;
state START_DEATH:
recv StartDeath goto EXITING;
state EXITING:
recv Orphan goto QUITTING1;
@@ -23,12 +24,13 @@ state EXITING:
state QUITTING1:
call Exit goto DEAD;
state QUITTING2:
recv Orphan goto DEAD;
state DEAD:
send __delete__;
+*/
};
} // namespace _ipdltest
} // namespace mozilla
--- a/ipc/ipdl/test/cxx/PTestLatency.ipdl
+++ b/ipc/ipdl/test/cxx/PTestLatency.ipdl
@@ -15,16 +15,17 @@ child:
async CompressedSpam(uint32_t seqno) compress;
intr Synchro2() returns (uint32_t lastSeqno,
uint32_t numMessagesDispatched);
parent:
async Pong();
async Pong5();
+/*
state START:
// if the timing resolution is too low, abort the test
send __delete__;
// otherwise, kick off the ping/pong trials
send Ping goto PONG;
// Trial 1: single ping/pong latency
state PING:
@@ -63,13 +64,14 @@ state SPAM:
// Trial 5: lots of async spam, but compressed to cut down on
// dispatch overhead
state COMPRESSED_SPAM: // compressed spam, mmm
send CompressedSpam goto COMPRESSED_SPAM;
call Synchro2 goto DONE;
state DONE:
send __delete__;
+*/
};
} // namespace mozilla
} // namespace _ipdltest
--- a/ipc/ipdl/test/cxx/PTestNestedLoops.ipdl
+++ b/ipc/ipdl/test/cxx/PTestNestedLoops.ipdl
@@ -8,27 +8,28 @@ intr protocol PTestNestedLoops {
child:
async Start();
intr R();
async __delete__();
parent:
async Nonce();
-
+/*
state START:
send Start goto RACE;
state RACE:
recv Nonce goto RACE1;
call R goto RACE2;
state RACE1:
call R goto DEAD;
state RACE2:
recv Nonce goto DEAD;
state DEAD:
send __delete__;
+*/
};
} // namespace mozilla
} // namespace _ipdltest