Changeset dbd91da in mainline for uspace/lib

Timestamp:

2024-10-05T10:32:59Z (12 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

6b8e89b0

Parents:

34abe6c5

git-author:

Miroslav Cimerman <mc@…> (2024-10-05 10:23:08)

git-committer:

Miroslav Cimerman <mc@…> (2024-10-05 10:32:59)

Message:

hr: remake structures to include extent status

Also rename .devs → .extents in hr_volume_t and when printing status,
display each extent status, and parity disk when array is of type RAID4.

Location:

uspace/lib/device

Files:

• include/hr.h (modified) (1 diff)
• src/hr.c (modified) (2 diffs)

uspace/lib/device/include/hr.h

@@ -64 +64 @@
 } hr_config_t;
 
+typedef struct hr_extent {
+        service_id_t svc_id;
+        int status;
+} hr_extent_t;
+
 typedef struct hr_vol_info {
-        service_id_t extents[HR_MAXDEVS];
+        hr_extent_t extents[HR_MAXDEVS];
         size_t extent_no;
         service_id_t svc_id;

uspace/lib/device/src/hr.c

@@ -146 +146 @@
         size_t i;
         char *devname;
+        hr_extent_t *ext;
 
         printf("--- vol %zu ---\n", index);
@@ -170 +171 @@
         printf("block size: %zu\n", vol_info->bsize);
 
-        printf("extents: [index] [devname]\n");
+        if (vol_info->level == hr_l_4)
+                printf("extents: [P] [status] [index] [devname]\n");
+        else
+                printf("extents: [status] [index] [devname]\n");
         for (i = 0; i < vol_info->extent_no; i++) {
-                rc = loc_service_get_name(vol_info->extents[i], &devname);
+                ext = &vol_info->extents[i];
+                rc = loc_service_get_name(ext->svc_id, &devname);
                 if (rc != EOK)
                         return rc;
-                printf("          %zu       %s\n", i, devname);
+                if (i == 0 && vol_info->level == hr_l_4)
+                        printf("          P   %d        %zu       %s\n", ext->status, i, devname);
+                else if (vol_info->level == hr_l_4)
+                        printf("              %d        %zu       %s\n", ext->status, i, devname);
+                else
+                        printf("          %d        %zu       %s\n", ext->status, i, devname);
         }
         return EOK;