Changeset 63c1dd5 in mainline for uspace/app

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/app

Files:

• init/init.c (modified) (4 diffs)
• sysinst/sysinst.c (modified) (3 diffs)
• tetris/scores.c (modified) (2 diffs)
• vol/vol.c (modified) (4 diffs)

uspace/app/init/init.c

@@ -47 +47 @@
 #include <config.h>
 #include <io/logctl.h>
+#include <vol.h>
 #include "untar.h"
 #include "init.h"
@@ -70 +71 @@
 #define srv_start(path, ...) \
         srv_startl(path, path, ##__VA_ARGS__, NULL)
+
+static const char *sys_dirs[] = {
+        "/w/cfg",
+        "/w/data"
+};
 
 /** Print banner */
@@ -320 +326 @@
 }
 
+/** Init system volume.
+ *
+ * See if system volume is configured. If so, try to wait for it to become
+ * available. If not, create basic directories for live image omde.
+ */
+static errno_t init_sysvol(void)
+{
+        vol_t *vol = NULL;
+        vol_info_t vinfo;
+        volume_id_t *volume_ids = NULL;
+        size_t nvols;
+        size_t i;
+        errno_t rc;
+        bool found_cfg;
+        const char **cp;
+
+        rc = vol_create(&vol);
+        if (rc != EOK) {
+                printf("Error contacting volume service.\n");
+                goto error;
+        }
+
+        rc = vol_get_volumes(vol, &volume_ids, &nvols);
+        if (rc != EOK) {
+                printf("Error getting list of volumes.\n");
+                goto error;
+        }
+
+        /* XXX This could be handled more efficiently by volsrv itself */
+        found_cfg = false;
+        for (i = 0; i < nvols; i++) {
+                rc = vol_info(vol, volume_ids[i], &vinfo);
+                if (rc != EOK) {
+                        printf("Error getting volume information.\n");
+                        rc = EIO;
+                        goto error;
+                }
+
+                if (str_cmp(vinfo.path, "/w") == 0) {
+                        found_cfg = true;
+                        break;
+                }
+        }
+
+        vol_destroy(vol);
+        free(volume_ids);
+
+        if (!found_cfg) {
+                /* Prepare directory structure for live image mode */
+                printf("%s: Creating live image directory structure.\n", NAME);
+                cp = sys_dirs;
+                while (*cp != NULL) {
+                        rc = vfs_link_path(*cp, KIND_DIRECTORY, NULL);
+                        if (rc != EOK) {
+                                printf("%s: Error creating directory '%s'.\n",
+                                    NAME, *cp);
+                                return rc;
+                        }
+
+                        ++cp;
+                }
+        } else {
+                printf("%s: System volume is configured.\n", NAME);
+        }
+
+        return EOK;
+error:
+        vol_destroy(vol);
+        if (volume_ids != NULL)
+                free(volume_ids);
+
+        return rc;
+}
+
 int main(int argc, char *argv[])
 {
@@ -375 +455 @@
         srv_start("/srv/hound");
 
+        init_sysvol();
+
         if (!config_key_exists("console")) {
                 rc = compositor(HID_INPUT, HID_COMPOSITOR_SERVER);

uspace/app/sysinst/sysinst.c

@@ -79 +79 @@
 #define BOOT_BLOCK_IDX 0 /* MBR */
 
+static const char *sys_dirs[] = {
+        "/cfg",
+        "/data"
+};
+
 /** Label the destination device.
  *
@@ -160 +165 @@
         *psvc_id = pinfo.svc_id;
         return EOK;
+}
+
+/** Set up system volume structure.
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t sysinst_setup_sysvol(void)
+{
+        errno_t rc;
+        char *path = NULL;
+        const char **cp;
+        int rv;
+
+        cp = sys_dirs;
+        while (*cp != NULL) {
+                rv = asprintf(&path, "%s%s", MOUNT_POINT, *cp);
+                if (rv < 0) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                rc = vfs_link_path(path, KIND_DIRECTORY, NULL);
+                if (rc != EOK) {
+                        printf("Error creating directory '%s'.\n", path);
+                        goto error;
+                }
+
+                free(path);
+                path = NULL;
+                ++cp;
+        }
+
+        free(path);
+        path = NULL;
+
+        return EOK;
+error:
+        if (path != NULL)
+                free(path);
+        return rc;
 }
 
@@ -415 +460 @@
                 return rc;
 
-        printf("FS created and mounted. Copying boot files.\n");
+        printf("FS created and mounted. Creating system directory structure.\n");
+        rc = sysinst_setup_sysvol();
+        if (rc != EOK)
+                return rc;
+
+        printf("Directories created. Copying boot files.\n");
         rc = sysinst_copy_boot_files();
         if (rc != EOK)

uspace/app/tetris/scores.c

@@ -212 +212 @@
         int rc;
 
-        f = fopen("/data/tetris.sco", "rb");
+        f = fopen("/w/data/tetris.sco", "rb");
         if (f == NULL)
                 return ENOENT;
@@ -231 +231 @@
         int rc;
 
-        f = fopen("/data/tetris.sco", "wb");
+        f = fopen("/w/data/tetris.sco", "wb");
         if (f == NULL) {
                 printf("Error creating table\n");

uspace/app/vol/vol.c

@@ -49 +49 @@
         vcmd_help,
         vcmd_list,
+        vcmd_cfglist,
 } vol_cmd_t;
 
@@ -239 +240 @@
 }
 
+/** List volume configuration entries.
+ *
+ * @return EOK on success or an error code
+ */
+static errno_t vol_cmd_cfglist(void)
+{
+        vol_t *vol = NULL;
+        vol_info_t vinfo;
+        volume_id_t *volume_ids = NULL;
+        size_t nvols;
+        size_t i;
+        table_t *table = NULL;
+        errno_t rc;
+
+        rc = vol_create(&vol);
+        if (rc != EOK) {
+                printf("Error contacting volume service.\n");
+                goto out;
+        }
+
+        rc = vol_get_volumes(vol, &volume_ids, &nvols);
+        if (rc != EOK) {
+                printf("Error getting list of volumes.\n");
+                goto out;
+        }
+
+        rc = table_create(&table);
+        if (rc != EOK) {
+                printf("Out of memory.\n");
+                goto out;
+        }
+
+        table_header_row(table);
+        table_printf(table, "Volume Name\t" "Path\n");
+
+        for (i = 0; i < nvols; i++) {
+                rc = vol_info(vol, volume_ids[i], &vinfo);
+                if (rc != EOK) {
+                        printf("Error getting volume information.\n");
+                        return EIO;
+                }
+
+                table_printf(table, "%s\t" "%s\n", vinfo.label, vinfo.path);
+        }
+
+        rc = table_print_out(table, stdout);
+        if (rc != EOK)
+                printf("Error printing table.\n");
+out:
+        table_destroy(table);
+        vol_destroy(vol);
+        free(volume_ids);
+
+        return rc;
+}
+
 static void print_syntax(void)
 {
         printf("Syntax:\n");
-        printf("  %s                List volumes\n", NAME);
+        printf("  %s                List present volumes\n", NAME);
+        printf("  %s -c             List volume configuration entries\n", NAME);
         printf("  %s -h             Print help\n", NAME);
         printf("  %s eject <mp>     Eject volume mounted in a directory\n", NAME);
@@ -264 +322 @@
                 if (str_cmp(cmd, "-h") == 0) {
                         vcmd = vcmd_help;
+                } else if (str_cmp(cmd, "-c") == 0) {
+                        vcmd = vcmd_cfglist;
                 } else if (str_cmp(cmd, "eject") == 0) {
                         vcmd = vcmd_eject;
@@ -303 +363 @@
                 rc = vol_cmd_list();
                 break;
+        case vcmd_cfglist:
+                rc = vol_cmd_cfglist();
+                break;
         }