Changeset 63c1dd5 in mainline for uspace/srv

Timestamp:

2018-10-09T08:40:53Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

63a045c

Parents:

ee9c703

git-author:

Jiri Svoboda <jiri@…> (2018-10-08 18:38:16)

git-committer:

Jiri Svoboda <jiri@…> (2018-10-09 08:40:53)

Message:

Persistence of Tetris highscore table. Detect live mode and create directory structure in init task. Reading volume configuration, vol -c.

Location:

uspace/srv/volsrv

Files:

• types/volume.h (modified) (2 diffs)
• volsrv.c (modified) (2 diffs)
• volume.c (modified) (5 diffs)
• volume.h (modified) (2 diffs)

uspace/srv/volsrv/types/volume.h

@@ -49 +49 @@
         /** Link to vol_volumes */
         link_t lvolumes;
+        /** ID used by clients to refer to the volume */
+        volume_id_t id;
         /** Reference count */
         atomic_refcount_t refcnt;
@@ -69 +71 @@
         /** Volumes SIF node */
         sif_node_t *nvolumes;
+        /** Next ID */
+        sysarg_t next_id;
 } vol_volumes_t;
 

uspace/srv/volsrv/volsrv.c

@@ -419 +419 @@
 }
 
+static void vol_get_volumes_srv(vol_parts_t *parts, ipc_call_t *icall)
+{
+        ipc_call_t call;
+        size_t size;
+        size_t act_size;
+        errno_t rc;
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "vol_get_volumes_srv()");
+
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                return;
+        }
+
+        volume_id_t *id_buf = (volume_id_t *) malloc(size);
+        if (id_buf == NULL) {
+                async_answer_0(&call, ENOMEM);
+                async_answer_0(icall, ENOMEM);
+                return;
+        }
+
+        rc = vol_get_ids(parts->volumes, id_buf, size, &act_size);
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        errno_t retval = async_data_read_finalize(&call, id_buf, size);
+        free(id_buf);
+
+        async_answer_1(icall, retval, act_size);
+}
+
+static void vol_info_srv(vol_parts_t *parts, ipc_call_t *icall)
+{
+        volume_id_t vid;
+        vol_volume_t *volume;
+        vol_info_t vinfo;
+        errno_t rc;
+
+        vid.id = IPC_GET_ARG1(*icall);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_info_srv(%zu)", vid.id);
+
+        rc = vol_volume_find_by_id_ref(parts->volumes, vid, &volume);
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_info_srv: volume %zu not found",
+                    vid.id);
+                async_answer_0(icall, ENOENT);
+                return;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "vol_info_srv: vol_volume_get_info");
+        rc = vol_volume_get_info(volume, &vinfo);
+        if (rc != EOK) {
+                async_answer_0(icall, EIO);
+                goto error;
+        }
+
+        ipc_call_t call;
+        size_t size;
+        if (!async_data_read_receive(&call, &size)) {
+                async_answer_0(&call, EREFUSED);
+                async_answer_0(icall, EREFUSED);
+                goto error;
+        }
+
+        if (size != sizeof(vol_info_t)) {
+                async_answer_0(&call, EINVAL);
+                async_answer_0(icall, EINVAL);
+                goto error;
+        }
+
+        rc = async_data_read_finalize(&call, &vinfo,
+            min(size, sizeof(vinfo)));
+        if (rc != EOK) {
+                async_answer_0(&call, rc);
+                async_answer_0(icall, rc);
+                goto error;
+        }
+
+        async_answer_0(icall, EOK);
+error:
+        vol_volume_del_ref(volume);
+}
+
 static void vol_client_conn(ipc_call_t *icall, void *arg)
 {
@@ -467 +554 @@
                         vol_part_set_mountp_srv(parts, &call);
                         break;
+                case VOL_GET_VOLUMES:
+                        vol_get_volumes_srv(parts, &call);
+                        break;
+                case VOL_INFO:
+                        vol_info_srv(parts, &call);
+                        break;
                 default:
                         async_answer_0(&call, EINVAL);

uspace/srv/volsrv/volume.c

@@ -125 +125 @@
         fibril_mutex_initialize(&volumes->lock);
         list_initialize(&volumes->volumes);
+        volumes->next_id = 1;
 
         /* Try opening existing repository */
@@ -222 +223 @@
         volume->volumes = volumes;
         list_append(&volume->lvolumes, &volumes->volumes);
+        volume->id.id = volumes->next_id;
+        ++volumes->next_id;
 }
 
@@ -294 +297 @@
 }
 
