Avoid copies of embedded_file data

Addresses #3835
NREL · Jul 18, 2020 · a478258 · a478258
1 parent 1a2828b
commit a478258
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/embedded/embedded_files.cxx.in b/embedded/embedded_files.cxx.in
@@ -20,7 +20,7 @@ namespace embedded_files {
 @EMBEDDED_FILES@
   };
 
-  std::vector<std::string> fileNames() {
+  const std::vector<std::string> &fileNames() {
     static const std::vector<std::string> result = [](){
       std::vector<std::string> val;
       val.reserve(embedded_file_count);
@@ -29,10 +29,11 @@ namespace embedded_files {
       }
       return val;
     }();
+
     return result;
   }
 
-  std::map<std::string, std::pair<size_t, const uint8_t *>> files()
+  const std::map<std::string, std::pair<size_t, const uint8_t *>> &files()
   {
     static const std::map<std::string, std::pair<size_t, const uint8_t *>> fs = [](){
       std::map<std::string, std::pair<size_t, const uint8_t *>> val;

diff --git a/embedded/embedded_files.hxx.in b/embedded/embedded_files.hxx.in
@@ -113,13 +113,13 @@ inline int inf(const EmbeddedFile & file, std::vector<uint8_t> & result)
 
 
 namespace embedded_files {
-  std::map<std::string, EmbeddedFile > files();
+  const std::map<std::string, EmbeddedFile> &files();
 
-  std::vector<std::string> fileNames();
+  const std::vector<std::string> &fileNames();
 
   inline std::string allFileNamesAsString(){
     std::string result;
-    for (const auto& fileName: fileNames()){
+    for (const auto& fileName : fileNames()){
       result += (fileName + ";");
     }
     return result;
@@ -138,12 +138,12 @@ namespace embedded_files {
   }
 
   inline bool hasFile(const std::string &t_filename) {
-    const auto fs = fileNames();
+    const auto &fs = fileNames();
     return (std::find(fs.begin(), fs.end(), t_filename) != fs.end());
   }
 
   inline std::string getFileAsString(const std::string &t_filename) {
-    const auto fs = files();
+    const auto &fs = files();
     const auto f = fs.find(t_filename);
     if (f == fs.end()){
       throw std::runtime_error("Embedded file not found '" + t_filename + "'");
@@ -157,7 +157,7 @@ namespace embedded_files {
 
   inline void extractFile(const std::string &t_filename, const std::string &t_location)
   {
-    const auto fs = files();
+    const auto &fs = files();
 
 
     const auto create_dirs = [](const std::string &t_path) {