Merge pull request #124 from art-daq/rrivera/featureAddTreeViewDiffMode

Rrivera/feature add tree view diff mode
art-daq · Nov 8, 2023 · 8cdec0d · 8cdec0d
2 parents d62d3f2 + a371d53
commit 8cdec0d
Show file tree

Hide file tree

Showing 25 changed files with 1,295 additions and 377 deletions.
diff --git a/otsdaq/ConfigurationInterface/ConfigurationInterface.icc b/otsdaq/ConfigurationInterface/ConfigurationInterface.icc
@@ -259,6 +259,12 @@ void get(TableBase*&                          table,
 	catch(...)
 	{
 		__SS__ << "Unknown error occurred while getting and filling Table \"" << tableName << "\" version:" << version << std::endl;
+		try	{ throw; } //one more try to printout extra info
+		catch(const std::exception &e)
+		{
+			ss << "Exception message: " << e.what();
+		}
+		catch(...){}
 		__SS_THROW__;
 	}
 

diff --git a/otsdaq/ConfigurationInterface/ConfigurationManager.cc b/otsdaq/ConfigurationInterface/ConfigurationManager.cc
diff --git a/otsdaq/ConfigurationInterface/ConfigurationManager.h b/otsdaq/ConfigurationInterface/ConfigurationManager.h
@@ -26,6 +26,13 @@ class ConfigurationManager
 	friend class GatewaySupervisor;
 
   public:
+
+	typedef std::map<std::string,
+		std::pair< 
+			std::pair<std::string, TableGroupKey>,
+			std::map<std::string, TableVersion> /* memberMap */ 
+			>> lastGroupLoad_t;
+
 	//==============================================================================
 	// Static members
 	static const unsigned int PROCESSOR_COUNT;
@@ -117,7 +124,7 @@ class ConfigurationManager
 
 	void 								loadTableGroup				(
 	    const std::string&                                     configGroupName,
-	    TableGroupKey                                          tableGroupKey,
+	    const TableGroupKey&                                   tableGroupKey,
 	    bool                                                   doActivate         = false,
 	    std::map<std::string, TableVersion>*                   groupMembers       = 0,
 	    ProgressBar*                                           progressBar        = 0,
@@ -130,6 +137,15 @@ class ConfigurationManager
 	    std::map<std::string /*name*/, std::string /*alias*/>* groupAliases       = 0,
 	    ConfigurationManager::LoadGroupType					   onlyLoadIfBackboneOrContext = ConfigurationManager::LoadGroupType::ALL_TYPES,
 		bool												   ignoreVersionTracking = false);
+	void 								copyTableGroupFromCache		(
+		const ConfigurationManager&								cacheConfigMgr, 	
+	    const std::map<std::string, TableVersion>&             	groupMembers,
+	    const std::string&                                      configGroupName 	= "",
+	    const TableGroupKey&                                    tableGroupKey		= TableGroupKey(TableGroupKey::INVALID),
+	    bool                                                   	doActivate        = false,
+		bool													ignoreVersionTracking = false);	
+	std::pair<std::string /* groupName */, TableGroupKey>
+										getGroupOfLoadedTable		(const std::string& tableName) const;
 	void 								loadMemberMap				(const std::map<std::string /*name*/, TableVersion /*version*/>& memberMap, std::string* accumulateWarnings = 0);
 	TableGroupKey 						loadConfigurationBackbone	(void);
 
@@ -161,6 +177,7 @@ const T* retPtr = dynamic_cast<const T*>(srcPtr); if(retPtr == nullptr) { __SS__
 	const std::map<std::string /*groupType*/,
 		std::pair<std::string /*groupName*/,
 		TableGroupKey>>& 				getFailedTableGroups		(void) const {return lastFailedGroupLoad_;}
+	const lastGroupLoad_t& 				getLastTableGroups			(void) const {return lastGroupLoad_;}
 	const std::string& 					getActiveGroupName			(const ConfigurationManager::GroupType& type = ConfigurationManager::GroupType::CONFIGURATION_TYPE) const;
 	TableGroupKey      					getActiveGroupKey			(const ConfigurationManager::GroupType& type = ConfigurationManager::GroupType::CONFIGURATION_TYPE) const;
 
@@ -173,6 +190,8 @@ const T* retPtr = dynamic_cast<const T*>(srcPtr); if(retPtr == nullptr) { __SS__
 
 	std::vector<std::pair<std::string /*childName*/,
 		ConfigurationTree>> 			getChildren					(std::map<std::string, TableVersion>* memberMap = 0, std::string* accumulatedTreeErrors = 0) const;
+	std::map<std::string /*childName*/,
+		ConfigurationTree>	 			getChildrenMap				(std::map<std::string, TableVersion>* memberMap = 0, std::string* accumulatedTreeErrors = 0) const;	
 	std::string 						getFirstPathToNode			(const ConfigurationTree& node, const std::string& startPath = "/") const;
 
 	std::map<std::string, TableVersion> getActiveVersions			(void) const;
@@ -227,6 +246,9 @@ const T* retPtr = dynamic_cast<const T*>(srcPtr); if(retPtr == nullptr) { __SS__
 
 	std::map<std::string, 
 		std::pair<std::string, TableGroupKey>> 			lastFailedGroupLoad_;
+	lastGroupLoad_t										lastGroupLoad_;
+
+
 
 	std::map<std::string, TableBase*> 					nameToTableMap_;
 

diff --git a/otsdaq/ConfigurationInterface/ConfigurationManagerRW.cc b/otsdaq/ConfigurationInterface/ConfigurationManagerRW.cc
@@ -464,6 +464,12 @@ const std::map<std::string, TableInfo>& ConfigurationManagerRW::getAllTableInfo(
 		catch(...)
 		{
 			__SS__ << "An unknown fatal error occurred reading the info for all table groups." << __E__;
+			try	{ throw; } //one more try to printout extra info
+			catch(const std::exception &e)
+			{
+				ss << "Exception message: " << e.what();
+			}
+			catch(...){}
 			__GEN_COUT_ERR__ << "\n" << ss.str();
 			if(accumulatedWarnings)
 				*accumulatedWarnings += ss.str();