Auto send response complete final upon response sender destruction

triton-inference-server · Oct 4, 2023 · cac2f2f · cac2f2f
1 parent 3a43ef3
commit cac2f2f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/response_sender.cc b/src/response_sender.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// Copyright 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -45,6 +45,12 @@ ResponseSender::ResponseSender(
 {
 }
 
+ResponseSender::~ResponseSender()
+{
+  if (request_address_ != 0 && response_factory_address_ != 0 && !closed_) {
+    Send(nullptr, TRITONSERVER_RESPONSE_COMPLETE_FINAL);
+  }
+}
 
 void
 ResponseSender::Send(
@@ -189,11 +195,7 @@ ResponseSender::Send(
 bool
 ResponseSender::IsCancelled()
 {
-  bool is_cancelled = pb_cancel_->IsCancelled();
-  if (is_cancelled && !closed_) {
-    Send(nullptr, TRITONSERVER_RESPONSE_COMPLETE_FINAL);
-  }
-  return is_cancelled;
+  return pb_cancel_->IsCancelled();
 }
 
 }}}  // namespace triton::backend::python
diff --git a/src/response_sender.h b/src/response_sender.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// Copyright 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions
@@ -38,6 +38,7 @@ class ResponseSender {
       intptr_t request_address, intptr_t response_factory_address,
       std::unique_ptr<SharedMemoryManager>& shm_pool,
       const std::shared_ptr<PbCancel>& pb_cancel);
+  ~ResponseSender();
   void Send(std::shared_ptr<InferResponse> response, const uint32_t flags);
   bool IsCancelled();