TEST/FC: Fix grant mpool leak when FC is disabled

openucx · Feb 16, 2018 · 647c01a · 647c01a
1 parent cf17d05
commit 647c01a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/test/gtest/uct/ib/test_rc.cc b/test/gtest/uct/ib/test_rc.cc
@@ -77,13 +77,24 @@ void test_rc_flow_control::init()
     }
     test_rc::init();
 
+    ucs_assert(rc_iface(m_e1)->config.fc_enabled);
+    ucs_assert(rc_iface(m_e2)->config.fc_enabled);
+
     uct_iface_set_am_handler(m_e1->iface(), FLUSH_AM_ID, am_handler,
                              NULL, UCT_CB_FLAG_SYNC);
     uct_iface_set_am_handler(m_e2->iface(), FLUSH_AM_ID, am_handler,
                              NULL, UCT_CB_FLAG_SYNC);
 
 }
 
+void test_rc_flow_control::cleanup()
+{
+    /* Restore FC state to enabled, so iface cleanup will destroy the grant mpool */
+    rc_iface(m_e1)->config.fc_enabled = 1;
+    rc_iface(m_e2)->config.fc_enabled = 1;
+    test_rc::cleanup();
+}
+
 void test_rc_flow_control::send_am_and_flush(entity *e, int num_msg)
 {
     m_am_rx_count = 0;

diff --git a/test/gtest/uct/ib/test_rc.h b/test/gtest/uct/ib/test_rc.h
@@ -60,6 +60,7 @@ class test_rc_flow_control : public test_rc {
     } pending_send_request_t;
 
     void init();
+    void cleanup();
 
     virtual uct_rc_fc_t* get_fc_ptr(entity *e, int ep_idx = 0) {
         return &rc_ep(e, ep_idx)->fc;
@@ -87,7 +88,7 @@ class test_rc_flow_control : public test_rc {
 
     void set_fc_disabled(entity *e) {
         /* same as default settings in rc_iface_init */
-        set_fc_attributes(m_e1, false, std::numeric_limits<int16_t>::max(), 0, 0);
+        set_fc_attributes(e, false, std::numeric_limits<int16_t>::max(), 0, 0);
     }
 
     void send_am_and_flush(entity *e, int num_msg);