Let Session keep a Connection reference

The Connection class is meant as a lightweight wrapper anyway, so let's
not bother with an explicit shared_ptr<sr_conn_ctx_s>, and keep a
full-blown C++ reference.

The `Session::Session(..., const unmanaged_tag)` is still correct,
AFAICT: it will not attempt to call sr_disconnect() because the
destructor of the shared_ptr<sr_conn_ctx_t> has an empty lambda as its
destructor. That's (still) by design.

Change-Id: I91efc186ff93e7ca27830baa3cbe24ee4c08fba7

Author: jktjkt

include/sysrepo-cpp/Connection.hpp

@@ -7,8 +7,10 @@
 */
 #pragma once
 
+#include <chrono>
 #include <memory>
-#include <sysrepo-cpp/Session.hpp>
+#include <string>
+#include <sysrepo-cpp/Enum.hpp>
 
 struct sr_conn_ctx_s;
 
@@ -42,7 +44,7 @@ class Connection {
     friend Session;
 
 private:
-    Connection(std::shared_ptr<sr_conn_ctx_s> ctx);
+    explicit Connection(std::shared_ptr<sr_conn_ctx_s> ctx);
     std::shared_ptr<sr_conn_ctx_s> ctx;
 };
 }

include/sysrepo-cpp/Session.hpp

@@ -7,16 +7,13 @@
 */
 #pragma once
 
-#include <chrono>
 #include <iosfwd>
-#include <memory>
 #include <optional>
 #include <libyang-cpp/Context.hpp>
 #include <libyang-cpp/DataNode.hpp>
-#include <sysrepo-cpp/Enum.hpp>
+#include <sysrepo-cpp/Connection.hpp>
 #include <sysrepo-cpp/Subscription.hpp>
 
-struct sr_conn_ctx_s;
 struct sr_session_ctx_s;
 
 namespace sysrepo {
@@ -176,10 +173,10 @@ class Session {
     friend Session wrapUnmanagedSession(sr_session_ctx_s* session);
     friend sr_session_ctx_s* getRawSession(Session sess);
 
-    Session(sr_session_ctx_s* sess, std::shared_ptr<sr_conn_ctx_s> conn);
+    Session(sr_session_ctx_s* sess, Connection conn);
     explicit Session(sr_session_ctx_s* unmanagedSession, const unmanaged_tag);
 
-    std::shared_ptr<sr_conn_ctx_s> m_conn;
+    Connection m_conn;
     std::shared_ptr<sr_session_ctx_s> m_sess;
 };
 

src/Connection.cpp

@@ -54,7 +54,7 @@ Session Connection::sessionStart(sysrepo::Datastore datastore)
     auto res = sr_session_start(ctx.get(), toDatastore(datastore), &sess);
 
     throwIfError(res, "Couldn't start sysrepo session");
-    return Session{sess, ctx};
+    return Session{sess, *this};
 }
 
 /**

src/Session.cpp

@@ -81,11 +81,11 @@ std::optional<std::string> constructXPathFilter(const std::optional<std::variant
  *
  * Internal use only.
  */
-Session::Session(sr_session_ctx_s* sess, std::shared_ptr<sr_conn_ctx_s> conn)
-    : m_conn(conn)
-    // The connection `conn` is saved here in the deleter (as a capture). This means that copies of this shared_ptr will
-    // automatically hold a reference to `conn`.
-    , m_sess(sess, [extend_connection_lifetime = conn] (auto* sess) {
+Session::Session(sr_session_ctx_s* sess, Connection conn)
+    : m_conn(std::move(conn))
+    // The connection is saved here in the deleter (as a capture). This means that copies of this shared_ptr will
+    // automatically hold a reference to `m_conn`.
+    , m_sess(sess, [extend_connection_lifetime = m_conn] (auto* sess) {
         sr_session_stop(sess);
     })
 {
@@ -944,7 +944,7 @@ void Session::setOriginatorName(const std::string& originatorName)
  */
 Connection Session::getConnection()
 {
-    return Connection{m_conn};
+    return m_conn;
 }
 
 /**