Changeset 095a989 in mainline

Timestamp:

2024-09-05T22:34:53Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

ee83e9c

Parents:

e192339

git-author:

Miroslav Cimerman <mc@…> (2024-09-05 22:31:28)

git-committer:

Miroslav Cimerman <mc@…> (2024-09-05 22:34:53)

Message:

hr: add status printing

Location:

uspace

Files:

• app/hrctl/hrctl.c (modified) (1 diff)
• lib/device/include/hr.h (modified) (1 diff)
• lib/device/include/ipc/hr.h (modified) (1 diff)
• lib/device/src/hr.c (modified) (1 diff)
• srv/bd/hr/hr.c (modified) (2 diffs)

uspace/app/hrctl/hrctl.c

@@ -231 +231 @@
                         return 0;
                 case 's':
-                        printf("hrctl: status not implemented yet\n");
-                        return 1;
+                        rc = hr_print_status();
+                        if (rc != EOK)
+                                return 1;
+                        return 0;
                 case 'a':
                         if (str_size(optarg) > 31) {

uspace/lib/device/include/hr.h

@@ -63 +63 @@
 } hr_config_t;
 
+typedef struct hr_vol_info {
+        service_id_t extents[HR_MAXDEVS];
+        size_t extent_no;
+        service_id_t svc_id;
+        hr_level_t level;
+        uint64_t nblocks;
+        size_t bsize;
+} hr_vol_info_t;
+
 extern errno_t hr_sess_init(hr_t **);
 extern void hr_sess_destroy(hr_t *);
 
 extern errno_t hr_create(hr_t *, hr_config_t *);
+extern errno_t hr_print_status(void);
 
 #endif

uspace/lib/device/include/ipc/hr.h

@@ -39 +39 @@
 
 typedef enum {
-        HR_CREATE = IPC_FIRST_USER_METHOD
+        HR_CREATE = IPC_FIRST_USER_METHOD,
+        HR_STATUS
 } hr_request_t;
 

uspace/lib/device/src/hr.c

@@ -114 +114 @@
 }
 
+static errno_t print_vol_info(size_t index, hr_vol_info_t *vol_info)
+{
+        errno_t rc;
+        size_t i;
+        char *devname;
+
+        printf("--- vol %zu ---\n", index);
+
+        printf("svc_id: %lu\n", vol_info->svc_id);
+
+        rc = loc_service_get_name(vol_info->svc_id, &devname);
+        if (rc != EOK)
+                return rc;
+        printf("devname: %s\n", devname);
+
+        printf("level: %d\n", vol_info->level);
+        printf("nblocks: %lu\n", vol_info->nblocks);
+        printf("bsize: %zu\n", vol_info->bsize);
+
+        printf("extents: [index] [devname]\n");
+        for (i = 0; i < vol_info->extent_no; i++) {
+                rc = loc_service_get_name(vol_info->extents[i], &devname);
+                if (rc != EOK)
+                        return rc;
+                printf("          %zu       %s\n", i, devname);
+        }
+        return EOK;
+}
+
+errno_t hr_print_status(void)
+{
+        hr_t *hr;
+        errno_t rc, retval;
+        async_exch_t *exch;
+        aid_t req;
+        size_t size, i;
+        hr_vol_info_t *vols;
+
+        rc = hr_sess_init(&hr);
+        if (rc != EOK)
+                return rc;
+
+        exch = async_exchange_begin(hr->sess);
+        if (exch == NULL)
+                return EINVAL;
+
+        req = async_send_0(exch, HR_STATUS, NULL);
+
+        rc = async_data_read_start(exch, &size, sizeof(size_t));
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return rc;
+        }
+
+        vols = calloc(size, sizeof(hr_vol_info_t));
+        if (vols == NULL) {
+                async_exchange_end(exch);
+                async_forget(req);
+                return ENOMEM;
+        }
+
+        for (i = 0; i < size; i++) {
+                rc = async_data_read_start(exch, &vols[i],
+                    sizeof(hr_vol_info_t));
+                if (rc != EOK) {
+                        async_exchange_end(exch);
+                        async_forget(req);
+                        goto error;
+                }
+        }
+
+        async_exchange_end(exch);
+        async_wait_for(req, &retval);
+        if (retval != EOK) {
+                rc = retval;
+                goto error;
+        }
+
+        for (i = 0; i < size; i++) {
+                rc = print_vol_info(i, &vols[i]);
+                if (rc != EOK)
+                        goto error;
+        }
+
+error:
+        if (vols != NULL)
+                free(vols);
+        return rc;
+}
+
 /** @}
  */

uspace/srv/bd/hr/hr.c

@@ -136 +136 @@
 }
 
+static void hr_print_status_srv(ipc_call_t *icall)
+{
+        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_status_srv()");
+
+        errno_t rc;
+        size_t vol_cnt = 0;
+        hr_vol_info_t info;
+        ipc_call_t call;
+        size_t size;
+
+        fibril_mutex_lock(&hr_volumes_lock);
+
+        vol_cnt = list_count(&hr_volumes);
+
+        if (!async_data_read_receive(&call, &size)) {
+                rc = EREFUSED;
+                goto error;
+        }
+
+        if (size != sizeof(size_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        rc = async_data_read_finalize(&call, &vol_cnt, size);
+        if (rc != EOK)
+                goto error;
+
+        list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
+                memcpy(info.extents, volume->devs,
+                    sizeof(service_id_t) * HR_MAXDEVS);
+                info.svc_id = volume->svc_id;
+                info.extent_no = volume->dev_no;
+                info.level = volume->level;
+                info.nblocks = volume->nblocks;
+                info.bsize = volume->bsize;
+
+                if (!async_data_read_receive(&call, &size)) {
+                        rc = EREFUSED;
+                        goto error;
+                }
+
+                if (size != sizeof(hr_vol_info_t)) {
+                        rc = EINVAL;
+                        goto error;
+                }
+
+                rc = async_data_read_finalize(&call, &info, size);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        fibril_mutex_unlock(&hr_volumes_lock);
+        async_answer_0(icall, EOK);
+        return;
+error:
+        fibril_mutex_unlock(&hr_volumes_lock);
+        async_answer_0(&call, rc);
+        async_answer_0(icall, rc);
+}
+
 static void hr_ctl_conn(ipc_call_t *icall, void *arg)
 {
@@ -155 +216 @@
                 case HR_CREATE:
                         hr_create_srv(&call);
+                        break;
+                case HR_STATUS:
+                        hr_print_status_srv(&call);
                         break;
                 default: