LoadPacks without context (#1255)

Does not require global ContextItem
Clear() is added to ProjMgr

Author: edriouk

tools/projmgr/include/ProjMgr.h

@@ -57,6 +57,11 @@ class ProjMgr {
   */
   ProjMgrWorker& GetWorker() { return m_worker; };
 
+  /**
+   * @brief clear internal structures and worker object
+  */
+  void Clear();
+
   /**
    * @brief load solution
    * @param path to <solution>.csolution.yml file

tools/projmgr/include/ProjMgrWorker.h

@@ -269,7 +269,7 @@ struct ValidationResult {
   std::vector<ValidationCondition> conditions;
 };
 
-/** 
+/**
  * @brief gdb server item containing
  *        port number of processor
  *        processor name
@@ -922,7 +922,7 @@ class ProjMgrWorker {
     }
     m_contexts.clear();
     m_ymlOrderedContexts.clear();
-    m_contextsPtr->clear();
+    m_contexts.clear();
     m_contextErrMap.clear();
     m_selectedContexts.clear();
     m_outputDir.clear();
@@ -951,7 +951,6 @@ class ProjMgrWorker {
   std::map<std::string, StrMap> m_regToolchainsEnvVars;
   std::vector<std::string> m_ymlOrderedContexts;
   std::map<std::string, ContextItem> m_contexts;
-  std::map<std::string, ContextItem>* m_contextsPtr;
   std::map<std::string, std::set<std::string>> m_contextErrMap;
   std::vector<std::string> m_selectedContexts;
   std::string m_outputDir;

tools/projmgr/src/ProjMgr.cpp

@@ -1170,14 +1170,16 @@ const string ProjMgr::GetToolboxVersion(const string& toolboxDir) {
   return matchResult[1].str();
 }
 
+void ProjMgr::Clear() {
+  m_parser.Clear();
+  m_extGenerator.Clear();
+  m_worker.Clear();
+  m_runDebug.Clear();
+  ProjMgrLogger::Get().Clear();
+}
+
 bool ProjMgr::LoadSolution(const std::string& csolution) {
-  if (!m_csolutionFile.empty()) {
-    m_parser.Clear();
-    m_extGenerator.Clear();
-    m_worker.Clear();
-    m_runDebug.Clear();
-    ProjMgrLogger::Get().Clear();
-  }
+  Clear();
 
   m_csolutionFile = csolution;
   m_rootDir = RteUtils::ExtractFilePath(m_csolutionFile, false);

tools/projmgr/src/ProjMgrRpcServer.cpp

@@ -220,10 +220,13 @@ RpcArgs::UsedItems RpcHandler::GetUsedItems(const string& context) {
 }
 
 bool RpcHandler::LoadPacks(void) {
+  m_manager.Clear();
+  m_solutionLoaded = false;
+  m_worker.InitializeModel();
   m_worker.SetLoadPacksPolicy(LoadPacksPolicy::ALL);
-  m_packsLoaded = m_worker.LoadPacks(m_globalContext);
+  m_packsLoaded = m_worker.LoadAllRelevantPacks();
   m_worker.SetLoadPacksPolicy(LoadPacksPolicy::DEFAULT);
-  if (!m_packsLoaded) {
+  if(!m_packsLoaded) {
     throw JsonRpcException(PACKS_LOADING_FAIL, "packs failed to load");
   }
   return true;
@@ -256,7 +259,7 @@ RpcArgs::PacksInfo RpcHandler::GetPacksInfo(const string& context) {
   }
 
   RpcArgs::PacksInfo packsInfo;
-  for (auto& [pack, packItem] : m_globalContext.rteActiveTarget->GetFilteredModel()->GetPackages()) {
+  for (auto& [pack, packItem] : contextItem.rteActiveTarget->GetFilteredModel()->GetPackages()) {
     RpcArgs::Pack p;
     p.id = packItem->GetPackageID(true);
     const auto& description = packItem->GetDescription();

tools/projmgr/src/ProjMgrWorker.cpp

@@ -229,8 +229,7 @@ bool ProjMgrWorker::ParseContextLayers(ContextItem& context) {
 }
 
 void ProjMgrWorker::GetContexts(map<string, ContextItem>* &contexts) {
-  m_contextsPtr = &m_contexts;
-  contexts = m_contextsPtr;
+  contexts = &m_contexts;
 }
 
 void ProjMgrWorker::GetYmlOrderedContexts(vector<string> &contexts) {