move set_selector

Signed-off-by: Hoooao <hao021014@163.com>

Author: Hoooao

include/bm/bm_sim/action_profile.h

@@ -297,10 +297,6 @@ class ActionProfile : public NamedP4Object {
 
   bool group_is_empty(grp_hdl_t grp) const;
 
-  bool is_selector_fanout_enabled() const {
-    return selector_fanout_enabled;
-  }
-
   const ActionEntry &lookup(const Packet &pkt,
                             const IndirectIndex &index) const;
 
@@ -317,7 +313,6 @@ class ActionProfile : public NamedP4Object {
   std::shared_ptr<GroupSelectionIface> grp_selector_{nullptr};
   GroupSelectionIface *grp_selector{&grp_mgr};
   std::unique_ptr<Calculation> hash{nullptr};
-  bool selector_fanout_enabled{false};
 };
 
 }  // namespace bm

include/bm/bm_sim/fanout_pkt_mgr.h

@@ -70,35 +70,39 @@ class FanoutPktMgr {
       return instance_;
     }
 
-    inline void register_thread(std::thread::id thread_id,
-          const std::function<void(const bm::Packet *)> &buffer_push_fn) {
-      BMLOG_DEBUG("Registering thread {}", thread_id);
-      fanout_ctx_map.emplace(thread_id, FanoutCtx(buffer_push_fn));
-    }
-    inline SelectorIface* get_grp_selector() {
-      return grp_selector;
-    }
-
     FanoutCtx& get_fanout_ctx();
     void set_ctx(MatchTableIndirect *table, const Packet &pkt,
                  ActionProfile *action_profile, bool hit);
     void reset_ctx();
     void replicate_for_entries(const std::vector<const ActionEntry*> &entries);
 
+    // PI overwrite selector specified during P4Object init,
+    // so we need to set the selector in switch start_and_return_
+    void set_grp_selector() {
+      for (const auto &ap : act_profs) {
+        ap->set_group_selector(grp_selector);
+      }
+    }
+    inline void register_thread(std::thread::id thread_id,
+      const std::function<void(const bm::Packet *)> &buffer_push_fn) {
+      BMLOG_DEBUG("Registering thread {}", thread_id);
+      fanout_ctx_map.emplace(thread_id, FanoutCtx(buffer_push_fn));
+    }
+
+    // TODO(Hao): deduplicate packets fanout, optional
 #ifdef BM_PKT_FANOUT_ON
     static constexpr bool pkt_fanout_on = true;
 #else
     static constexpr bool pkt_fanout_on = false;
 #endif
     std::mutex fanout_pkt_mutex;
-    // TODO(Hao): deduplicate packets fanout, optional
-
-
+    std::vector<ActionProfile*> act_profs;
+    
  private:
     FanoutPktMgr() = default;
     std::unordered_map<std::thread::id, FanoutCtx> fanout_ctx_map;
-    FanoutPktSelection fanout_selection;
-    SelectorIface* grp_selector{&fanout_selection};
+    std::shared_ptr<SelectorIface> 
+    grp_selector{std::make_shared<FanoutPktSelection>()};
 };
 
 }  // namespace bm

src/bm_sim/P4Objects.cpp

@@ -1659,6 +1659,7 @@ P4Objects::init_pipelines(const Json::Value &cfg_root,
       if (with_selection) {
         if (is_selector_fanout(cfg_act_prof["selector"])) {
           action_profile->set_selector_fanout();
+          FanoutPktMgr::instance().act_profs.push_back(action_profile.get());
         } else {
           auto calc = process_cfg_selector(cfg_act_prof["selector"]);
           action_profile->set_hash(std::move(calc));

src/bm_sim/action_profile.cpp

@@ -638,18 +638,9 @@ ActionProfile::ref_count_decrease(const IndirectIndex &index) {
 
 ActionProfile::mbr_hdl_t
 ActionProfile::choose_from_group(grp_hdl_t grp, const Packet &pkt) const {
-  // TODO(Hao): PI resets to it own grp_selector, might be a bug, so I just sets
-  //  here for now..
-  if (FanoutPktMgr::pkt_fanout_on && selector_fanout_enabled) {
-    return FanoutPktMgr::instance().get_grp_selector()->get_from_hash(grp, 0);
-  }
   if (!hash) return grp_selector->get_from_hash(grp, 0);
   hash_t h = static_cast<hash_t>(hash->output(pkt));
   return grp_selector->get_from_hash(grp, h);
 }
 
-void ActionProfile::set_selector_fanout() {
-  selector_fanout_enabled = true;
-}
-
 }  // namespace bm

targets/simple_switch/simple_switch.cpp

@@ -279,6 +279,7 @@ void
 SimpleSwitch::start_and_return_() {
   check_queueing_metadata();
   if (FanoutPktMgr::pkt_fanout_on) {
+    FanoutPktMgr::instance().set_grp_selector();
     auto ingress_thread = std::thread(&SimpleSwitch::ingress_thread, this);
     FanoutPktMgr::instance().register_thread(
         ingress_thread.get_id(), [&](const bm::Packet *pkt) {