Changeset ebb1489 in mainline for uspace/srv/volsrv/volume.c

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/srv/volsrv/volume.c (modified) (14 diffs)

uspace/srv/volsrv/volume.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2018 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 #include <fibril_synch.h>
 #include <io/log.h>
+#include <sif.h>
 #include <stdbool.h>
 #include <stdlib.h>
@@ -60 +61 @@
     vol_volume_t **);
 static errno_t vol_volumes_load(sif_node_t *, vol_volumes_t *);
+static errno_t vol_volumes_save(vol_volumes_t *, sif_node_t *);
 
 /** Allocate new volume structure.
@@ -113 +115 @@
 {
         vol_volumes_t *volumes;
-        sif_sess_t *repo = NULL;
-        sif_trans_t *trans = NULL;
+        sif_doc_t *doc = NULL;
         sif_node_t *node;
+        sif_node_t *nvolumes;
         const char *ntype;
         errno_t rc;
@@ -123 +125 @@
                 return ENOMEM;
 
+        volumes->cfg_path = str_dup(cfg_path);
+        if (volumes->cfg_path == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
         fibril_mutex_initialize(&volumes->lock);
         list_initialize(&volumes->volumes);
@@ -128 +136 @@
 
         /* Try opening existing repository */
-        rc = sif_open(cfg_path, &repo);
+        rc = sif_load(cfg_path, &doc);
         if (rc != EOK) {
                 /* Failed to open existing, create new repository */
-                rc = sif_create(cfg_path, &repo);
+                rc = sif_new(&doc);
                 if (rc != EOK)
                         goto error;
 
-                rc = sif_trans_begin(repo, &trans);
+                /* Create 'volumes' node. */
+                rc = sif_node_append_child(sif_get_root(doc), "volumes",
+                    &nvolumes);
                 if (rc != EOK)
                         goto error;
 
-                /* Create 'volumes' node. */
-                rc = sif_node_append_child(trans, sif_get_root(repo),
-                    "volumes", &volumes->nvolumes);
+                rc = sif_save(doc, cfg_path);
                 if (rc != EOK)
                         goto error;
 
-                rc = sif_trans_end(trans);
-                if (rc != EOK)
-                        goto error;
-
-                trans = NULL;
+                sif_delete(doc);
         } else {
                 /*
-                 * Opened existing repo. Find 'volumes' node, should be
-                 * the first child of the root node.
+                 * Loaded existing configuration. Find 'volumes' node, should
+                 * be the first child of the root node.
                  */
-                node = sif_node_first_child(sif_get_root(repo));
+                node = sif_node_first_child(sif_get_root(doc));
 
                 /* Verify it's the correct node type */
@@ -167 +171 @@
                 if (rc != EOK)
                         goto error;
-        }
-
-        volumes->repo = repo;
+
+                sif_delete(doc);
+        }
+
         *rvolumes = volumes;
-
         return EOK;
 error:
-        if (trans != NULL)
-                sif_trans_abort(trans);
-        if (repo != NULL)
-                (void) sif_close(repo);
+        if (doc != NULL)
+                (void) sif_delete(doc);
+        if (volumes != NULL && volumes->cfg_path != NULL)
+                free(volumes->cfg_path);
         if (volumes != NULL)
                 free(volumes);
 
