log OPTIMIZE append paths to data/schema paths

Instead of having to build the full path.

Author: michalvasko

src/log.c

@@ -381,27 +381,27 @@ ly_get_log_clb(void)
 }
 
 void
-ly_log_location(const struct lysc_node *scnode, const struct lyd_node *dnode, const char *spath, const struct ly_in *in)
+ly_log_location(const struct lysc_node *scnode, const struct lyd_node *dnode, const char *path, const struct ly_in *in)
 {
     if (scnode) {
         ly_set_add(&log_location.scnodes, (void *)scnode, 1, NULL);
     }
-    if (dnode || (!scnode && !spath && !in)) {
+    if (dnode || (!scnode && !path && !in)) {
         ly_set_add(&log_location.dnodes, (void *)dnode, 1, NULL);
     }
-    if (spath) {
-        char *s = strdup(spath);
+    if (path) {
+        char *s = strdup(path);
 
         LY_CHECK_ERR_RET(!s, LOGMEM(NULL), );
-        ly_set_add(&log_location.spaths, s, 1, NULL);
+        ly_set_add(&log_location.paths, s, 1, NULL);
     }
     if (in) {
         ly_set_add(&log_location.inputs, (void *)in, 1, NULL);
     }
 }
 
 void
-ly_log_location_revert(uint32_t scnode_steps, uint32_t dnode_steps, uint32_t spath_steps, uint32_t in_steps)
+ly_log_location_revert(uint32_t scnode_steps, uint32_t dnode_steps, uint32_t path_steps, uint32_t in_steps)
 {
     for (uint32_t i = scnode_steps; i && log_location.scnodes.count; i--) {
         log_location.scnodes.count--;
@@ -411,8 +411,8 @@ ly_log_location_revert(uint32_t scnode_steps, uint32_t dnode_steps, uint32_t spa
         log_location.dnodes.count--;
     }
 
-    for (uint32_t i = spath_steps; i && log_location.spaths.count; i--) {
-        ly_set_rm_index(&log_location.spaths, log_location.spaths.count - 1, free);
+    for (uint32_t i = path_steps; i && log_location.paths.count; i--) {
+        ly_set_rm_index(&log_location.paths, log_location.paths.count - 1, free);
     }
 
     for (uint32_t i = in_steps; i && log_location.inputs.count; i--) {
@@ -426,8 +426,8 @@ ly_log_location_revert(uint32_t scnode_steps, uint32_t dnode_steps, uint32_t spa
     if (dnode_steps && !log_location.dnodes.count) {
         ly_set_erase(&log_location.dnodes, NULL);
     }
-    if (spath_steps && !log_location.spaths.count) {
-        ly_set_erase(&log_location.spaths, free);
+    if (path_steps && !log_location.paths.count) {
+        ly_set_erase(&log_location.paths, free);
     }
     if (in_steps && !log_location.inputs.count) {
         ly_set_erase(&log_location.inputs, NULL);
@@ -808,21 +808,38 @@ ly_vlog_build_data_path(const struct ly_ctx *ctx, char **path)
 static LY_ERR
 ly_vlog_build_path_line(const struct ly_ctx *ctx, char **data_path, char **schema_path, uint64_t *line)
 {
+    int r;
+    char *path;
+
     *data_path = NULL;
     *schema_path = NULL;
     *line = 0;
 
-    if (log_location.spaths.count && ((const char *)(log_location.spaths.objs[log_location.spaths.count - 1]))[0]) {
-        /* simply get what is in the provided path string */
-        *schema_path = strdup(log_location.spaths.objs[log_location.spaths.count - 1]);
+    /* data/schema node */
+    if (log_location.dnodes.count) {
+        LY_CHECK_RET(ly_vlog_build_data_path(ctx, data_path));
+    } else if (log_location.scnodes.count) {
+        *schema_path = lysc_path(log_location.scnodes.objs[log_location.scnodes.count - 1], LYSC_PATH_LOG, NULL, 0);
         LY_CHECK_ERR_RET(!*schema_path, LOGMEM(ctx), LY_EMEM);
-    } else {
-        /* data/schema node */
-        if (log_location.dnodes.count) {
-            LY_CHECK_RET(ly_vlog_build_data_path(ctx, data_path));
-        } else if (log_location.scnodes.count) {
-            *schema_path = lysc_path(log_location.scnodes.objs[log_location.scnodes.count - 1], LYSC_PATH_LOG, NULL, 0);
-            LY_CHECK_ERR_RET(!*schema_path, LOGMEM(ctx), LY_EMEM);
+    }
+
+    if (log_location.paths.count && ((const char *)(log_location.paths.objs[log_location.paths.count - 1]))[0]) {
+        /* append the provided path string to data/schema path, if any */
+        if (*data_path) {
+            r = asprintf(&path, "%s%s", *data_path, (char *)log_location.paths.objs[log_location.paths.count - 1]);
+        } else if (*schema_path) {
+            r = asprintf(&path, "%s%s", *schema_path, (char *)log_location.paths.objs[log_location.paths.count - 1]);
+        } else {
+            r = asprintf(&path, "%s", (char *)log_location.paths.objs[log_location.paths.count - 1]);
+        }
+        LY_CHECK_ERR_RET(r == -1, LOGMEM(ctx), LY_EMEM);
+
+        if (*data_path) {
+            free(*data_path);
+            *data_path = path;
+        } else {
+            free(*schema_path);
+            *schema_path = path;
         }
     }
 

src/ly_common.h

@@ -75,7 +75,7 @@ struct ly_log_location_s {
     struct ly_set inputs;            /**< Set of const struct ly_in *in pointers providing the input handler with the line information (LIFO) */
     struct ly_set scnodes;           /**< Set of const struct lysc_node *scnode pointers providing the compiled schema node to generate path (LIFO) */
     struct ly_set dnodes;            /**< Set of const struct lyd_node *dnode pointers providing the data node to generate path (LIFO) */
-    struct ly_set spaths;            /**< Set of schema path strings (LIFO) */
+    struct ly_set paths;             /**< Set of path strings (LIFO) */
 };
 
 /**
@@ -122,21 +122,21 @@ void ly_err_move(struct ly_ctx *src_ctx, struct ly_ctx *trg_ctx);
  *
  * @param[in] scnode Compiled schema node.
  * @param[in] dnode Data node.
- * @param[in] spath Direct schema path string to print.
+ * @param[in] path Direct path string to append and print.
  * @param[in] in Input handler (providing line number).
  */
 void ly_log_location(const struct lysc_node *scnode, const struct lyd_node *dnode,
-        const char *spath, const struct ly_in *in);
+        const char *path, const struct ly_in *in);
 
 /**
  * @brief Revert the specific logger location data by number of changes made by ::ly_log_location().
  *
  * @param[in] scnode_steps Number of items in ::ly_log_location_s.scnodes to forget.
  * @param[in] dnode_steps Number of items in ::ly_log_location_s.dnodes to forget.
- * @param[in] spath_steps Number of path strings in ::ly_log_location_s.spaths to forget.
+ * @param[in] path_steps Number of path strings in ::ly_log_location_s.paths to forget.
  * @param[in] in_steps Number of input handlers ::ly_log_location_s.inputs to forget.
  */
-void ly_log_location_revert(uint32_t scnode_steps, uint32_t dnode_steps, uint32_t spath_steps, uint32_t in_steps);
+void ly_log_location_revert(uint32_t scnode_steps, uint32_t dnode_steps, uint32_t path_steps, uint32_t in_steps);
 
 /**
  * @brief Get the stored data node for logging at the index.

src/parser_common.c

@@ -321,7 +321,7 @@ lyd_parser_create_meta(struct lyd_ctx *lydctx, struct lyd_node *parent, struct l
         void *prefix_data, uint32_t hints, const struct lysc_node *ctx_node)
 {
     LY_ERR rc = LY_SUCCESS;
-    char *dpath = NULL, *path = NULL;
+    char *path = NULL;
     ly_bool incomplete;
     struct lyd_meta *first = NULL;
     ly_bool store_only = (lydctx->parse_opts & LYD_PARSE_STORE_ONLY) == LYD_PARSE_STORE_ONLY ? 1 : 0;
@@ -332,8 +332,7 @@ lyd_parser_create_meta(struct lyd_ctx *lydctx, struct lyd_node *parent, struct l
     }
 
     /* generate path to the metadata */
-    LY_CHECK_RET(ly_vlog_build_data_path(lydctx->data_ctx->ctx, &dpath));
-    if (asprintf(&path, "%s/@%s:%.*s", dpath, mod->name, (int)name_len, name) == -1) {
+    if (asprintf(&path, "/@%s:%.*s", mod->name, (int)name_len, name) == -1) {
         LOGMEM(lydctx->data_ctx->ctx);
         rc = LY_EMEM;
         goto cleanup;
@@ -354,7 +353,6 @@ lyd_parser_create_meta(struct lyd_ctx *lydctx, struct lyd_node *parent, struct l
 
 cleanup:
     ly_log_location_revert(0, 0, 1, 0);
-    free(dpath);
     free(path);
     return rc;
 }

src/schema_compile.c

@@ -1056,11 +1056,9 @@ lys_compile_unres_llist_dflts(struct lysc_ctx *ctx, struct lysc_node_leaflist *l
         for (u = orig_count; u < LY_ARRAY_COUNT(llist->dflts); ++u) {
             for (v = 0; v < u; ++v) {
                 if (!llist->dflts[u]->realtype->plugin->compare(ctx->ctx, llist->dflts[u], llist->dflts[v])) {
-                    lysc_update_path(ctx, llist->parent ? llist->parent->module : NULL, llist->name);
                     LOGVAL(ctx->ctx, LYVE_SEMANTICS, "Configuration leaf-list has multiple defaults of the same value \"%s\".",
                             (char *)llist->dflts[u]->realtype->plugin->print(ctx->ctx, llist->dflts[u], LY_VALUE_CANON,
                             NULL, NULL, NULL));
-                    lysc_update_path(ctx, NULL, NULL);
                     return LY_EVALID;
                 }
             }