fix tbb compat

traversc · traversc · commit 0ff991792555 · 2026-03-25T22:34:43.000-07:00
diff --git a/include/io/multithreaded_block_module.h b/include/io/multithreaded_block_module.h
@@ -314,7 +314,7 @@ struct BlockCompressReaderMT {
         OrderedBlock block;
         while( true ) {
             if( sequencer_node.try_get(block) ) {
-                decompressor_limiter_node.decrementer().try_put(tbb::flow::continue_msg{});
+                qio::tbb_compat::decrementer(decompressor_limiter_node).try_put(tbb::flow::continue_msg{});
                 available_blocks.push(current_block);
                 current_block = block.block;
                 current_blocksize = block.blocksize;
diff --git a/include/io/tbb_flow_compat.h b/include/io/tbb_flow_compat.h
@@ -2,32 +2,48 @@
 #define _QIO_TBB_FLOW_COMPAT_H
 
 #include <utility>
-#if __has_include(<tbb/version.h>)
-#include <tbb/version.h>
-#elif __has_include(<oneapi/tbb/version.h>)
-#include <oneapi/tbb/version.h>
-#endif
 #include <tbb/flow_graph.h>
 
+// TBB 2019 exposes only <tbb/flow_graph.h> and uses source_node/decrement.
+// oneTBB ships its canonical flow-graph API under <oneapi/tbb/flow_graph.h>
+// and uses input_node/decrementer(). Probe that header layout instead of
+// version macros: some wrapper headers do not surface TBB_INTERFACE_VERSION,
+// and mixing version headers from different packages can mis-detect the actual
+// flow-graph API in use. Callers can override this probe if they know better.
+#ifndef QIO_TBB_FLOW_USES_INPUT_NODE
+#if defined(__has_include)
+#if __has_include(<oneapi/tbb/flow_graph.h>)
+#define QIO_TBB_FLOW_USES_INPUT_NODE 1
+#else
+#define QIO_TBB_FLOW_USES_INPUT_NODE 0
+#endif
+#else
+#define QIO_TBB_FLOW_USES_INPUT_NODE 0
+#endif
+#endif
+
 namespace qio {
 namespace tbb_compat {
 
-// Normalize old TBB flow-graph source APIs across versions.
+// Normalize the flow-graph API split between classic TBB (interface 11)
+// and oneTBB (interface 12+).
 //
-// Old interface:
+// Classic TBB:
 //   tbb::flow::source_node<T>
+//   limiter_node.decrement
 //   body signature: bool(T & out)
 //
-// Newer interface:
+// oneTBB:
 //   tbb::flow::input_node<T>
+//   limiter_node.decrementer()
 //   body signature: T(tbb::flow_control & fc)
 //
 // Normalized contract used below:
 //   bool(T & out)
 //
 // Return true and fill `out` to emit one message.
 // Return false to stop the node.
-#if defined(TBB_INTERFACE_VERSION) && TBB_INTERFACE_VERSION >= 11102
+#if QIO_TBB_FLOW_USES_INPUT_NODE
 template <class T>
 struct source_node : tbb::flow::input_node<T> {
     using base_type = tbb::flow::input_node<T>;
@@ -43,6 +59,11 @@ struct source_node : tbb::flow::input_node<T> {
         return out;
     }) {}
 };
+
+template <class LimiterNode>
+inline auto & decrementer(LimiterNode & node) {
+    return node.decrementer();
+}
 #else
 template <class T>
 struct source_node : tbb::flow::source_node<T> {
@@ -52,6 +73,11 @@ struct source_node : tbb::flow::source_node<T> {
     source_node(tbb::flow::graph & graph, Body && body) :
     base_type(graph, std::forward<Body>(body), false) {}
 };
+
+template <class LimiterNode>
+inline auto & decrementer(LimiterNode & node) {
+    return node.decrement;
+}
 #endif
 
 } // namespace tbb_compat
