Add GetComponentsInfo request

Author: brondani

tools/projmgr/include/ProjMgr.h

@@ -57,6 +57,13 @@ class ProjMgr {
   */
   ProjMgrWorker& GetWorker() { return m_worker; };
 
+  /**
+   * @brief load solution
+   * @param path to <solution>.csolution.yml file
+   * @return processing status
+  */
+  bool LoadSolution(std::string csolution);
+
 protected:
   /**
    * @brief parse command line options
@@ -185,6 +192,7 @@ class ProjMgr {
   bool GenerateYMLConfigurationFiles(bool previousResult);
   bool UpdateRte();
   bool ParseAndValidateContexts();
+  bool ProcessContexts();
 };
 
 #endif  // PROJMGR_H

tools/projmgr/include/ProjMgrExtGenerator.h

@@ -101,6 +101,10 @@ class ProjMgrExtGenerator {
   */
   ClayerItem* GetGeneratorImport(const std::string& contextId, bool& success);
 
+  void Clear() {
+    m_usedGenerators.clear();
+  }
+
 protected:
   ProjMgrParser* m_parser = nullptr;
   GeneratorContextVecMap m_usedGenerators;

tools/projmgr/include/ProjMgrParser.h

@@ -682,6 +682,15 @@ class ProjMgrParser {
   */
   CbuildSetItem& GetCbuildSetItem(void);
 
+  void Clear() {
+    m_cdefault = {};
+    m_csolution = {};
+    m_cbuildSet = {};
+    m_cprojects.clear();
+    m_clayers.clear();
+    m_genericClayers.clear();
+  }
+
 protected:
   CdefaultItem m_cdefault;
   CsolutionItem m_csolution;

tools/projmgr/include/ProjMgrRpcServer.h

@@ -23,7 +23,7 @@ class ProjMgrRpcServer {
   /**
    * @brief class constructor
   */
-  ProjMgrRpcServer(ProjMgr* manager);
+  ProjMgrRpcServer(ProjMgr& manager);
 
   /**
    * @brief class destructor
@@ -38,9 +38,9 @@ class ProjMgrRpcServer {
 
   /**
    * @brief get parser object
-   * @return pointer to m_manager
+   * @return reference to m_manager
   */
-  ProjMgr* GetManager() { return m_manager; };
+  ProjMgr& GetManager() { return m_manager; };
 
   /**
    * @brief set m_shutdown flag
@@ -55,7 +55,7 @@ class ProjMgrRpcServer {
   void SetContentLengthHeader(bool value) { m_contextLength = value; };
 
 protected:
-  ProjMgr* m_manager;
+  ProjMgr& m_manager;
   bool m_shutdown = false;
   bool m_contextLength = false;
   const std::string GetRequestFromStdinWithLength(void);

tools/projmgr/include/ProjMgrRunDebug.h

@@ -147,6 +147,10 @@ class ProjMgrRunDebug {
   */
   bool CollectSettings(const std::vector<ContextItem*>& contexts);
 
+  void Clear() {
+    m_runDebug = {};
+  }
+
 protected:
   RunDebugType m_runDebug;
   void GetDebugSequenceBlock(const RteItem* item, DebugSequencesBlockType& block);

tools/projmgr/include/ProjMgrWorker.h

@@ -794,6 +794,62 @@ class ProjMgrWorker {
   */
   bool CheckRteErrors(void);
 
+  /**
+   * @brief load packs
+   * @param context item
+   * @return true if there is no error
+  */
+  bool LoadPacks(ContextItem& context);
+
+  /**
+   * @brief set target attributes
+   * @param context item
+   * @param map of attributes
+   * @return true if there is no error
+  */
+  bool SetTargetAttributes(ContextItem& context, std::map<std::string, std::string>& attributes);
+
+  /**
+   * @brief add required components
+   * @param context item
+   * @return true if there is no error
+  */
+  bool AddRequiredComponents(ContextItem& context);
+
+  /**
+   * @brief validate context
+   * @param context item
+   * @return true if there is no error
+  */
+  bool ValidateContext(ContextItem& context);
+
+  /**
+   * @brief clear worker members for reloading a solution
+   * @return true if there is no error
+  */
+  void Clear() {
+    for (auto context : m_contexts) {
+      for (auto componentItem : context.second.components) {
+        delete componentItem.second.instance;
+      }
+    }
+    m_contexts.clear();
+    m_ymlOrderedContexts.clear();
+    m_contextsPtr->clear();
+    m_contextErrMap.clear();
+    m_selectedContexts.clear();
+    m_outputDir.clear();
+    m_selectedToolchain.clear();
+    m_rootDir.clear();
+    m_undefLayerVars.clear();
+    m_packMetadata.clear();
+    m_executes.clear();
+    m_toolchainErrors.clear();
+    m_selectableCompilers.clear();
+    m_missingFiles.clear();
+    m_types = {};
+  };
+
 protected:
   ProjMgrParser* m_parser = nullptr;
   ProjMgrKernel* m_kernel = nullptr;
@@ -833,7 +889,6 @@ class ProjMgrWorker {
   bool m_undefCompiler = false;
   std::map<std::string, FileNode> m_missingFiles;
 
-  bool LoadPacks(ContextItem& context);
   bool CheckMissingPackRequirements(const std::string& contextName);
   void CheckMissingLinkerScript(ContextItem& context);
   bool CollectRequiredPdscFiles(ContextItem& context, const std::string& packRoot);
@@ -844,7 +899,6 @@ class ProjMgrWorker {
   bool GetTypeContent(ContextItem& context);
   bool GetProjectSetup(ContextItem& context);
   bool InitializeTarget(ContextItem& context);
-  bool SetTargetAttributes(ContextItem& context, std::map<std::string, std::string>& attributes);
   bool ProcessPrecedences(ContextItem& context, BoardOrDevice process = BoardOrDevice::None, bool rerun = false);
   bool ProcessPrecedence(StringCollection& item);
   bool ProcessCompilerPrecedence(StringCollection& item, bool acceptRedefinition = false);
@@ -871,15 +925,13 @@ class ProjMgrWorker {
   bool ProcessLinkerOptions(ContextItem& context, const LinkerItem& linker, const std::string& ref);
   bool ProcessProcessorOptions(ContextItem& context);
   void AddContext(ContextDesc& descriptor, const TypePair& type, ContextItem& parentContext);
-  bool ValidateContext(ContextItem& context);
   bool FormatValidationResults(std::set<std::string>& results, const ContextItem& context);
   void UpdateMisc(std::vector<MiscItem>& vec, const std::string& compiler);
   void AddMiscUniquely(MiscItem& dst, std::vector<std::vector<MiscItem>*>& srcVec);
   void AddMiscUniquely(MiscItem& dst, std::vector<MiscItem>& srcVec);
   bool AddGroup(const GroupNode& src, std::vector<GroupNode>& dst, ContextItem& context, const std::string root);
   bool AddFile(const FileNode& src, std::vector<FileNode>& dst, ContextItem& context, const std::string root);
   bool AddComponent(const ComponentItem& src, const std::string& layer, std::vector<std::pair<ComponentItem, std::string>>& dst, TypePair type, ContextItem& context);
-  bool AddRequiredComponents(ContextItem& context);
   void GetDeviceItem(const std::string& element, DeviceItem& device) const;
   void GetBoardItem (const std::string& element, BoardItem& board) const;
   bool GetPrecedentValue(std::string& outValue, const std::string& element) const;
@@ -941,6 +993,7 @@ class ProjMgrWorker {
   StrVec CollectSelectableCompilers();
   void ProcessTmpDir(std::string& tmpdir, const std::string& base);
   bool IsCreatedByExecute(const std::string file, const std::string dir);
+  bool CollectAllRequiredPdscFiles();
 };
 
 #endif  // PROJMGRWORKER_H

tools/projmgr/src/ProjMgr.cpp

@@ -64,7 +64,7 @@ ProjMgr::ProjMgr() :
   m_extGenerator(&m_parser),
   m_worker(&m_parser, &m_extGenerator),
   m_emitter(&m_parser, &m_worker),
-  m_rpcServer(this),
+  m_rpcServer(*this),
   m_checkSchema(false),
   m_missingPacks(false),
   m_updateRteFiles(true),
@@ -409,7 +409,8 @@ int ProjMgr::ProcessCommands() {
       return ErrorCode::ERROR;
     }
   } else if (m_command == "rpc") {
-    // Launch 'rpc' server
+    // Launch 'rpc' server over stdin/stdout
+    ProjMgrLogger::m_silent = true;
     if (!m_rpcServer.Run()) {
       return ErrorCode::ERROR;
     }
@@ -598,31 +599,8 @@ bool ProjMgr::Configure() {
     ProjMgrLogger::Get().Error(errMsg);
   }
 
-  // Get context pointers
-  map<string, ContextItem>* contexts = nullptr;
-  m_worker.GetContexts(contexts);
-
-  vector<string> orderedContexts;
-  m_worker.GetYmlOrderedContexts(orderedContexts);
-
   // Process contexts
-  bool error = false;
-  m_allContexts.clear();
-  m_processedContexts.clear();
-  m_failedContext.clear();
-  for (auto& contextName : orderedContexts) {
-    auto& contextItem = (*contexts)[contextName];
-    m_allContexts.push_back(&contextItem);
-    if (!m_worker.IsContextSelected(contextName)) {
-      continue;
-    }
-    if (!m_worker.ProcessContext(contextItem, true, true, false)) {
-      ProjMgrLogger::Get().Error("processing context '" + contextName + "' failed", contextName);
-      m_failedContext.insert(contextItem.name);
-      error = true;
-    }
-    m_processedContexts.push_back(&contextItem);
-  }
+  bool error = !ProcessContexts();
 
   if (m_worker.HasToolchainErrors()) {
     error = true;
@@ -663,6 +641,35 @@ bool ProjMgr::Configure() {
   return !error;
 }
 
+bool ProjMgr::ProcessContexts() {
+  // Get context pointers
+  map<string, ContextItem>* contexts = nullptr;
+  m_worker.GetContexts(contexts);
+
+  vector<string> orderedContexts;
+  m_worker.GetYmlOrderedContexts(orderedContexts);
+
+  // Process contexts
+  bool success = true;
+  m_allContexts.clear();
+  m_processedContexts.clear();
+  m_failedContext.clear();
+  for (auto& contextName : orderedContexts) {
+    auto& contextItem = (*contexts)[contextName];
+    m_allContexts.push_back(&contextItem);
+    if (!m_worker.IsContextSelected(contextName)) {
+      continue;
+    }
+    if (!m_worker.ProcessContext(contextItem, true, true, false)) {
+      ProjMgrLogger::Get().Error("processing context '" + contextName + "' failed", contextName);
+      m_failedContext.insert(contextItem.name);
+      success = false;
+    }
+    m_processedContexts.push_back(&contextItem);
+  }
+  return success;
+}
+
 bool ProjMgr::UpdateRte() {
   // Update the RTE files
   for (auto& contextItem : m_processedContexts) {
@@ -1125,3 +1132,30 @@ string ProjMgr::GetToolboxVersion(const string& toolboxDir) {
   regex_match(manifestFile, matchResult, regEx);
   return matchResult[1].str();
 }
+
+bool ProjMgr::LoadSolution(std::string csolution) {
+  if (!m_csolutionFile.empty()) {
+    m_parser.Clear();
+    m_extGenerator.Clear();
+    m_worker.Clear();
+    m_runDebug.Clear();
+    ProjMgrLogger::Get().Clear();
+  }
+
+  m_csolutionFile = csolution;
+  m_rootDir = RteUtils::ExtractFilePath(m_csolutionFile, false);
+
+  m_contextSet = true;
+  m_updateRteFiles = false;
+
+  if (!PopulateContexts()) {
+    return false;
+  }
+  if (!ParseAndValidateContexts()) {
+    return false;
+  }
+  if (!ProcessContexts()) {
+    return false;
+  }
+  return true;
+}