[sm,launcher] Setup instance monitoring before instance is started

Signed-off-by: Mykhailo Lohvynenko <[email protected]>
aosedge · Jan 31, 2025 · ec4530d · ec4530d
1 parent da033c6
commit ec4530d
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/sm/launcher/instance.cpp b/src/sm/launcher/instance.cpp
@@ -119,18 +119,24 @@ Error Instance::Start()
         return err;
     }
 
+    if (auto err = SetupMonitoring(); !err.IsNone()) {
+        return AOS_ERROR_WRAP(err);
+    }
+
     auto runStatus = mRunner.StartInstance(mInstanceID, mRuntimeDir, {});
 
+    auto onExit = DeferRelease(&runStatus, [this](runner::RunStatus* runStatus) {
+        if (!runStatus->mError.IsNone()) {
+            mResourceMonitor.StopInstanceMonitoring(mInstanceID);
+        }
+    });
+
     mRunState = runStatus.mState;
 
     if (!runStatus.mError.IsNone()) {
         return AOS_ERROR_WRAP(runStatus.mError);
     }
 
-    if (auto err = SetupMonitoring(); !err.IsNone()) {
-        return err;
-    }
-
     return ErrorEnum::eNone;
 }