Re-use ifstream and OSMLuaProcessing (#578)

systemed · Nov 12, 2023 · 8c059d9 · 8c059d9
1 parent 9c7081b
commit 8c059d9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/include/read_pbf.h b/include/read_pbf.h
@@ -26,8 +26,8 @@ class PbfReader
 
 	PbfReader(OSMStore &osmStore);
 
-	using pbfreader_generate_output = std::function< std::unique_ptr<OsmLuaProcessing> () >;
-	using pbfreader_generate_stream = std::function< std::unique_ptr<std::istream> () >;
+	using pbfreader_generate_output = std::function< std::shared_ptr<OsmLuaProcessing> () >;
+	using pbfreader_generate_stream = std::function< std::shared_ptr<std::istream> () >;
 
 	int ReadPbfFile(std::unordered_set<std::string> const &nodeKeys, unsigned int threadNum, 
 			pbfreader_generate_stream const &generate_stream,

diff --git a/src/tilemaker.cpp b/src/tilemaker.cpp
@@ -336,10 +336,12 @@ int main(int argc, char* argv[]) {
 
 			int ret = pbfReader.ReadPbfFile(nodeKeys, threadNum, 
 				[&]() { 
-					return std::make_unique<ifstream>(inputFile, ios::in | ios::binary);
+					thread_local std::shared_ptr<ifstream> pbfStream(new ifstream(inputFile, ios::in | ios::binary));
+					return pbfStream;
 				},
 				[&]() {
-					return std::make_unique<OsmLuaProcessing>(osmStore, config, layers, luaFile, shpMemTiles, osmMemTiles, attributeStore);
+					thread_local std::shared_ptr<OsmLuaProcessing> osmLuaProcessing(new OsmLuaProcessing(osmStore, config, layers, luaFile, shpMemTiles, osmMemTiles, attributeStore));
+					return osmLuaProcessing;
 				});	
 			if (ret != 0) return ret;
 		}