+        return rc;
+}
+
+/** Merge list of volumes into new file.
+ *
+ * @param volumes List of volumes
+ * @param cfg_path Path to file containing configuration repository in SIF
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t vol_volumes_merge_to(vol_volumes_t *volumes, const char *cfg_path)
+{
+        sif_doc_t *doc = NULL;
+        sif_node_t *node;
+        const char *ntype;
+        char *dcfg_path;
+        errno_t rc;
+
+        dcfg_path = str_dup(cfg_path);
+        if (dcfg_path == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        free(volumes->cfg_path);
+        volumes->cfg_path = dcfg_path;
+
+        /* Try opening existing repository */
+        rc = sif_load(cfg_path, &doc);
+        if (rc != EOK) {
+                /* Failed to open existing, create new repository */
+                rc = vol_volumes_sync(volumes);
+                if (rc != EOK)
+                        goto error;
+        } else {
+                /*
+                 * Loaded existing configuration. Find 'volumes' node, should
+                 * be the first child of the root node.
+                 */
+                node = sif_node_first_child(sif_get_root(doc));
+
+                /* Verify it's the correct node type */
+                ntype = sif_node_get_type(node);
+                if (str_cmp(ntype, "volumes") != 0) {
+                        rc = EIO;
+                        goto error;
+                }
+
+                rc = vol_volumes_load(node, volumes);
+                if (rc != EOK)
+                        goto error;
+
+                sif_delete(doc);
+        }
+
+        return EOK;
+error:
+        if (doc != NULL)
+                (void) sif_delete(doc);
+        return rc;
+}
+
+/** Sync volume configuration to config file.
+ *
+ * @param volumes List of volumes
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t vol_volumes_sync(vol_volumes_t *volumes)
+{
+        sif_doc_t *doc = NULL;
+        errno_t rc;
+
+        rc = sif_new(&doc);
+        if (rc != EOK)
+                goto error;
+
+        rc = vol_volumes_save(volumes, sif_get_root(doc));
+        if (rc != EOK)
+                goto error;
+
+        rc = sif_save(doc, volumes->cfg_path);
+        if (rc != EOK)
+                goto error;
+
+        sif_delete(doc);
+        return EOK;
+error:
+        if (doc != NULL)
+                (void) sif_delete(doc);
         return rc;
 }
@@ -206 +298 @@
         }
 
-        (void) sif_close(volumes->repo);
+        free(volumes->cfg_path);
         free(volumes);
 }
@@ -383 +475 @@
         char *mp;
         char *old_mp;
-        errno_t rc;
-        sif_trans_t *trans = NULL;
-        sif_node_t *nvolume;
+        bool was_persist;
 
         mp = str_dup(mountp);
@@ -391 +481 @@
                 return ENOMEM;
 
+        was_persist = vol_volume_is_persist(volume);
+
         old_mp = volume->mountp;
         volume->mountp = mp;
 
         if (vol_volume_is_persist(volume)) {
-                /* Volume is now persistent */
-                if (volume->nvolume == NULL) {
-                        /* Prevent volume from being freed */
+                if (!was_persist) {
+                        /*
+                         * Volume is now persistent. Prevent it from being
+                         * freed.
+                         */
                         refcount_up(&volume->refcnt);
-
-                        /* Create volume node */
-                        rc = sif_trans_begin(volume->volumes->repo, &trans);
-                        if (rc != EOK)
-                                goto error;
-
-                        rc = sif_node_append_child(trans,
-                            volume->volumes->nvolumes, "volume", &nvolume);
-                        if (rc != EOK)
-                                goto error;
-
-                        rc = sif_node_set_attr(trans, nvolume, "label",
-                            volume->label);
-                        if (rc != EOK)
-                                goto error;
-
-                        rc = sif_node_set_attr(trans, nvolume, "mountp",
-                            volume->mountp);
-                        if (rc != EOK)
-                                goto error;
-
-                        rc = sif_trans_end(trans);
-                        if (rc != EOK)
-                                goto error;
-
-                        trans = NULL;
-                        volume->nvolume = nvolume;
-                } else {
-                        /* Allow volume to be freed */
+                }
+        } else {
+                if (was_persist) {
+                        /*
+                         * Volume is now non-persistent
+                         * Allow volume to be freed.
+                         */
                         vol_volume_del_ref(volume);
-
-                        /* Update volume node */
-                        rc = sif_trans_begin(volume->volumes->repo, &trans);
-                        if (rc != EOK)
-                                goto error;
-
-                        rc = sif_node_set_attr(trans, volume->nvolume,
-                            "mountp", volume->mountp);
-                        if (rc != EOK)
-                                goto error;
-
-                        rc = sif_trans_end(trans);
-                        if (rc != EOK)
-                                goto error;
-
-                        trans = NULL;
-                }
-        } else {
-                /* Volume is now non-persistent */
-                if (volume->nvolume != NULL) {
-                        /* Delete volume node */
-                        rc = sif_trans_begin(volume->volumes->repo, &trans);
-                        if (rc != EOK)
-                                goto error;
-
-                        sif_node_destroy(trans, volume->nvolume);
-
-                        rc = sif_trans_end(trans);
-                        if (rc != EOK)
-                                goto error;
-
-                        volume->nvolume = NULL;
-                }
-        }
-
+                }
+        }
+
+        vol_volumes_sync(volume->volumes);
         free(old_mp);
         return EOK;
-error:
-        free(mp);
-        volume->mountp = old_mp;
-
-        if (trans != NULL)
-                sif_trans_abort(trans);
-        return rc;
 }
 
@@ -521 +555 @@
 }
 
-/** Load volumes from SIF repository.
+/** Load volumes from SIF document.
  *
  * @param nvolumes Volumes node
@@ -536 +570 @@
         errno_t rc;
 
-        volumes->nvolumes = nvolumes;
-
         nvolume = sif_node_first_child(nvolumes);
         while (nvolume != NULL) {
@@ -565 +597 @@
                 volume->mountp = str_dup(mountp);
 
-                volume->nvolume = nvolume;
                 fibril_mutex_lock(&volumes->lock);
                 vol_volume_add_locked(volumes, volume);
@@ -579 +610 @@
 }
 
+/** Save volumes to SIF document.
+ *
+ * @param volumes List of volumes
+ * @param rnode Configuration root node
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t vol_volumes_save(vol_volumes_t *volumes, sif_node_t *rnode)
+{
+        sif_node_t *nvolumes;
+        sif_node_t *node;
+        link_t *link;
+        vol_volume_t *volume;
+        errno_t rc;
+
+        /* Create 'volumes' node. */
+        rc = sif_node_append_child(rnode, "volumes", &nvolumes);
+        if (rc != EOK)
+                goto error;
+
+        link = list_first(&volumes->volumes);
+        while (link != NULL) {
+                volume = list_get_instance(link, vol_volume_t, lvolumes);
+
+                if (vol_volume_is_persist(volume)) {
+                        /* Create 'volume' node. */
+                        rc = sif_node_append_child(nvolumes, "volume", &node);
+                        if (rc != EOK)
+                                goto error;
+
+                        rc = sif_node_set_attr(node, "label", volume->label);
+                        if (rc != EOK)
+                                goto error;
+
+                        rc = sif_node_set_attr(node, "mountp", volume->mountp);
+                        if (rc != EOK)
+                                goto error;
+                }
+
+                link = list_next(&volume->lvolumes, &volumes->volumes);
+        }
+
+        return EOK;
+error:
+        return rc;
+}
+
 /** Get volume information.
  *