+/** Find volume structure by ID with locked volumes lock.
+ * *
+ * @param volumes List of volumes
+ * @param vid Volume ID
+ * @param rvolume Place to store pointer to volume structure (existing or new)
+ *
+ * @return EOK on success, ENOENT if not found
+ */
+static errno_t vol_volume_find_by_id_ref_locked(vol_volumes_t *volumes,
+    volume_id_t vid, vol_volume_t **rvolume)
+{
+        assert(fibril_mutex_is_locked(&volumes->lock));
+
+        list_foreach(volumes->volumes, lvolumes, vol_volume_t, volume) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG2,
+                    "vol_volume_find_by_id_ref_locked(%zu==%zu)?",
+                    volume->id.id, vid.id);
+                if (volume->id.id == vid.id) {
+                        log_msg(LOG_DEFAULT, LVL_DEBUG2,
+                            "vol_volume_find_by_id_ref_locked: found");
+                        /* Add reference */
+                        refcount_up(&volume->refcnt);
+                        *rvolume = volume;
+                        return EOK;
+                }
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG2,
+            "vol_volume_find_by_id_ref_locked: not found");
+        return ENOENT;
+}
+
+/** Find volume by ID.
+ *
+ * @param volumes Volumes
+ * @param vid Volume ID
+ * @param rvolume Place to store pointer to volume, with reference count
+ *                increased.
+ * @return EOK on success or an error code
+ */
+errno_t vol_volume_find_by_id_ref(vol_volumes_t *volumes, volume_id_t vid,
+    vol_volume_t **rvolume)
+{
+        errno_t rc;
+
+        fibril_mutex_lock(&volumes->lock);
+        rc = vol_volume_find_by_id_ref_locked(volumes, vid, rvolume);
+        fibril_mutex_unlock(&volumes->lock);
+
+        return rc;
+}
+
 /** Determine if volume has non-default settings that need to persist.
  *
@@ -416 +471 @@
 }
 
+/** Get list of volume IDs.
+ *
+ * Get the list of IDs of all persistent volumes (volume configuration
+ * entries).
+ *
+ * @param volumes Volumes
+ * @param id_buf Buffer to hold the IDs
+ * @param buf_size Buffer size in bytes
+ * @param act_size Place to store actual number bytes needed
+ * @return EOK on success or an error code
+ */
+errno_t vol_get_ids(vol_volumes_t *volumes, volume_id_t *id_buf,
+    size_t buf_size, size_t *act_size)
+{
+        size_t act_cnt;
+        size_t buf_cnt;
+
+        fibril_mutex_lock(&volumes->lock);
+
+        buf_cnt = buf_size / sizeof(volume_id_t);
+
+        act_cnt = 0;
+        list_foreach(volumes->volumes, lvolumes, vol_volume_t, volume) {
+                if (vol_volume_is_persist(volume))
+                        ++act_cnt;
+        }
+        *act_size = act_cnt * sizeof(volume_id_t);
+
+        if (buf_size % sizeof(volume_id_t) != 0) {
+                fibril_mutex_unlock(&volumes->lock);
+                return EINVAL;
+        }
+
+        size_t pos = 0;
+        list_foreach(volumes->volumes, lvolumes, vol_volume_t, volume) {
+                if (vol_volume_is_persist(volume)) {
+                        if (pos < buf_cnt)
+                                id_buf[pos].id = volume->id.id;
+                        pos++;
+                }
+        }
+
+        fibril_mutex_unlock(&volumes->lock);
+        return EOK;
+}
+
 /** Load volumes from SIF repository.
  *
@@ -474 +575 @@
 }
 
+/** Get volume information.
+ *
+ * @param volume Volume
+ * @param vinfo Volume information structure to safe info to
+ * @return EOK on success or an error code
+ */
+errno_t vol_volume_get_info(vol_volume_t *volume, vol_info_t *vinfo)
+{
+        vinfo->id = volume->id;
+        str_cpy(vinfo->label, sizeof(vinfo->label), volume->label);
+        str_cpy(vinfo->path, sizeof(vinfo->path), volume->mountp);
+        return EOK;
+}
+
 /** @}
  */

uspace/srv/volsrv/volume.h

@@ -38 +38 @@
 #define VOLUME_H_
 
+#include "types/vol.h"
 #include "types/volume.h"
 
@@ -44 +45 @@
 extern errno_t vol_volume_lookup_ref(vol_volumes_t *, const char *,
     vol_volume_t **);
+extern errno_t vol_volume_find_by_id_ref(vol_volumes_t *, volume_id_t,
+    vol_volume_t **);
 extern void vol_volume_del_ref(vol_volume_t *);
 extern errno_t vol_volume_set_mountp(vol_volume_t *, const char *);
+extern errno_t vol_get_ids(vol_volumes_t *, volume_id_t *, size_t,
+    size_t *);
+extern errno_t vol_volume_get_info(vol_volume_t *, vol_info_t *);
 
 #endif