resolve comments

Author: richardhuo-nv

src/infer_payload.cc

@@ -32,7 +32,6 @@ InferPayload::InferPayload(
     const bool is_decoupled,
     std::function<void(std::unique_ptr<InferResponse>)> callback)
     : is_decoupled_(is_decoupled), is_promise_set_(false), callback_(callback),
-      is_request_deleted_(false),
       request_address_(reinterpret_cast<intptr_t>(nullptr))
 {
   promise_.reset(new std::promise<std::unique_ptr<InferResponse>>());
@@ -96,22 +95,10 @@ InferPayload::ResponseAllocUserp()
 void
 InferPayload::SetRequestAddress(intptr_t request_address)
 {
+  std::unique_lock<std::mutex> lock(request_address_mutex_);
   request_address_ = request_address;
 }
 
-intptr_t
-InferPayload::GetRequestAddress()
-{
-  return request_address_;
-}
-
-void
-InferPayload::SetRequestDeleted()
-{
-  std::unique_lock<std::mutex> lock(request_deletion_mutex_);
-  is_request_deleted_ = true;
-}
-
 void
 InferPayload::SetRequestCancellationFunc(
     const std::function<void(intptr_t)>& request_cancel_func)
@@ -122,11 +109,7 @@ InferPayload::SetRequestCancellationFunc(
 void
 InferPayload::SafeCancelRequest()
 {
-  std::unique_lock<std::mutex> lock(request_deletion_mutex_);
-  if (is_request_deleted_) {
-    return;
-  }
-
+  std::unique_lock<std::mutex> lock(request_address_mutex_);
   if (request_address_ == 0L) {
     return;
   }

src/infer_payload.h

@@ -62,9 +62,7 @@ class InferPayload : public std::enable_shared_from_this<InferPayload> {
   void SetResponseAllocUserp(
       const ResponseAllocatorUserp& response_alloc_userp);
   std::shared_ptr<ResponseAllocatorUserp> ResponseAllocUserp();
-  void SetRequestDeleted();
   void SetRequestAddress(intptr_t request_address);
-  intptr_t GetRequestAddress();
   void SetRequestCancellationFunc(
       const std::function<void(intptr_t)>& request_cancel_func);
   void SafeCancelRequest();
@@ -76,8 +74,7 @@ class InferPayload : public std::enable_shared_from_this<InferPayload> {
   bool is_promise_set_;
   std::function<void(std::unique_ptr<InferResponse>)> callback_;
   std::shared_ptr<ResponseAllocatorUserp> response_alloc_userp_;
-  std::mutex request_deletion_mutex_;
-  bool is_request_deleted_;
+  std::mutex request_address_mutex_;
   intptr_t request_address_;
   std::function<void(intptr_t)> request_cancel_func_;
 };

src/request_executor.cc

@@ -71,7 +71,7 @@ InferRequestComplete(
   if (request != nullptr) {
     RequestCompletionUserp* completion_userp =
         reinterpret_cast<RequestCompletionUserp*>(userp);
-    completion_userp->infer_payload->SetRequestDeleted();
+    completion_userp->infer_payload->SetRequestAddress(0L);
 
     LOG_IF_ERROR(
         TRITONSERVER_InferenceRequestDelete(request),