Changeset a19d7fc4 in mainline

Timestamp:

2024-09-06T14:56:46Z (8 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

4a2a6b8b

Parents:

09398589

git-author:

Miroslav Cimerman <mc@…> (2024-09-06 14:54:21)

git-committer:

Miroslav Cimerman <mc@…> (2024-09-06 14:56:46)

Message:

hr: add option (-T, —stop) for removing an active array

Location:

uspace

Files:

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

uspace/app/hrctl/hrctl.c

@@ -86 +86 @@
         { "create-file", required_argument, 0, 'C' },
         { "assemble-file", required_argument, 0, 'A' },
+        { "stop", required_argument, 0, 'T' },
         { 0, 0, 0, 0 }
 };
@@ -231 +232 @@
 
         while (c != -1) {
-                c = getopt_long(argc, argv, "hsC:c:A:a:l:015Ln:",
+                c = getopt_long(argc, argv, "hsC:c:A:a:l:015Ln:T:",
                     long_options, NULL);
                 switch (c) {
@@ -275 +276 @@
                         assemble = true;
                         break;
+                case 'T':
+                        rc = hr_stop(optarg);
+                        free(cfg);
+                        if (rc != EOK)
+                                return 1;
+                        return 0;
                 case 'l':
                         if (cfg->level != hr_l_empty)

uspace/lib/device/include/hr.h

@@ -78 +78 @@
 extern errno_t hr_create(hr_t *, hr_config_t *);
 extern errno_t hr_assemble(hr_t *, hr_config_t *);
+extern errno_t hr_stop(const char *);
 extern errno_t hr_print_status(void);
 

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

@@ -41 +41 @@
         HR_CREATE = IPC_FIRST_USER_METHOD,
         HR_ASSEMBLE,
+        HR_STOP,
         HR_STATUS
 } hr_request_t;

uspace/lib/device/src/hr.c

@@ -180 +180 @@
 }
 
+errno_t hr_stop(const char *devname)
+{
+        hr_t *hr;
+        errno_t rc;
+        async_exch_t *exch;
+        service_id_t svc_id;
+
+        rc = loc_service_get_id(devname, &svc_id, 0);
+        if (rc != EOK)
+                return rc;
+
+        rc = hr_sess_init(&hr);
+        if (rc != EOK)
+                return rc;
+
+        exch = async_exchange_begin(hr->sess);
+        if (exch == NULL) {
+                rc = EINVAL;
+                goto error;
+        }
+        rc = async_req_1_0(exch, HR_STOP, svc_id);
+        async_exchange_end(exch);
+
+        if (rc != EOK)
+                goto error;
+error:
+        hr_sess_destroy(hr);
+        return rc;
+}
+
 errno_t hr_print_status(void)
 {
@@ -187 +217 @@
         aid_t req;
         size_t size, i;
-        hr_vol_info_t *vols;
+        hr_vol_info_t *vols = NULL;
 
         rc = hr_sess_init(&hr);
@@ -194 +224 @@
 
         exch = async_exchange_begin(hr->sess);
-        if (exch == NULL)
-                return EINVAL;
+        if (exch == NULL) {
+                rc = EINVAL;
+                goto error;
+        }
 
         req = async_send_0(exch, HR_STATUS, NULL);
-
         rc = async_data_read_start(exch, &size, sizeof(size_t));
         if (rc != EOK) {
@@ -230 +261 @@
         }
 
+        if (size == 0) {
+                printf("no active arrays\n");
+                goto error;
+        }
+
         for (i = 0; i < size; i++) {
                 rc = print_vol_info(i, &vols[i]);
@@ -237 +273 @@
 
 error:
+        hr_sess_destroy(hr);
         if (vols != NULL)
                 free(vols);

uspace/srv/bd/hr/hr.c

@@ -61 +61 @@
 static service_id_t ctl_sid;
 
+static hr_volume_t *hr_get_volume(service_id_t svc_id)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "hr_get_volume(): (%" PRIun ")",
+            svc_id);
+
+        fibril_mutex_lock(&hr_volumes_lock);
+        list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
+                if (volume->svc_id == svc_id) {
+                        fibril_mutex_unlock(&hr_volumes_lock);
+                        return volume;
+                }
+        }
+
+        fibril_mutex_unlock(&hr_volumes_lock);
+        return NULL;
+}
+
+static errno_t hr_remove_volume(service_id_t svc_id)
+{
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "hr_remove_volume(): (%" PRIun ")",
+            svc_id);
+
+        fibril_mutex_lock(&hr_volumes_lock);
+        list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
+                if (volume->svc_id == svc_id) {
+                        hr_fini_devs(volume);
+                        list_remove(&volume->lvolumes);
+                        free(volume);
+                        fibril_mutex_unlock(&hr_volumes_lock);
+                        return EOK;
+                }
+        }
+
+        fibril_mutex_unlock(&hr_volumes_lock);
+        return ENOENT;
+}
+
 static void hr_create_srv(ipc_call_t *icall)
 {
@@ -262 +299 @@
 }
 
+static void hr_stop_srv(ipc_call_t *icall)
+{
+        log_msg(LOG_DEFAULT, LVL_NOTE, "hr_stop_srv()");
+
+        errno_t rc;
+        service_id_t svc_id;
+        hr_volume_t *vol;
+
+        svc_id = ipc_get_arg1(icall);
+
+        vol = hr_get_volume(svc_id);
+        if (vol == NULL) {
+                async_answer_0(icall, ENOENT);
+                return;
+        }
+
+        rc = hr_remove_volume(svc_id);
+        if (rc != EOK) {
+                async_answer_0(icall, rc);
+                return;
+        }
+
+        rc = loc_service_unregister(hr_srv, svc_id);
+
+        async_answer_0(icall, rc);
+}
+
 static void hr_print_status_srv(ipc_call_t *icall)
 {
@@ -345 +409 @@
                         hr_create_srv(&call);
                         break;
+                case HR_ASSEMBLE:
+                        hr_assemble_srv(&call);
+                        break;
+                case HR_STOP:
+                        hr_stop_srv(&call);
+                        break;
                 case HR_STATUS:
                         hr_print_status_srv(&call);
                         break;
-                case HR_ASSEMBLE:
-                        hr_assemble_srv(&call);
-                        break;
                 default:
                         async_answer_0(&call, EINVAL);
                 }
         }
-}
-
-static hr_volume_t *hr_get_volume(service_id_t svc_id)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "hr_get_volume(): (%" PRIun ")",
-            svc_id);
-
-        fibril_mutex_lock(&hr_volumes_lock);
-        list_foreach(hr_volumes, lvolumes, hr_volume_t, volume) {
-                if (volume->svc_id == svc_id) {
-                        fibril_mutex_unlock(&hr_volumes_lock);
-                        return volume;
-                }
-        }
-
-        fibril_mutex_unlock(&hr_volumes_lock);
-        return NULL;
 }