UCP/NBX: fixed external request free from CB

- fixed tests hang
openucx · Dec 10, 2020 · f7e6def · f7e6def
1 parent 87e8f52
commit f7e6def
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/ucp/core/ucp_request.inl b/src/ucp/core/ucp_request.inl
@@ -64,14 +64,14 @@
 
 #define ucp_request_complete(_req, _cb, _status, ...) \
     { \
-        uint32_t _external = (_req)->flags & UCP_REQUEST_FLAG_EXTERNAL; \
+        uint32_t _external = ((_req)->flags |= UCP_REQUEST_FLAG_COMPLETED) & \
+                             UCP_REQUEST_FLAG_EXTERNAL; \
         (_req)->status = (_status); \
         if (ucs_likely((_req)->flags & UCP_REQUEST_FLAG_CALLBACK)) { \
             (_req)->_cb((_req) + 1, (_status), ## __VA_ARGS__); \
         } \
         if (ucs_unlikely(!_external && \
-                         ((_req)->flags |= UCP_REQUEST_FLAG_COMPLETED) & \
-                         UCP_REQUEST_FLAG_RELEASED)) { \
+                         (_req)->flags & UCP_REQUEST_FLAG_RELEASED)) { \
             ucp_request_put(_req); \
         } \
     }