Skip to content

Commit 43a3008

Browse files
committed
remove limiter
1 parent 3fc4be7 commit 43a3008

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

include/io/multithreaded_block_module.h

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,6 @@ struct BlockCompressWriterMT {
217217

218218
template <class stream_reader, class decompressor, class error_policy>
219219
struct BlockCompressReaderMT {
220-
static constexpr std::size_t read_inflight_limit = 12;
221-
222220
stream_reader & myFile;
223221
tbb::enumerable_thread_specific<decompressor> dp;
224222
xxHashEnv hp;
@@ -237,7 +235,6 @@ struct BlockCompressReaderMT {
237235
tbb::task_group_context tgc;
238236
tbb::flow::graph myGraph;
239237
qio::tbb_compat::source_node<OrderedBlock> reader_node;
240-
tbb::flow::limiter_node<OrderedBlock> decompressor_limiter_node;
241238
tbb::flow::function_node<OrderedBlock, OrderedBlock> decompressor_node;
242239
tbb::flow::sequencer_node<OrderedBlock> sequencer_node;
243240
BlockCompressReaderMT(stream_reader & f) :
@@ -258,7 +255,6 @@ struct BlockCompressReaderMT {
258255
[this](OrderedBlock & zblock) {
259256
return read_next_zblock(zblock);
260257
}),
261-
decompressor_limiter_node(this->myGraph, read_inflight_limit),
262258
decompressor_node(this->myGraph, tbb::flow::unlimited,
263259
[this](OrderedBlock zblock) {
264260
typename tbb::enumerable_thread_specific<decompressor>::reference dp_local = dp.local();
@@ -281,8 +277,7 @@ struct BlockCompressReaderMT {
281277
return block.blocknumber;
282278
})
283279
{
284-
tbb::flow::make_edge(reader_node, decompressor_limiter_node);
285-
tbb::flow::make_edge(decompressor_limiter_node, decompressor_node);
280+
tbb::flow::make_edge(reader_node, decompressor_node);
286281
tbb::flow::make_edge(decompressor_node, sequencer_node);
287282
reader_node.activate();
288283
}
@@ -314,7 +309,6 @@ struct BlockCompressReaderMT {
314309
OrderedBlock block;
315310
while( true ) {
316311
if( sequencer_node.try_get(block) ) {
317-
qio::tbb_compat::decrementer(decompressor_limiter_node).try_put(tbb::flow::continue_msg{});
318312
available_blocks.push(current_block);
319313
current_block = block.block;
320314
current_blocksize = block.blocksize;

0 commit comments

Comments
 (0)