timestamp conversion too

Author: stuqdog

src/viam/sdk/common/private/proto_conversions.cpp

@@ -1,4 +1,3 @@
-#include "viam/sdk/common/utils.hpp"
 #include <viam/sdk/common/private/proto_conversions.hpp>
 
 #include <boost/algorithm/string.hpp>
@@ -629,6 +628,24 @@ Name from_proto(const viam::common::v1::ResourceName& proto) {
         {proto.namespace_(), proto.type(), proto.subtype()}, name_parts.first, name_parts.second);
 }
 
+using time_point = std::chrono::time_point<long long, std::chrono::nanoseconds>;
+
+time_point timestamp_to_time_pt(const google::protobuf::Timestamp& timestamp) {
+    const std::chrono::seconds seconds(timestamp.seconds());
+    const std::chrono::nanoseconds nanos(timestamp.nanos());
+    return time_point(std::chrono::duration_cast<std::chrono::system_clock::duration>(seconds) +
+                      nanos);
+}
+
+google::protobuf::Timestamp time_pt_to_timestamp(const time_point& time_pt) {
+    const std::chrono::seconds duration_s =
+        std::chrono::duration_cast<std::chrono::seconds>(time_pt.time_since_epoch());
+    const std::chrono::nanoseconds duration_ns = time_pt.time_since_epoch() - duration_s;
+    google::protobuf::Timestamp timestamp;
+    timestamp.set_seconds(duration_s.count());
+    timestamp.set_nanos(static_cast<int32_t>(duration_ns.count()));
+    return timestamp;
+}
 }  // namespace impl
 }  // namespace sdk
 }  // namespace viam

src/viam/sdk/common/private/proto_conversions.hpp

@@ -74,6 +74,12 @@ viam::app::v1::Translation to_proto(const translation& ts);
 viam::common::v1::ResourceName to_proto(const Name& name);
 Name from_proto(const viam::common::v1::ResourceName& proto);
 
+std::chrono::time_point<long long, std::chrono::nanoseconds> timestamp_to_time_pt(
+    const google::protobuf::Timestamp& timestamp);
+
+google::protobuf::Timestamp time_pt_to_timestamp(
+    const std::chrono::time_point<long long, std::chrono::nanoseconds>& time_pt);
+
 }  // namespace impl
 }  // namespace sdk
 }  // namespace viam

src/viam/sdk/common/utils.cpp

@@ -20,8 +20,6 @@
 namespace viam {
 namespace sdk {
 
-using time_point = std::chrono::time_point<long long, std::chrono::nanoseconds>;
-
 std::vector<unsigned char> string_to_bytes(const std::string& s) {
     std::vector<unsigned char> bytes(s.begin(), s.end());
     return bytes;
@@ -32,23 +30,6 @@ std::string bytes_to_string(const std::vector<unsigned char>& b) {
     return img_string;
 };
 
-time_point timestamp_to_time_pt(const google::protobuf::Timestamp& timestamp) {
-    const std::chrono::seconds seconds(timestamp.seconds());
-    const std::chrono::nanoseconds nanos(timestamp.nanos());
-    return time_point(std::chrono::duration_cast<std::chrono::system_clock::duration>(seconds) +
-                      nanos);
-}
-
-google::protobuf::Timestamp time_pt_to_timestamp(const time_point& time_pt) {
-    const std::chrono::seconds duration_s =
-        std::chrono::duration_cast<std::chrono::seconds>(time_pt.time_since_epoch());
-    const std::chrono::nanoseconds duration_ns = time_pt.time_since_epoch() - duration_s;
-    google::protobuf::Timestamp timestamp;
-    timestamp.set_seconds(duration_s.count());
-    timestamp.set_nanos(static_cast<int32_t>(duration_ns.count()));
-    return timestamp;
-}
-
 void set_logger_severity_from_args(int argc, char** argv) {
     if (argc >= 3 && strcmp(argv[2], "--log-level=debug") == 0) {
         boost::log::core::get()->set_filter(boost::log::trivial::severity >=

src/viam/sdk/common/utils.hpp

@@ -3,8 +3,6 @@
 #include <boost/optional/optional.hpp>
 #include <grpcpp/client_context.h>
 
-#include <google/protobuf/timestamp.pb.h>
-
 #include <viam/sdk/common/proto_value.hpp>
 #include <viam/sdk/components/component.hpp>
 #include <viam/sdk/resource/resource_api.hpp>
@@ -24,16 +22,6 @@ struct response_metadata {
 
 bool operator==(const response_metadata& lhs, const response_metadata& rhs);
 
-/// @brief convert a google::protobuf::Timestamp to
-/// std::chrono::time_point<long long, std::chrono::nanoseconds>
-std::chrono::time_point<long long, std::chrono::nanoseconds> timestamp_to_time_pt(
-    const google::protobuf::Timestamp& timestamp);
-
-/// @brief convert a std::chrono::time_point<long long, std::chrono::nanoseconds> to
-/// a google::protobuf::Timestamp.
-google::protobuf::Timestamp time_pt_to_timestamp(
-    const std::chrono::time_point<long long, std::chrono::nanoseconds>& time_pt);
-
 std::vector<unsigned char> string_to_bytes(std::string const& s);
 std::string bytes_to_string(std::vector<unsigned char> const& b);
 

src/viam/sdk/robot/client.cpp

@@ -89,7 +89,7 @@ RobotClient::status from_proto(const Status& proto) {
         status.status_map = struct_to_map(proto.status());
     }
     if (proto.has_last_reconfigured()) {
-        status.last_reconfigured = timestamp_to_time_pt(proto.last_reconfigured());
+        status.last_reconfigured = impl::timestamp_to_time_pt(proto.last_reconfigured());
     }
     return status;
 }
@@ -105,7 +105,7 @@ RobotClient::operation from_proto(const Operation& proto) {
         op.arguments = struct_to_map(proto.arguments());
     }
     if (proto.has_started()) {
-        op.started = timestamp_to_time_pt(proto.started());
+        op.started = impl::timestamp_to_time_pt(proto.started());
     }
     return op;
 }