Merge pull request #7131 from hoopoepg/topic/ucp-request-clean-in-debug

UCP/REQUEST: added fake callback into request_put
openucx · Jul 21, 2021 · 0456074 · 0456074
2 parents e6a1abf + c64666a
commit 0456074
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/ucp/core/ucp_request.inl b/src/ucp/core/ucp_request.inl
@@ -171,6 +171,18 @@
     }
 
 
+#if UCS_ENABLE_ASSERT
+#  define UCP_REQUEST_RESET(_req) \
+    (_req)->send.uct.func = \
+            (uct_pending_callback_t)ucs_empty_function_do_assert; \
+    (_req)->send.state.uct_comp.func  = \
+            (uct_completion_callback_t)ucs_empty_function_do_assert_void; \
+    (_req)->send.state.uct_comp.count = 0;
+#else /* UCS_ENABLE_ASSERT */
+#  define UCP_REQUEST_RESET(_req)
+#endif /* UCS_ENABLE_ASSERT */
+
+
 static UCS_F_ALWAYS_INLINE void ucp_request_id_reset(ucp_request_t *req)
 {
     req->id = UCS_PTR_MAP_KEY_INVALID;
@@ -190,6 +202,7 @@ ucp_request_put(ucp_request_t *req)
     ucs_trace_req("put request %p", req);
     ucp_request_id_check(req, ==, UCS_PTR_MAP_KEY_INVALID);
     UCS_PROFILE_REQUEST_FREE(req);
+    UCP_REQUEST_RESET(req);
     ucs_mpool_put_inline(req);
 }
 

diff --git a/src/ucs/sys/stubs.c b/src/ucs/sys/stubs.c
@@ -96,3 +96,8 @@ int ucs_empty_function_do_assert()
     ucs_assert_always(0);
     return 0;
 }
+
+void ucs_empty_function_do_assert_void()
+{
+    ucs_assert_always(0);
+}
diff --git a/src/ucs/sys/stubs.h b/src/ucs/sys/stubs.h
@@ -37,6 +37,7 @@ ucs_status_t ucs_empty_function_return_ep_timeout();
 ssize_t ucs_empty_function_return_bc_ep_timeout();
 ucs_status_t ucs_empty_function_return_busy();
 int ucs_empty_function_do_assert();
+void ucs_empty_function_do_assert_void();
 
 END_C_DECLS