Core: rework Tag handling #340
Conversation
|
wirew0rm
force-pushed
the
BlockTagHandling
branch
from
d934665
to
cee286c
Compare
wirew0rm
force-pushed
the
BlockTagHandling
branch
from
cee286c
to
a2e4a1f
Compare
wirew0rm
force-pushed
the
BlockTagHandling
branch
5 times, most recently
from
b86b95a
to
89fa406
Compare
wirew0rm
force-pushed
the
BlockTagHandling
branch
from
89fa406
to
c91b8d7
Compare
| @@ -311,6 +311,12 @@ struct DummyConsumableSpan { | |||
| }; | |||
| static_assert(ConsumableSpan<DummyConsumableSpan<int>>); | |||
|
|
|||
| template<typename T> | |||
| struct DummyConsumablePortSpan: public DummyConsumableSpan<T> { | |||
There was a problem hiding this comment.
The tags etc should be absorbed in the concept ConsumableSpan etc.
There was a problem hiding this comment.
I'm not sure I understand.
There are 2 concepts ConsumableSpan(no tag handling) and ConsumablePortSpan(the former + added tag handling). DummyConsumableSpan and DummyConsumablePortSpan are mock implementations of the respective concepts needed by the machinery of Block::prepareStreams.
wirew0rm
force-pushed
the
BlockTagHandling
branch
5 times, most recently
from
a784c5e
to
ff97be4
Compare
There was a problem hiding this comment.
Thanks for the great PR and all your effort in making all the unit tests run smoothly. 👍
The changes look good to me. We’ve already discussed some modifications privately, and I worked with this update while attempting to fix a failing test!
I’ve added a few minor comments and suggestions for improvements. The PR can be merged after reviewing the comments.
wirew0rm
force-pushed
the
BlockTagHandling
branch
2 times, most recently
from
f294593
to
9c28ab0
Compare
The automatic tag forwarding implemented in Block::workInternal was was not working for ASYNC ports since in this case the Block cannot determine a priori if samples will be consumed and consequently cannot perform an early return ahead of the unconditional tag forwarding and consumption. This change introduces an extension of the ConsumableInputRange, which additionally takes care of consuming all tags up to the first sample of the currently processed chunk. Also all tag merging logic is moved from Port to Block, while the logic for preparing the consumableInput or producableOutput ranges is moved into the Port. Only forward initial tags before starting the flowgraph instead of during initialisation, when the buffers are not connected yet. In CircularBuffer, make PublishableOutputRange pubblish in destructor This makes the PublishableOutputRange behave like the corresponding InputRange by only marking samples for being published and only publishing in the destructor. Evaluate actually processed samples after process bulk was called. Add port unittest and fix off by one problem Change sequence from -1 to 0 to avoid tag offset Signed-off-by: Alexander Krimm <[email protected]>
Signed-off-by: Alexander Krimm <[email protected]>
wirew0rm
force-pushed
the
BlockTagHandling
branch
from
9c28ab0
to
159bc1f
Compare
|
The automatic tag forwarding implemented in Block::workInternal was was not working for ASYNC ports since in this case the Block cannot determine a priori if samples will be consumed and consequently cannot perform an early return ahead of the unconditional tag forwarding and consumption.
This change introduces an extension of the ConsumableInputRange, which additionally takes care of consuming all tags up to the first sample of the currently processed chunk.
Also all tag merging logic is moved from Port to Block, while the logic for preparing the consumableInput or producableOutput ranges is moved into the Port.