From e8ef3e43808533322a7a23147461ce9702a953a8 Mon Sep 17 00:00:00 2001
From: Daniel Krebs <github@daniel-krebs.net>
Date: Tue, 13 Feb 2018 19:54:18 +0100
Subject: [PATCH] lib/memory-manager: pass strings as const reference

---
 fpga/include/villas/memory_manager.hpp | 11 ++++++++---
 fpga/lib/memory_manager.cpp            |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/fpga/include/villas/memory_manager.hpp b/fpga/include/villas/memory_manager.hpp
index 941fd43c0..04bf60bf6 100644
--- a/fpga/include/villas/memory_manager.hpp
+++ b/fpga/include/villas/memory_manager.hpp
@@ -152,7 +152,8 @@ public:
 
 	/// Create a default mapping
 	MappingId
-	createMapping(uintptr_t src, uintptr_t dest, size_t size, std::string name,
+	createMapping(uintptr_t src, uintptr_t dest, size_t size,
+	              const std::string& name,
 	              AddressSpaceId fromAddrSpace,
 	              AddressSpaceId toAddrSpace);
 
@@ -167,7 +168,7 @@ public:
 
 
 	AddressSpaceId
-	findAddressSpace(std::string name);
+	findAddressSpace(const std::string& name);
 
 	MemoryTranslation
 	getTranslation(AddressSpaceId fromAddrSpaceId, AddressSpaceId toAddrSpaceId);
@@ -177,9 +178,13 @@ public:
 	{ return getTranslation(getProcessAddressSpace(), foreignAddrSpaceId); }
 
 	static std::string
-	getSlaveAddrSpaceName(std::string ipInstance, std::string memoryBlock)
+	getSlaveAddrSpaceName(const std::string& ipInstance, const std::string& memoryBlock)
 	{ return ipInstance + "/" + memoryBlock; }
 
+	static std::string
+	getMasterAddrSpaceName(const std::string& ipInstance, const std::string& busInterface)
+	{ return ipInstance + ":" + busInterface; }
+
 	void
 	dump()
 	{ memoryGraph.dump(); }
diff --git a/fpga/lib/memory_manager.cpp b/fpga/lib/memory_manager.cpp
index 55f7858b1..f8e01e9b0 100644
--- a/fpga/lib/memory_manager.cpp
+++ b/fpga/lib/memory_manager.cpp
@@ -39,7 +39,7 @@ MemoryManager::getOrCreateAddressSpace(std::string name)
 
 MemoryManager::MappingId
 MemoryManager::createMapping(uintptr_t src, uintptr_t dest, size_t size,
-                             std::string name,
+                             const std::string& name,
                              MemoryManager::AddressSpaceId fromAddrSpace,
                              MemoryManager::AddressSpaceId toAddrSpace)
 {
@@ -62,7 +62,7 @@ MemoryManager::addMapping(std::shared_ptr<Mapping> mapping,
 }
 
 MemoryManager::AddressSpaceId
-MemoryManager::findAddressSpace(std::string name)
+MemoryManager::findAddressSpace(const std::string& name)
 {
 	return memoryGraph.findVertex(
 	            [&](const std::shared_ptr<AddressSpace>& v) {