[sm,launcher] Use list to store current instances instead of array

During process instances (namely stop instances) concurrently, we remove instances from array. It leads to array rearrangement, as result currently processed instances may point to wrong place. Use list instead of array to avoid this issue. Signed-off-by: Oleksandr Grytsov <[email protected]>
aosedge · Jan 30, 2025 · 12f45f9 · 12f45f9
1 parent 96b4ac6
commit 12f45f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/include/aos/sm/launcher.hpp b/include/aos/sm/launcher.hpp
@@ -14,7 +14,7 @@
 #include "aos/common/connectionsubsc.hpp"
 #include "aos/common/monitoring/monitoring.hpp"
 #include "aos/common/ocispec/ocispec.hpp"
-#include "aos/common/tools/map.hpp"
+#include "aos/common/tools/list.hpp"
 #include "aos/common/tools/noncopyable.hpp"
 #include "aos/common/types.hpp"
 #include "aos/sm/config.hpp"
@@ -391,7 +391,7 @@ class Launcher : public LauncherItf,
             [&serviceID](const servicemanager::ServiceData& service) { return serviceID == service.mServiceID; });
     }
 
-    Instance* GetInstance(const String& instanceID)
+    List<Instance>::Iterator GetInstance(const String& instanceID)
     {
         return mCurrentInstances.FindIf(
             [&instanceID](const Instance& instance) { return instanceID == instance.InstanceID(); });
@@ -423,7 +423,7 @@ class Launcher : public LauncherItf,
     mutable ConditionalVariable mCondVar;
 
     StaticArray<servicemanager::ServiceData, cMaxNumServices> mCurrentServices;
-    StaticArray<Instance, cMaxNumInstances>                   mCurrentInstances;
+    StaticList<Instance, cMaxNumInstances>                    mCurrentInstances;
     cloudprotocol::EnvVarsInstanceInfoArray                   mCurrentEnvVars;
     StaticString<cFilePathLen>                                mHostWhiteoutsDir;
     NodeInfo                                                  mNodeInfo;

diff --git a/include/aos/sm/launcher/instance.hpp b/include/aos/sm/launcher/instance.hpp
@@ -132,11 +132,6 @@ class RuntimeItf {
  */
 class Instance {
 public:
-    /**
-     * Creates instance.
-     */
-    Instance() = default;
-
     /**
      * Creates instance.
      *

diff --git a/src/sm/launcher/launcher.cpp b/src/sm/launcher/launcher.cpp
@@ -870,7 +870,7 @@ Error Launcher::StartInstance(const InstanceData& info)
             return AOS_ERROR_WRAP(err);
         }
 
-        instance = &mCurrentInstances[mCurrentInstances.Size() - 1];
+        instance = &mCurrentInstances.Back();
 
         auto service = GetService(info.mInstanceInfo.mInstanceIdent.mServiceID);
         if (service == mCurrentServices.end()) {
@@ -906,7 +906,7 @@ Error Launcher::StartInstance(const InstanceData& info)
 
 Error Launcher::StopInstance(const String& instanceID)
 {
-    Instance* instance = nullptr;
+    List<Instance>::Iterator instance;
 
     {
         LockGuard lock {mMutex};