Optimize CaliReader (LLNL#539)

* CaliReader optimization

* Add test for CaliReader

* Optimize CaliReader

* More CaliReader optimization

* CaliReader cleanup

* Update reader test

* Make CaliperMetaDB merges more robust

Author: daboehme

include/caliper/reader/CaliReader.h

@@ -8,6 +8,7 @@
 
 #include "RecordProcessor.h"
 
+#include <iostream>
 #include <memory>
 #include <string>
 
@@ -23,11 +24,14 @@ class CaliReader
 
 public:
 
-    CaliReader(const std::string& filename);
-
+    CaliReader();
     ~CaliReader();
 
-    bool read(CaliperMetadataDB& db, NodeProcessFn node_proc, SnapshotProcessFn snap_proc);
+    bool error() const;
+    std::string error_msg() const;
+
+    void read(std::istream& is, CaliperMetadataDB& db, NodeProcessFn node_proc, SnapshotProcessFn snap_proc);
+    void read(const std::string& filename, CaliperMetadataDB& db, NodeProcessFn node_proc, SnapshotProcessFn snap_proc);
 };
 
 } // namespace cali

include/caliper/reader/CaliperMetadataDB.h

@@ -15,6 +15,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <unordered_map>
 
 namespace cali
 {