Changeset e0bbecb in mainline for uspace/srv/bd/hr/hr.c

Timestamp:

2025-06-09T20:01:03Z (6 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e2a8fd2

Parents:

431b513

Message:

hr: move state printing to hrctl

One IPC call is for short volume states printing
and other one for specific volume detailed info
printing.

File:

• uspace/srv/bd/hr/hr.c (modified) (8 diffs)

uspace/srv/bd/hr/hr.c

@@ -59 +59 @@
 static void hr_stop_all_srv(ipc_call_t *);
 static void hr_add_hotspare_srv(ipc_call_t *);
-static void hr_print_state_srv(ipc_call_t *);
+static void hr_get_vol_states_srv(ipc_call_t *);
 static void hr_ctl_conn(ipc_call_t *);
 static void hr_client_conn(ipc_call_t *, void *);
@@ -416 +416 @@
 }
 
-/** Volume state printing (server).
- *
- * Prints info about all active volumes.
- */
-static void hr_print_state_srv(ipc_call_t *icall)
+/** Send volume states.
+ *
+ * Sends the client pairs of (volume service_id, state).
+ */
+static void hr_get_vol_states_srv(ipc_call_t *icall)
 {
         HR_DEBUG("%s()", __func__);
@@ -426 +426 @@
         errno_t rc;
         size_t vol_cnt = 0;
-        hr_vol_info_t info;
+        hr_pair_vol_state_t pair;
         ipc_call_t call;
         size_t size;
@@ -439 +439 @@
         }
 
-        if (size != sizeof(size_t)) {
+        if (size != sizeof(vol_cnt)) {
                 rc = EINVAL;
                 goto error;
@@ -449 +449 @@
 
         list_foreach(hr_volumes, lvolumes, hr_volume_t, vol) {
-                memcpy(info.extents, vol->extents,
-                    sizeof(hr_extent_t) * HR_MAX_EXTENTS);
-                memcpy(info.hotspares, vol->hotspares,
-                    sizeof(hr_extent_t) * HR_MAX_HOTSPARES);
-                info.svc_id = vol->svc_id;
-                info.extent_no = vol->extent_no;
-                info.hotspare_no = vol->hotspare_no;
-                info.level = vol->level;
-                /* print usable number of blocks */
-                /* TODO: change to data_blkno */
-                info.nblocks = vol->data_blkno;
-                info.strip_size = vol->strip_size;
-                info.bsize = vol->bsize;
-                info.state = vol->state;
-                info.layout = vol->layout;
+                pair.svc_id = vol->svc_id;
+                pair.state = vol->state;
 
                 if (!async_data_read_receive(&call, &size)) {
@@ -470 +457 @@
                 }
 
-                if (size != sizeof(hr_vol_info_t)) {
+                if (size != sizeof(pair)) {
                         rc = EINVAL;
                         goto error;
                 }
 
-                rc = async_data_read_finalize(&call, &info, size);
+                rc = async_data_read_finalize(&call, &pair, size);
                 if (rc != EOK)
                         goto error;
@@ -489 +476 @@
 }
 
+/** Send volume info.
+ *
+ * Sends the client volume info.
+ */
+static void hr_get_vol_info_srv(ipc_call_t *icall)
+{
+        HR_DEBUG("%s()", __func__);
+
+        errno_t rc;
+        size_t size;
+        ipc_call_t call;
+        service_id_t svc_id;
+        hr_vol_info_t info;
+        hr_volume_t *vol;
+
+        if (!async_data_write_receive(&call, &size)) {
+                rc = EREFUSED;
+                goto error;
+        }
+
+        if (size != sizeof(service_id_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        rc = async_data_write_finalize(&call, &svc_id, size);
+        if (rc != EOK)
+                goto error;
+
+        vol = hr_get_volume(svc_id);
+        if (vol == NULL) {
+                rc = ENOENT;
+                goto error;
+        }
+
+        memcpy(info.extents, vol->extents,
+            sizeof(hr_extent_t) * HR_MAX_EXTENTS);
+        memcpy(info.hotspares, vol->hotspares,
+            sizeof(hr_extent_t) * HR_MAX_HOTSPARES);
+        info.svc_id = vol->svc_id;
+        info.extent_no = vol->extent_no;
+        info.hotspare_no = vol->hotspare_no;
+        info.level = vol->level;
+        info.data_blkno = vol->data_blkno;
+        info.strip_size = vol->strip_size;
+        info.bsize = vol->bsize;
+        info.state = vol->state;
+        info.layout = vol->layout;
+        info.meta_type = vol->meta_ops->get_type();
+        memcpy(info.devname, vol->devname, HR_DEVNAME_LEN);
+
+        if (!async_data_read_receive(&call, &size)) {
+                rc = EREFUSED;
+                goto error;
+        }
+
+        if (size != sizeof(info)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        rc = async_data_read_finalize(&call, &info, size);
+        if (rc != EOK)
+                goto error;
+
+        async_answer_0(icall, EOK);
+        return;
+error:
+        async_answer_0(&call, rc);
+        async_answer_0(icall, rc);
+}
+
 /**  HelenRAID server control IPC methods crossroad.
  */
@@ -529 +588 @@
                         hr_add_hotspare_srv(&call);
                         break;
-                case HR_STATUS:
-                        hr_print_state_srv(&call);
+                case HR_GET_VOL_STATES:
+                        hr_get_vol_states_srv(&call);
+                        break;
+                case HR_GET_VOL_INFO:
+                        hr_get_vol_info_srv(&call);
                         break;
                 default: