context UPDATE support sharing context data

Useful for schema-mount contexts.

Author: michalvasko

src/context.c

@@ -1486,8 +1486,10 @@ ly_ctx_destroy(struct ly_ctx *ctx)
     }
 
     if (ctx->opts & LY_CTX_INT_IMMUTABLE) {
-        /* ctx data */
-        ly_ctx_data_del(ctx);
+        if (!ctx->parent_ctx) {
+            /* ctx data */
+            ly_ctx_data_del(ctx);
+        }
         lyplg_clean();
         return;
     }
@@ -1519,8 +1521,10 @@ ly_ctx_destroy(struct ly_ctx *ctx)
     /* leftover unres */
     lys_unres_glob_erase(&ctx->unres);
 
-    /* ctx data */
-    ly_ctx_data_del(ctx);
+    if (!ctx->parent_ctx) {
+        /* ctx data */
+        ly_ctx_data_del(ctx);
+    }
 
     /* dictionary */
     lydict_clean(&ctx->dict);

src/log.c

@@ -200,26 +200,6 @@ ly_err_last(const struct ly_ctx *ctx)
     return ctx_data->errs ? ctx_data->errs->prev : NULL;
 }
 
-void
-ly_err_move(struct ly_ctx *src_ctx, struct ly_ctx *trg_ctx)
-{
-    struct ly_ctx_private_data *src_data, *trg_data;
-    struct ly_err_item *errs = NULL;
-
-    /* get src context errs */
-    src_data = ly_ctx_private_data_get_or_create(src_ctx);
-    errs = src_data->errs;
-    src_data->errs = NULL;
-
-    /* get and free the trg context errs */
-    trg_data = ly_ctx_private_data_get_or_create(trg_ctx);
-    ly_err_free(trg_data->errs);
-
-    /* set them for trg */
-    ly_err_free(trg_data->errs);
-    trg_data->errs = errs;
-}
-
 LIBYANG_API_DEF void
 ly_err_free(void *ptr)
 {

src/ly_common.c

@@ -255,6 +255,11 @@ ly_ctx_private_data_get_or_create(const struct ly_ctx *ctx)
     struct ly_ctx_private_data *private_data;
     LY_ERR r;
 
+    while (ctx->parent_ctx) {
+        /* find the right context */
+        ctx = ctx->parent_ctx;
+    }
+
     /* RD LOCK */
     pthread_rwlock_rdlock(&ly_ctx_data_rwlock);
 
@@ -414,6 +419,11 @@ ly_ctx_shared_data_get(const struct ly_ctx *ctx)
 {
     struct ly_ctx_shared_data *shared_data;
 
+    while (ctx->parent_ctx) {
+        /* find the right context */
+        ctx = ctx->parent_ctx;
+    }
+
     /* RD LOCK */
     pthread_rwlock_rdlock(&ly_ctx_data_rwlock);
 

src/ly_common.h

@@ -113,14 +113,6 @@ LY_ERR ly_vlog_build_data_path(const struct ly_ctx *ctx, char **path);
  */
 void ly_vlog(const struct ly_ctx *ctx, const char *apptag, LY_VECODE code, const char *format, ...) _FORMAT_PRINTF(4, 5);
 
-/**
- * @brief Move error items from source to target context replacing any previous ones.
- *
- * @param[in] src_ctx Source context to read errors from.
- * @param[in] trg_ctx Target context to set the errors for.
- */
-void ly_err_move(struct ly_ctx *src_ctx, struct ly_ctx *trg_ctx);
-
 /**
  * @brief Logger location data setter.
  *
@@ -401,6 +393,7 @@ struct ly_ctx {
 
     struct ly_set plugins_types;      /**< context specific set of type plugins */
     struct ly_set plugins_extensions; /**< contets specific set of extension plugins */
+    struct ly_ctx *parent_ctx;        /**< pointer to the parent context whose shared and private data to use, if set */
 };
 
 /**

src/parser_common.c

@@ -299,18 +299,11 @@ LY_ERR
 lyd_parser_create_term(struct lyd_ctx *lydctx, const struct lysc_node *schema, const void *value, uint32_t value_bits_len,
         ly_bool *dynamic, LY_VALUE_FORMAT format, void *prefix_data, uint32_t hints, struct lyd_node **node)
 {
-    LY_ERR r;
     ly_bool incomplete;
     ly_bool store_only = (lydctx->parse_opts & LYD_PARSE_STORE_ONLY) == LYD_PARSE_STORE_ONLY ? 1 : 0;
 
-    if ((r = lyd_create_term(schema, value, value_bits_len, 1, store_only, dynamic, format, prefix_data, hints,
-            lydctx->ext, &incomplete, node))) {
-        if (lydctx->data_ctx->ctx != schema->module->ctx) {
-            /* move errors to the main context */
-            ly_err_move(schema->module->ctx, (struct ly_ctx *)lydctx->data_ctx->ctx);
-        }
-        return r;
-    }
+    LY_CHECK_RET(lyd_create_term(schema, value, value_bits_len, 1, store_only, dynamic, format, prefix_data, hints,
+            lydctx->ext, &incomplete, node));
 
     if (incomplete && !(lydctx->parse_opts & LYD_PARSE_ONLY)) {
         LY_CHECK_RET(ly_set_add(&lydctx->node_types, *node, 1, NULL));

src/plugins_exts.c

@@ -4,7 +4,7 @@
  * @author Michal Vasko <[email protected]>
  * @brief helper functions for extension plugins
  *
- * Copyright (c) 2019 - 2024 CESNET, z.s.p.o.
+ * Copyright (c) 2019 - 2025 CESNET, z.s.p.o.
  *
  * This source code is licensed under BSD 3-Clause License (the "License").
  * You may not use this file except in compliance with the License.
@@ -737,3 +737,37 @@ lyplg_ext_get_data(const struct ly_ctx *ctx, const struct lysc_ext_instance *ext
     pthread_mutex_unlock(&ctx_data->ext_clb_lock);
     return rc;
 }
+
+LIBYANG_API_DEF LY_ERR
+lyplg_ext_set_parent_ctx(struct ly_ctx *ctx, const struct ly_ctx *parent_ctx)
+{
+    const struct ly_ctx *c;
+
+    LY_CHECK_ARG_RET(ctx, ctx, LY_EINVAL);
+
+    if (ctx->parent_ctx == parent_ctx) {
+        return LY_SUCCESS;
+    }
+
+    /* prevent circular reference chain */
+    c = parent_ctx;
+    do {
+        if (c->parent_ctx == ctx) {
+            LOGERR(ctx, LY_EDENIED, "Circular references of parent contexts.");
+            return LY_EDENIED;
+        }
+
+        c = c->parent_ctx;
+    } while (c);
+
+    if (!ctx->parent_ctx) {
+        /* remove its shared and private data */
+        ly_ctx_data_del(ctx);
+    } else if (!parent_ctx) {
+        /* create its shared and private data */
+        LY_CHECK_RET(ly_ctx_data_add(ctx));
+    }
+
+    ctx->parent_ctx = (struct ly_ctx *)parent_ctx;
+    return LY_SUCCESS;
+}

src/plugins_exts.h

@@ -1112,6 +1112,16 @@ LIBYANG_API_DECL LY_ERR lyplg_ext_parsed_get_storage(const struct lysc_ext_insta
 LIBYANG_API_DECL LY_ERR lyplg_ext_get_data(const struct ly_ctx *ctx, const struct lysc_ext_instance *ext,
         const struct lyd_node *parent, void **ext_data, ly_bool *ext_data_free);
 
+/**
+ * @brief Set parent context of a context. Errors and callbacks of the parent context will then always be used.
+ *
+ * @param[in] ctx Context to change.
+ * @param[in] parent_ctx Parent context to set.
+ * @return LY_SUCCESS on success.
+ * @return LY_ERR on error.
+ */
+LIBYANG_API_DECL LY_ERR lyplg_ext_set_parent_ctx(struct ly_ctx *ctx, const struct ly_ctx *parent_ctx);
+
 /**
  * @brief Insert extension instance data into a parent.
  *

src/plugins_exts/schema_mount.c

@@ -347,6 +347,9 @@ schema_mount_create_ctx(const struct lysc_ext_instance *ext, const struct lyd_no
         }
     }
 
+    /* set the parent context */
+    lyplg_ext_set_parent_ctx(*ext_ctx, ext->module->ctx);
+
 cleanup:
     free(sdirs);
     return rc;
@@ -1060,8 +1063,7 @@ schema_mount_validate(struct lysc_ext_instance *ext, struct lyd_node *sibling, c
         enum lyd_type data_type, uint32_t val_opts, struct lyd_node **diff)
 {
     LY_ERR ret = LY_SUCCESS;
-    uint32_t *prev_lo, temp_lo = LY_LOSTORE_LAST, i;
-    const struct ly_err_item *err;
+    uint32_t i;
     struct lyd_node *iter, *ext_data = NULL, *ref_first = NULL, *orig_parent = lyd_parent(sibling), *op_tree;
     struct lyd_node *ext_diff = NULL, *diff_parent = NULL;
     ly_bool ext_data_free = 0;
@@ -1107,9 +1109,6 @@ schema_mount_validate(struct lysc_ext_instance *ext, struct lyd_node *sibling, c
         }
     }
 
-    /* only store messages in the context, log as an extension */
-    prev_lo = ly_temp_log_options(&temp_lo);
-
     if (data_type == LYD_TYPE_DATA_YANG) {
         /* validate all the modules with data */
         ret = lyd_validate_all(&sibling, NULL, val_opts | LYD_VALIDATE_PRESENT, diff ? &ext_diff : NULL);
@@ -1118,9 +1117,6 @@ schema_mount_validate(struct lysc_ext_instance *ext, struct lyd_node *sibling, c
         ret = lyd_validate_op(op_tree, dep_tree, data_type, diff ? &ext_diff : NULL);
     }
 
-    /* restore logging */
-    ly_temp_log_options(prev_lo);
-
     /* restore sibling tree */
     for (i = 0; i < ref_set->count; ++i) {
         if (ref_set->dnodes[i] == sibling) {
@@ -1134,17 +1130,6 @@ schema_mount_validate(struct lysc_ext_instance *ext, struct lyd_node *sibling, c
     lyplg_ext_insert(orig_parent, sibling);
 
     if (ret) {
-        /* log the error in the original context */
-        err = ly_err_first(LYD_CTX(sibling));
-        if (!err) {
-            lyplg_ext_compile_log(NULL, ext, LY_LLERR, ret, "Unknown validation error (err code %d).", ret);
-        } else {
-            while (err) {
-                lyplg_ext_compile_log_err(err, ext);
-                err = err->next;
-            }
-            ly_err_clean((struct ly_ctx *)LYD_CTX(sibling), NULL);
-        }
         goto cleanup;
     }
 
@@ -1587,6 +1572,7 @@ schema_mount_compiled_print(const struct lysc_ext_instance *orig_ext, struct lys
             ctx_mem = *mem;
             LY_CHECK_RET(ly_ctx_compiled_print(orig_sm_data->shared->schemas[i].ctx, ctx_mem, mem));
             LY_CHECK_RET(ly_ctx_new_printed(ctx_mem, &sm_data->shared->schemas[i].ctx));
+            LY_CHECK_RET(lyplg_ext_set_parent_ctx(ctx_mem, ext->module->ctx));
             sm_data->shared->schemas[i].ctx = ctx_mem;
 
             /* mount_point */

src/printer_context.c

@@ -1790,6 +1790,9 @@ ly_ctx_compiled_print_context(const struct ly_ctx *orig_ctx, struct ly_ctx *ctx,
     /* no dynamic plugin support */
     memset(&ctx->plugins_types, 0, sizeof ctx->plugins_types);
     memset(&ctx->plugins_extensions, 0, sizeof ctx->plugins_extensions);
+
+    /* parent context, needs to be set manually */
+    ctx->parent_ctx = NULL;
 }
 
 LY_ERR

tests/utests/extensions/test_schema_mount.c

@@ -410,22 +410,22 @@ test_parse_invalid(void **state)
             "  </mount-point>"
             "</schema-mounts>");
     CHECK_PARSE_LYD_PARAM(xml, LYD_XML, LYD_PARSE_STRICT, LYD_VALIDATE_PRESENT, LY_EVALID, data);
-    CHECK_LOG_CTX("Ext plugin \"ly2 schema mount\": Mandatory node \"type\" instance does not exist.",
+    CHECK_LOG_CTX("Mandatory node \"type\" instance does not exist.",
             "/ietf-interfaces:interfaces/interface[name='bu']", 0);
     CHECK_PARSE_LYD_PARAM(json, LYD_JSON, LYD_PARSE_STRICT, LYD_VALIDATE_PRESENT, LY_EVALID, data);
-    CHECK_LOG_CTX("Ext plugin \"ly2 schema mount\": Mandatory node \"type\" instance does not exist.",
+    CHECK_LOG_CTX("Mandatory node \"type\" instance does not exist.",
             "/ietf-interfaces:interfaces/interface[name='bu']", 0);
 
     /* same validation fail in separate validation */
     CHECK_PARSE_LYD_PARAM(xml, LYD_XML, LYD_PARSE_STRICT | LYD_PARSE_ONLY, 0, LY_SUCCESS, data);
     assert_int_equal(LY_EVALID, lyd_validate_all(&data, NULL, LYD_VALIDATE_PRESENT, NULL));
-    CHECK_LOG_CTX("Ext plugin \"ly2 schema mount\": Mandatory node \"type\" instance does not exist.",
+    CHECK_LOG_CTX("Mandatory node \"type\" instance does not exist.",
             "/ietf-interfaces:interfaces/interface[name='bu']", 0);
     lyd_free_siblings(data);
 
     CHECK_PARSE_LYD_PARAM(json, LYD_JSON, LYD_PARSE_STRICT | LYD_PARSE_ONLY, 0, LY_SUCCESS, data);
     assert_int_equal(LY_EVALID, lyd_validate_all(&data, NULL, LYD_VALIDATE_PRESENT, NULL));
-    CHECK_LOG_CTX("Ext plugin \"ly2 schema mount\": Mandatory node \"type\" instance does not exist.",
+    CHECK_LOG_CTX("Mandatory node \"type\" instance does not exist.",
             "/ietf-interfaces:interfaces/interface[name='bu']", 0);
     lyd_free_siblings(data);
 
@@ -1130,8 +1130,7 @@ test_parse_shared_parent_ref(void **state)
             "</root3>\n"
             "<target xmlns=\"urn:sm\">wrong-target-value</target>\n";
     CHECK_PARSE_LYD_PARAM(xml, LYD_XML, LYD_PARSE_STRICT, LYD_VALIDATE_PRESENT, LY_EVALID, data);
-    CHECK_LOG_CTX("Ext plugin \"ly2 schema mount\": "
-            "Invalid leafref value \"target-value\" - no target instance \"/sm:target\" with the same value.",
+    CHECK_LOG_CTX("Invalid leafref value \"target-value\" - no target instance \"/sm:target\" with the same value.",
             "/ietf-interfaces:interfaces/interface[name='bu']/sm:sm-name", 0);
 
     json =
@@ -1155,8 +1154,7 @@ test_parse_shared_parent_ref(void **state)
             "  \"sm:target\": \"wrong-target-value\"\n"
             "}\n";
     CHECK_PARSE_LYD_PARAM(json, LYD_JSON, LYD_PARSE_STRICT, LYD_VALIDATE_PRESENT, LY_EVALID, data);
-    CHECK_LOG_CTX("Ext plugin \"ly2 schema mount\": "
-            "Invalid leafref value \"target-value\" - no target instance \"/sm:target\" with the same value.",
+    CHECK_LOG_CTX("Invalid leafref value \"target-value\" - no target instance \"/sm:target\" with the same value.",
             "/ietf-interfaces:interfaces/interface[name='bu']/sm:sm-name", 0);
 
     /* success */
@@ -1859,8 +1857,7 @@ test_xpath(void **state)
             "  </root>\n"
             "</root>\n";
     CHECK_PARSE_LYD_PARAM(xml, LYD_XML, LYD_PARSE_STRICT, LYD_VALIDATE_PRESENT, LY_EVALID, data);
-    CHECK_LOG_CTX("Ext plugin \"ly2 schema mount\": "
-            "Must condition \"/m:root/l1 = 'valid'\" not satisfied.",
+    CHECK_LOG_CTX("Must condition \"/m:root/l1 = 'valid'\" not satisfied.",
             "/mount:root/l1", 0);
 
     /* non-existing instance-identifier */