[gem5-dev] Change in gem5/gem5[master]: base: Add a class which encapsulates Fibers.
Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/10935 )
Change subject: base: Add a class which encapsulates Fibers.
..
base: Add a class which encapsulates Fibers.
This class encapsulates the idea of a Fiber in such a way that other
implementations can be substituted in in the future. This
implementation uses the ucontext family of functions.
This change also adds a new unit test which exercises the new class. It
creates three new fibers which accept a sequence of other fibers to
switch to, one after the other. The main test function switches to
the these fibers which switch with each other and occasionally back to
the main fiber. Each time a test fiber is activated, it checks against
a list which shows the correct order for the fibers to run in. When the
main fiber gets control, it makes sure that list has been progressed
through by the correct amount.
Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a
Reviewed-on: https://gem5-review.googlesource.com/10935
Reviewed-by: Giacomo Travaglini
Maintainer: Gabe Black
---
M src/base/SConscript
A src/base/fiber.cc
A src/base/fiber.hh
A src/base/fibertest.cc
4 files changed, 396 insertions(+), 0 deletions(-)
Approvals:
Giacomo Travaglini: Looks good to me, approved
Gabe Black: Looks good to me, approved
diff --git a/src/base/SConscript b/src/base/SConscript
index a90b784..b3205a6 100644
--- a/src/base/SConscript
+++ b/src/base/SConscript
@@ -46,6 +46,8 @@
Source('fenv.c')
if env['USE_PNG']:
Source('pngwriter.cc')
+Source('fiber.cc')
+GTest('fibertest', 'fibertest.cc', 'fiber.cc')
Source('framebuffer.cc')
Source('hostinfo.cc')
Source('inet.cc')
diff --git a/src/base/fiber.cc b/src/base/fiber.cc
new file mode 100644
index 000..f10f1fb
--- /dev/null
+++ b/src/base/fiber.cc
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2018 Google, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Authors: Gabe Black
+ */
+
+#include "base/fiber.hh"
+
+#include
+#include
+
+#include "base/logging.hh"
+
+using namespace std;
+
+namespace
+{
+
+/*
+ * The PrimaryFiber class is a special case that attaches to the currently
+ * executing context. That makes handling the "primary" fiber, aka the one
+ * which most of gem5 is running under, no different than other Fibers.
+ */
+class PrimaryFiber : public Fiber
+{
+ public:
+PrimaryFiber() : Fiber(nullptr, 0) { setStarted(); }
+void main() { panic("PrimaryFiber main executed.\n"); }
+};
+
+PrimaryFiber _primaryFiber;
+
+// A pointer to whatever the currently executing Fiber is.
+Fiber *_currentFiber = &_primaryFiber;
+
+// A pointer to the Fiber which is currently being started/initialized.
+Fiber *startingFiber = nullptr;
+
+} // anonymous namespace
+
+void
+Fiber::entryTrampoline()
+{
+startingFiber->start();
+}
+
+Fiber::Fiber(size_t stack_size) :
+link(primaryFiber()),
+stack(stack_size ? new uint8_t[stack_size] : nullptr),
+stackSize(stack_size), started(false), _finished(false)
+{}
+
+Fiber::Fiber(Fiber *link, size_t stack_size) :
+link(link), stack(stack_size ? new uint8_t[stack_size] : nullptr),
+stackSize(stack_size), started(false), _finished(false)
+{}
+
+Fiber::~Fiber()
+{
+panic_if(stack && _currentFiber == this, "Fiber stack is in use.");
+delete [] stack;
+}
+
+void
+Fiber::createContext()
+{
+// Set up a context for the new fiber, starting it in the trampoline.
+getcontext();
+
[gem5-dev] Change in gem5/gem5[master]: base: Add a class which encapsulates Fibers.
Hello Giacomo Travaglini, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/10935 to look at the new patch set (#5). Change subject: base: Add a class which encapsulates Fibers. .. base: Add a class which encapsulates Fibers. This class encapsulates the idea of a Fiber in such a way that other implementations can be substituted in in the future. This implementation uses the ucontext family of functions. This change also adds a new unit test which exercises the new class. It creates three new fibers which accept a sequence of other fibers to switch to, one after the other. The main test function switches to the these fibers which switch with each other and occasionally back to the main fiber. Each time a test fiber is activated, it checks against a list which shows the correct order for the fibers to run in. When the main fiber gets control, it makes sure that list has been progressed through by the correct amount. Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a --- M src/base/SConscript A src/base/fiber.cc A src/base/fiber.hh A src/base/fibertest.cc 4 files changed, 396 insertions(+), 0 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10935 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a Gerrit-Change-Number: 10935 Gerrit-PatchSet: 5 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Giacomo Travaglini Gerrit-CC: Jason Lowe-Power Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: base: Add a class which encapsulates Fibers.
Giacomo Travaglini has uploaded a new patch set (#4) to the change originally created by Gabe Black. ( https://gem5-review.googlesource.com/10935 ) Change subject: base: Add a class which encapsulates Fibers. .. base: Add a class which encapsulates Fibers. This class encapsulates the idea of a Fiber in such a way that other implementations can be substituted in in the future. This implementation uses the ucontext family of functions. This change also adds a new unit test which exercises the new class. It creates three new fibers which accept a sequence of other fibers to switch to, one after the other. The main test function switches to the these fibers which switch with each other and occasionally back to the main fiber. Each time a test fiber is activated, it checks against a list which shows the correct order for the fibers to run in. When the main fiber gets control, it makes sure that list has been progressed through by the correct amount. Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a --- M src/base/SConscript A src/base/fiber.cc A src/base/fiber.hh A src/base/fibertest.cc 4 files changed, 395 insertions(+), 0 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10935 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a Gerrit-Change-Number: 10935 Gerrit-PatchSet: 4 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Giacomo Travaglini Gerrit-CC: Jason Lowe-Power Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: base: Add a class which encapsulates Fibers.
Hello Giacomo Travaglini, I'd like you to reexamine a change. Please visit https://gem5-review.googlesource.com/10935 to look at the new patch set (#3). Change subject: base: Add a class which encapsulates Fibers. .. base: Add a class which encapsulates Fibers. This class encapsulates the idea of a Fiber in such a way that other implementations can be substituted in in the future. This implementation uses the ucontext family of functions. This change also adds a new unit test which exercises the new class. It creates three new fibers which accept a sequence of other fibers to switch to, one after the other. The main test function switches to the these fibers which switch with each other and occasionally back to the main fiber. Each time a test fiber is activated, it checks against a list which shows the correct order for the fibers to run in. When the main fiber gets control, it makes sure that list has been progressed through by the correct amount. Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a --- M src/base/SConscript A src/base/fiber.cc A src/base/fiber.hh A src/base/fibertest.cc 4 files changed, 394 insertions(+), 0 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10935 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a Gerrit-Change-Number: 10935 Gerrit-PatchSet: 3 Gerrit-Owner: Gabe Black Gerrit-Reviewer: Gabe Black Gerrit-Reviewer: Giacomo Travaglini Gerrit-CC: Jason Lowe-Power Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
[gem5-dev] Change in gem5/gem5[master]: base: Add a class which encapsulates Fibers.
Gabe Black has uploaded a new patch set (#2). ( https://gem5-review.googlesource.com/10935 ) Change subject: base: Add a class which encapsulates Fibers. .. base: Add a class which encapsulates Fibers. This class encapsulates the idea of a Fiber in such a way that other implementations can be substituted in in the future. This implementation uses the ucontext family of functions. This change also adds a new unit test which exercises the new class. It creates three new fibers which accept a sequence of other fibers to switch to, one after the other. The main test function switches to the these fibers which switch with each other and occasionally back to the main fiber. Each time a test fiber is activated, it checks against a list which shows the correct order for the fibers to run in. When the main fiber gets control, it makes sure that list has been progressed through by the correct amount. Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a --- M src/base/SConscript A src/base/fiber.cc A src/base/fiber.hh A src/base/fibertest.cc 4 files changed, 359 insertions(+), 0 deletions(-) -- To view, visit https://gem5-review.googlesource.com/10935 To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: master Gerrit-Change-Id: I1fc2afa414b51baaa91e350a4ebc791d989f0b8a Gerrit-Change-Number: 10935 Gerrit-PatchSet: 2 Gerrit-Owner: Gabe Black Gerrit-MessageType: newpatchset ___ gem5-dev mailing list gem5-dev@gem5.org http://m5sim.org/mailman/listinfo/gem5-dev
