-
Notifications
You must be signed in to change notification settings - Fork 10
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace Direct with Inline which can be controlled at both ends (#143)
Emit DIRECT was sometimes hard to work with as the other end may not want to be executed inline, or the other end may always want to be executed inline. This replaces DIRECT with INLINE which has DSL words at both ends. This way a Log handler can run in a separate thread rather than executing inline where the log line happens. Or alternatively the on functions that interact with DSL bindings can themselves specify that they should be executed inline in the current thread.
- Loading branch information
1 parent
8a18e32
commit 5ff730b
Showing
35 changed files
with
551 additions
and
99 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2014 NUClear Contributors | ||
| * | ||
| * This file is part of the NUClear codebase. | ||
| * See https://github.com/Fastcode/NUClear for further info. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the | ||
| * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to | ||
| * permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the | ||
| * Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE | ||
| * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR | ||
| * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| */ | ||
|
|
||
| #ifndef NUCLEAR_DSL_FUSION_INLINABLE_FUSION_HPP | ||
| #define NUCLEAR_DSL_FUSION_INLINABLE_FUSION_HPP | ||
|
|
||
| #include "../../threading/ReactionTask.hpp" | ||
| #include "../../util/Inline.hpp" | ||
| #include "../operation/DSLProxy.hpp" | ||
| #include "FindWords.hpp" | ||
| #include "has_run_inline.hpp" | ||
|
|
||
| namespace NUClear { | ||
| namespace dsl { | ||
| namespace fusion { | ||
|
|
||
| // Default case where there are no Inline words | ||
| template <typename Words> | ||
| struct InlineFuser {}; | ||
|
|
||
| // Case where there is only a single word remaining | ||
| template <typename Word> | ||
| struct InlineFuser<std::tuple<Word>> { | ||
|
|
||
| template <typename DSL> | ||
| static util::Inline run_inline(threading::ReactionTask& task) { | ||
|
|
||
| // Run our remaining run_inline | ||
| return Word::template run_inline<DSL>(task); | ||
| } | ||
| }; | ||
|
|
||
| // Case where there is more 2 more more words remaining | ||
| template <typename Word1, typename Word2, typename... WordN> | ||
| struct InlineFuser<std::tuple<Word1, Word2, WordN...>> { | ||
|
|
||
| template <typename DSL> | ||
| static util::Inline run_inline(threading::ReactionTask& task) { | ||
| auto a = Word1::template run_inline<DSL>(task); | ||
| auto b = InlineFuser<std::tuple<Word2, WordN...>>::template run_inline<DSL>(task); | ||
|
|
||
| // Must agree or make a choice | ||
| if ((a == util::Inline::ALWAYS && b == util::Inline::NEVER) | ||
| || (a == util::Inline::NEVER && b == util::Inline::ALWAYS)) { | ||
| throw std::logic_error("Cannot both always and never inline a reaction"); | ||
| } | ||
|
|
||
| // Otherwise return the one that made a choice | ||
| return a == util::Inline::NEUTRAL ? b : a; | ||
| } | ||
| }; | ||
|
|
||
| template <typename Word1, typename... WordN> | ||
| struct InlineFusion : InlineFuser<FindWords<has_run_inline, Word1, WordN...>> {}; | ||
|
|
||
| } // namespace fusion | ||
| } // namespace dsl | ||
| } // namespace NUClear | ||
|
|
||
| #endif // NUCLEAR_DSL_FUSION_INLINABLE_FUSION_HPP |
Oops, something went wrong.