summaryrefslogtreecommitdiff
path: root/src/sim/system.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/sim/system.hh')
-rw-r--r--src/sim/system.hh23
1 files changed, 21 insertions, 2 deletions
diff --git a/src/sim/system.hh b/src/sim/system.hh
index 0d26ffa0d..878c81252 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -325,6 +325,12 @@ class System : public MemObject
ThermalModel * thermalModel;
+ protected:
+ /**
+ * Strips off the system name from a master name
+ */
+ std::string stripSystemName(const std::string& master_name) const;
+
public:
/**
@@ -370,19 +376,32 @@ class System : public MemObject
* @param masterName full name of the master
* @return the master's ID.
*/
- MasterID getGlobalMasterId(std::string master_name);
+ MasterID getGlobalMasterId(const std::string& master_name);
/**
* Get the name of an object for a given request id.
*/
std::string getMasterName(MasterID master_id);
+ /**
+ * Looks up the MasterID for a given SimObject
+ * returns an invalid MasterID (invldMasterId) if not found.
+ */
+ MasterID lookupMasterId(const SimObject* obj) const;
+
+ /**
+ * Looks up the MasterID for a given object name string
+ * returns an invalid MasterID (invldMasterId) if not found.
+ */
+ MasterID lookupMasterId(const std::string& name) const;
+
/** Get the number of masters registered in the system */
MasterID maxMasters() { return masters.size(); }
protected:
/** helper function for getMasterId */
- MasterID _getMasterId(const SimObject* master, std::string master_name);
+ MasterID _getMasterId(const SimObject* master,
+ const std::string& master_name);
/**
* Helper function for constructing the full (sub)master name