From: Dongju Chae <dongju.chae@samsung.com>
Date: Wed, 17 Nov 2021 02:31:49 +0000 (+0900)
Subject: [FIX] Reset callback in advance
X-Git-Tag: submit/tizen/20220103.094045~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18b96b40cebb9879479ffaa696902b810bff77a9;p=platform%2Fadaptation%2Fnpu%2Ftrix-engine.git

[FIX] Reset callback in advance

This patch resets a blocking request's callback before calling its
callback.

Signed-off-by: Dongju Chae <dongju.chae@samsung.com>
---

diff --git a/src/core/ne-scheduler.cc b/src/core/ne-scheduler.cc
index 2acef27..1eb25ce 100644
--- a/src/core/ne-scheduler.cc
+++ b/src/core/ne-scheduler.cc
@@ -157,6 +157,10 @@ Scheduler::handleCallback (Request *req) {
   outputCallback callback = req->getCallback ();
 
   req->setSubmitted (false);
+  if (req->getInferMode () == NPU_INFER_BLOCKING) {
+    /* remove the internal callback for next submissions */
+    req->setCallback (nullptr);
+  }
 
   if (!req->isStopped () && callback != nullptr)
     callback ();
@@ -164,9 +168,6 @@ Scheduler::handleCallback (Request *req) {
   if (!req->isPreserved ()) {
     /* the request instance is also deleted here */
     removeRequest (req);
-  } else if (req->getInferMode () == NPU_INFER_BLOCKING) {
-    /* remove the internal callback for next submissions */
-    req->setCallback (nullptr);
   }
 }