main FEATURE do not free sessions while in-use (#903)

Author: frimpler

src/common.c

@@ -79,6 +79,7 @@ np_get_user_sess(sr_session_ctx_t *ev_sess)
     nc_sid = sr_session_get_event_nc_id(ev_sess);
     for (i = 0; (nc_sess = nc_ps_get_session(np2srv.nc_ps, i)); ++i) {
         if (nc_session_get_id(nc_sess) == nc_sid) {
+            nc_session_reference(nc_sess);
             break;
         }
     }
@@ -89,6 +90,21 @@ np_get_user_sess(sr_session_ctx_t *ev_sess)
     return nc_session_get_data(nc_sess);
 }
 
+void
+np_unref_user_sess(sr_session_ctx_t *ev_sess)
+{
+    struct nc_session *nc_sess = NULL;
+    uint32_t nc_sid, i;
+
+    nc_sid = sr_session_get_event_nc_id(ev_sess);
+    for (i = 0; (nc_sess = nc_ps_get_session(np2srv.nc_ps, i)); ++i) {
+        if (nc_session_get_id(nc_sess) == nc_sid) {
+            nc_session_dereference(nc_sess);
+            break;
+        }
+    }
+}
+
 void
 np2srv_ntf_new_cb(sr_session_ctx_t *UNUSED(session), const sr_ev_notif_type_t notif_type, const struct lyd_node *notif,
         time_t timestamp, void *private_data)

src/common.h

@@ -53,6 +53,8 @@ const char *np_get_nc_sess_user(sr_session_ctx_t *session);
 
 sr_session_ctx_t *np_get_user_sess(sr_session_ctx_t *ev_sess);
 
+void np_unref_user_sess(sr_session_ctx_t *ev_sess);
+
 void np2srv_ntf_new_cb(sr_session_ctx_t *session, const sr_ev_notif_type_t notif_type, const struct lyd_node *notif,
         time_t timestamp, void *private_data);
 

src/main.c

@@ -1008,7 +1008,13 @@ worker_thread(void *arg)
             ncm_session_rpc_reply_error(ncs);
             VRB("Session %d: thread %d event reply error.", nc_session_get_id(ncs), idx);
         }
-        if (rc & NC_PSPOLL_SESSION_TERM) {
+wait_for_unref:
+        if (rc & NC_PSPOLL_SESSION_TERM) { 
+            if (nc_session_get_refcnt(ncs)) { 
+               VRB("Session %d: thread %d event session still referenced.", nc_session_get_id(ncs), idx);
+               np_sleep(5000);
+               goto wait_for_unref;
+            }
             VRB("Session %d: thread %d event session terminated.", nc_session_get_id(ncs), idx);
             np2srv_del_session_cb(ncs);
         }

src/netconf.c

@@ -294,6 +294,7 @@ np2srv_rpc_get_cb(sr_session_ctx_t *session, const char *op_path, const struct l
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     op_filter_erase(&filter);
     lyd_free_withsiblings(data_get);
     free(username);
@@ -418,6 +419,7 @@ np2srv_rpc_editconfig_cb(sr_session_ctx_t *session, const char *UNUSED(op_path),
     if (user_sess) {
         /* discard any changes that possibly failed to be applied */
         sr_discard_changes(user_sess);
+        np_unref_user_sess(session);
     }
     lyd_free_withsiblings(config);
     return rc;
@@ -601,6 +603,7 @@ np2srv_rpc_copyconfig_cb(sr_session_ctx_t *session, const char *UNUSED(op_path),
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     lyd_free_withsiblings(config);
     free(username);
     return rc;
@@ -681,6 +684,7 @@ np2srv_rpc_deleteconfig_cb(sr_session_ctx_t *session, const char *UNUSED(op_path
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     return rc;
 }
 
@@ -737,6 +741,7 @@ np2srv_rpc_un_lock_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), co
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     return rc;
 }
 
@@ -821,6 +826,7 @@ np2srv_rpc_commit_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), con
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     return rc;
 }
 
@@ -859,6 +865,7 @@ np2srv_rpc_discard_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), co
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     return rc;
 }
 
@@ -937,6 +944,7 @@ np2srv_rpc_validate_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), c
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     lyd_free_withsiblings(config);
     return rc;
 }

src/netconf_nmda.c

@@ -258,6 +258,7 @@ np2srv_rpc_getdata_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), co
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     op_filter_erase(&filter);
     lyd_free_withsiblings(select_data);
     lyd_free_withsiblings(data);
@@ -355,6 +356,7 @@ np2srv_rpc_editdata_cb(sr_session_ctx_t *session, const char *UNUSED(op_path), c
     /* success */
 
 cleanup:
+    np_unref_user_sess(session);
     lyd_free_withsiblings(config);
     return rc;
 }