diff --git a/src/libraries/JANA/Engine/JPerfSummary.cc b/src/libraries/JANA/Engine/JPerfSummary.cc index a82a7435c..8774ca488 100644 --- a/src/libraries/JANA/Engine/JPerfSummary.cc +++ b/src/libraries/JANA/Engine/JPerfSummary.cc @@ -24,9 +24,9 @@ std::ostream& operator<<(std::ostream& os, const JPerfSummary& s) { os << " Efficiency [0..1]: " << std::setprecision(3) << s.avg_efficiency_frac << std::endl; os << std::endl; - os << " +--------------------------+--------+-----+---------+--------+---------+-------------+" << std::endl; - os << " | Name | Type | Par | Threads | Thresh | Pending | Completed |" << std::endl; - os << " +--------------------------+--------+-----+---------+--------+---------+-------------+" << std::endl; + os << " +--------------------------+--------+-----+---------+---------+-------------+" << std::endl; + os << " | Name | Type | Par | Threads | Pending | Completed |" << std::endl; + os << " +--------------------------+--------+-----+---------+---------+-------------+" << std::endl; for (auto as : s.arrows) { os << " | " @@ -37,17 +37,15 @@ std::ostream& operator<<(std::ostream& os, const JPerfSummary& s) { if (!as.is_source) { - os << std::setw(7) << as.threshold << " |" - << std::setw(8) << as.messages_pending << " |"; + os << std::setw(8) << as.messages_pending << " |"; } else { - - os << " - | - |"; + os << " - |"; } os << std::setw(12) << as.total_messages_completed << " |" << std::endl; } - os << " +--------------------------+--------+-----+---------+--------+---------+-------------+" << std::endl; + os << " +--------------------------+--------+-----+---------+---------+-------------+" << std::endl; os << " +--------------------------+-------------+--------------+----------------+--------------+----------------+" << std::endl; diff --git a/src/libraries/JANA/Engine/JPerfSummary.h b/src/libraries/JANA/Engine/JPerfSummary.h index ed45c1acd..71ee2c75e 100644 --- a/src/libraries/JANA/Engine/JPerfSummary.h +++ b/src/libraries/JANA/Engine/JPerfSummary.h @@ -16,7 +16,6 @@ struct ArrowSummary { int running_upstreams; bool has_backpressure; size_t messages_pending; - size_t threshold; size_t total_messages_completed; size_t last_messages_completed; diff --git a/src/libraries/JANA/Engine/JScheduler.cc b/src/libraries/JANA/Engine/JScheduler.cc index 2d5ee6016..bbae230c9 100644 --- a/src/libraries/JANA/Engine/JScheduler.cc +++ b/src/libraries/JANA/Engine/JScheduler.cc @@ -411,7 +411,6 @@ void JScheduler::summarize_arrows(std::vector& summaries) { summary.is_source = as.arrow->is_source(); summary.is_sink = as.arrow->is_sink(); summary.messages_pending = as.arrow->get_pending(); - summary.threshold = as.arrow->get_threshold(); summary.thread_count = as.thread_count; summary.running_upstreams = as.active_or_draining_upstream_arrow_count; diff --git a/src/libraries/JANA/Topology/JArrow.h b/src/libraries/JANA/Topology/JArrow.h index 8cd21af95..f47c7329d 100644 --- a/src/libraries/JANA/Topology/JArrow.h +++ b/src/libraries/JANA/Topology/JArrow.h @@ -73,11 +73,6 @@ class JArrow { // TODO: Make no longer virtual virtual size_t get_pending(); - // TODO: Get rid of me - virtual size_t get_threshold(); - - virtual void set_threshold(size_t /* threshold */); - void attach(JArrow* downstream) { m_listeners.push_back(downstream); }; @@ -109,8 +104,6 @@ struct PlaceRefBase { size_t max_item_count = 1; virtual size_t get_pending() { return 0; } - virtual size_t get_threshold() { return 0; } - virtual void set_threshold(size_t) {} }; template @@ -145,23 +138,6 @@ struct PlaceRef : public PlaceRefBase { return 0; } - size_t get_threshold() override { - assert(place_ref != nullptr); - if (is_input && is_queue) { - auto queue = static_cast*>(place_ref); - return queue->get_threshold(); - } - return -1; - } - - void set_threshold(size_t threshold) override { - assert(place_ref != nullptr); - if (is_input && is_queue) { - auto queue = static_cast*>(place_ref); - queue->set_threshold(threshold); - } - } - bool pull(Data& data) { assert(place_ref != nullptr); if (is_input) { // Actually pull the data @@ -236,19 +212,4 @@ inline size_t JArrow::get_pending() { return sum; } -inline size_t JArrow::get_threshold() { - size_t result = -1; - for (PlaceRefBase* place : m_places) { - result = std::min(result, place->get_threshold()); - } - return result; - -} - -inline void JArrow::set_threshold(size_t threshold) { - for (PlaceRefBase* place : m_places) { - place->set_threshold(threshold); - } -} - diff --git a/src/libraries/JANA/Topology/JSubeventArrow.h b/src/libraries/JANA/Topology/JSubeventArrow.h index e90648b1e..8aeab67db 100644 --- a/src/libraries/JANA/Topology/JSubeventArrow.h +++ b/src/libraries/JANA/Topology/JSubeventArrow.h @@ -63,9 +63,6 @@ class JSubeventArrow : public JArrow { } size_t get_pending() final { return m_inbox->size(); }; - size_t get_threshold() final { return m_inbox->get_threshold(); }; - void set_threshold(size_t threshold) final { m_inbox->set_threshold(threshold);}; - void execute(JArrowMetrics&, size_t location_id) override; }; @@ -83,9 +80,6 @@ class JSplitArrow : public JArrow { } size_t get_pending() final { return m_inbox->size(); }; - size_t get_threshold() final { return m_inbox->get_threshold(); }; - void set_threshold(size_t threshold) final { m_inbox->set_threshold(threshold);}; - void execute(JArrowMetrics&, size_t location_id) override; }; @@ -104,8 +98,6 @@ class JMergeArrow : public JArrow { } size_t get_pending() final { return m_inbox->size(); }; - size_t get_threshold() final { return m_inbox->get_threshold(); }; - void set_threshold(size_t threshold) final { m_inbox->set_threshold(threshold);}; void execute(JArrowMetrics&, size_t location_id) override; }; diff --git a/src/programs/unit_tests/Topology/MapArrow.h b/src/programs/unit_tests/Topology/MapArrow.h index 81790a5ef..6b3147345 100644 --- a/src/programs/unit_tests/Topology/MapArrow.h +++ b/src/programs/unit_tests/Topology/MapArrow.h @@ -81,10 +81,6 @@ class MapArrow : public JArrow { } size_t get_pending() final { return _input_queue->size(); } - - size_t get_threshold() final { return _input_queue->get_threshold(); } - - void set_threshold(size_t threshold) final { _input_queue->set_threshold(threshold); } };