derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base: Rename TestFiber into SwitchingFiber

Browse Source 
This is done since TestFiber is too generic and it is not the only
Fiber's testing subclass in the unit test

Change-Id: Idc386f487091ae9bdadae865090a6719a25583da
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19153
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Giacomo Travaglini
2019-06-07 14:10:47 +01:00
parent aece7fcdf9
commit 2833eb91ea
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/base/fiber.test.cc
View File

@@ -35,48 +35,48 @@
#include "base/fiber.hh"
class TestFiber : public Fiber
class SwitchingFiber : public Fiber
{
public:
const char *name;
std::vector<Fiber *> next;
TestFiber(const char *name, std::initializer_list<Fiber *> l);
SwitchingFiber(const char *name, std::initializer_list<Fiber *> l);
void checkExpected();
void main();
};
extern TestFiber a;
extern TestFiber b;
extern TestFiber c;
extern SwitchingFiber a;
extern SwitchingFiber b;
extern SwitchingFiber c;
TestFiber a("A", { &b, &a, Fiber::primaryFiber(), &b, &c });
TestFiber b("B", { &a, &c });
TestFiber c("C", { &a, Fiber::primaryFiber(), Fiber::primaryFiber() });
SwitchingFiber a("A", { &b, &a, Fiber::primaryFiber(), &b, &c });
SwitchingFiber b("B", { &a, &c });
SwitchingFiber c("C", { &a, Fiber::primaryFiber(), Fiber::primaryFiber() });
std::vector<TestFiber *>::iterator expectedIt;
std::vector<TestFiber *> expected({
std::vector<SwitchingFiber *>::iterator expectedIt;
std::vector<SwitchingFiber *> expected({
&a, &b, &a, &a, /* main Fiber, */
&a, &b, &c, &a, &c,
/* main Fiber, */ &c, &c
});
TestFiber::TestFiber(
SwitchingFiber::SwitchingFiber(
const char *name, std::initializer_list<Fiber *> l) :
name(name), next(l)
{}
void
TestFiber::checkExpected()
SwitchingFiber::checkExpected()
{
ASSERT_NE(expectedIt, expected.end());
TestFiber *e = *expectedIt++;
SwitchingFiber *e = *expectedIt++;
EXPECT_EQ(e, this) << "Expected " << e->name << ", got " << name;
}
void
TestFiber::main()
SwitchingFiber::main()
{
checkExpected();
for (auto &n : next) {