commit 22b2622b9e9bc40072763117e48af619cc437283
author Michal Vasko <mvasko@cesnet.cz> Fri Jul 30 11:16:47 2021 +0200
committer Michal Vasko <mvasko@cesnet.cz> Fri Jul 30 11:16:47 2021 +0200
tree 9e4ca99a0db197a8e0fcf2213a6ca2b10750780e
parent 1b9e7f696fa6ecfd5cef89ff226182bc7c3b0a16

schema compile BUGFIX persistent global unres

... when explicit compilation is used. In that
case we need to remember all the new added/
implemented modules for a valid revert if the
compilation fails.

Refs sysrepo/sysrepo#2525

src/context.c

diff --git a/src/context.c b/src/context.c
index 69c3b77..8ed79db 100644
--- a/src/context.c
+++ b/src/context.c
@@ -191,33 +191,35 @@
 ly_ctx_load_module(struct ly_ctx *ctx, const char *name, const char *revision, const char **features)
 {
     struct lys_module *mod = NULL;
-    struct lys_glob_unres unres = {0};
     LY_ERR ret = LY_SUCCESS;
 
     LY_CHECK_ARG_RET(ctx, ctx, name, NULL);
 
     /* load and parse */
-    ret = lys_parse_load(ctx, name, revision, &unres.creating, &mod);
+    ret = lys_parse_load(ctx, name, revision, &ctx->unres.creating, &mod);
     LY_CHECK_GOTO(ret, cleanup);
 
     /* implement */
-    ret = _lys_set_implemented(mod, features, &unres);
+    ret = _lys_set_implemented(mod, features, &ctx->unres);
     LY_CHECK_GOTO(ret, cleanup);
 
     if (!(ctx->flags & LY_CTX_EXPLICIT_COMPILE)) {
         /* create dep set for the module and mark all the modules that will be (re)compiled */
-        LY_CHECK_GOTO(ret = lys_unres_dep_sets_create(ctx, &unres.dep_sets, mod), cleanup);
+        LY_CHECK_GOTO(ret = lys_unres_dep_sets_create(ctx, &ctx->unres.dep_sets, mod), cleanup);
 
         /* (re)compile the whole dep set (other dep sets will have no modules marked for compilation) */
-        LY_CHECK_GOTO(ret = lys_compile_depset_all(ctx, &unres), cleanup);
+        LY_CHECK_GOTO(ret = lys_compile_depset_all(ctx, &ctx->unres), cleanup);
+
+        /* unres resolved */
+        lys_unres_glob_erase(&ctx->unres);
     }
 
 cleanup:
     if (ret) {
-        lys_unres_glob_revert(ctx, &unres);
+        lys_unres_glob_revert(ctx, &ctx->unres);
+        lys_unres_glob_erase(&ctx->unres);
         mod = NULL;
     }
-    lys_unres_glob_erase(&unres);
     return mod;
 }
 
@@ -505,22 +507,21 @@
 ly_ctx_compile(struct ly_ctx *ctx)
 {
     LY_ERR ret = LY_SUCCESS;
-    struct lys_glob_unres unres = {0};
 
     LY_CHECK_ARG_RET(NULL, ctx, LY_EINVAL);
 
     /* create dep sets and mark all the modules that will be (re)compiled */
-    LY_CHECK_GOTO(ret = lys_unres_dep_sets_create(ctx, &unres.dep_sets, NULL), cleanup);
+    LY_CHECK_GOTO(ret = lys_unres_dep_sets_create(ctx, &ctx->unres.dep_sets, NULL), cleanup);
 
     /* (re)compile all the dep sets */
-    LY_CHECK_GOTO(ret = lys_compile_depset_all(ctx, &unres), cleanup);
+    LY_CHECK_GOTO(ret = lys_compile_depset_all(ctx, &ctx->unres), cleanup);
 
 cleanup:
     if (ret) {
         /* revert changes of modules */
-        lys_unres_glob_revert(ctx, &unres);
+        lys_unres_glob_revert(ctx, &ctx->unres);
     }
-    lys_unres_glob_erase(&unres);
+    lys_unres_glob_erase(&ctx->unres);
     return ret;
 }
 
@@ -1223,6 +1224,9 @@
     /* search paths list */
     ly_set_erase(&ctx->search_paths, free);
 
+    /* leftover unres */
+    lys_unres_glob_erase(&ctx->unres);
+
     /* clean the error list */
     ly_err_clean(ctx, 0);
     pthread_key_delete(ctx->errlist_key);