fix fileVersion

Author: vigsterkr

test/event_logger_test.cc

@@ -1,7 +1,6 @@
 #include <catch.hpp>
 
 #include <chrono>
-#include <sstream>
 #include <string>
 
 #include <google/protobuf/text_format.h>
@@ -44,13 +43,6 @@ bool readEventProto(RecordReader& reader, tensorflow::Event* proto)
     return decodeEvent(record, proto);
 }
 
-std::string getCurrentFileVersion()
-{
-    std::ostringstream fileVersion;
-    fileVersion << kVersionPrefix << kCurrentVersion << std::ends;
-    return fileVersion.str();
-}
-
 TEST_CASE("EventLogger - default test", "[EventLogger][create/write]") {
     tflogger::EventLogger eventLogger("tf");
 
@@ -79,7 +71,7 @@ TEST_CASE("EventLogger - default test", "[EventLogger][create/write]") {
         REQUIRE(readEventProto(rr, &actual));
 
         REQUIRE(std::abs(actual.wall_time()-nowSeconds) <= 5);
-        REQUIRE_THAT(actual.file_version(), Catch::Equals(getCurrentFileVersion()));
+        REQUIRE_THAT(actual.file_version(), Catch::Equals(EventLogger::kFileVersion));
 
         tensorflow::Event expected;
         REQUIRE(readEventProto(rr, &actual));

tflogger/event_logger.cc

@@ -93,9 +93,7 @@ bool EventLogger::init()
     // Write the first event with the current version
     tensorflow::Event event;
     event.set_wall_time(nowSeconds);
-    std::ostringstream fileVersion;
-    fileVersion << kVersionPrefix << kCurrentVersion << std::ends;
-    event.set_file_version(fileVersion.str());
+    event.set_file_version(kFileVersion);
     writeEvent(event);
     flush();
 
@@ -111,3 +109,9 @@ std::string EventLogger::generateFileName(const int64_t& nowSeconds) const
     std::snprintf(&buf[0], buf.size(), fmt, mPrefix.c_str(), nowSeconds, hostName.c_str());
     return std::string(buf.data(), buf.size());
 }
+
+std::string EventLogger::kFileVersion = []() -> std::string {
+    std::ostringstream fileVersion(EventLogger::kVersionPrefix, std::ios_base::ate);
+    fileVersion << EventLogger::kCurrentVersion;
+    return fileVersion.str();
+}();

tflogger/event_logger.h

@@ -14,6 +14,12 @@ namespace tflogger
      */
     class EventLogger
     {
+        public:
+            // Prefix of version string present in the first entry of every event file.
+            static constexpr const char* kVersionPrefix = "brain.Event:";
+            static constexpr const int kCurrentVersion = 2;
+            static std::string kFileVersion;
+
         public:
             explicit EventLogger(const char* prefix);
             ~EventLogger();
@@ -38,9 +44,6 @@ namespace tflogger
             std::unique_ptr<std::ofstream> mOutputStream;
     };
 
-    // Prefix of version string present in the first entry of every event file.
-    static constexpr const char* kVersionPrefix = "brain.Event:";
-    static constexpr const int kCurrentVersion = 2;
 }
 
 #endif /* __EVENT_LOGGER_H__ */