Changeset fc265b4 in mainline for uspace/app/hrctl/hrctl.c

Timestamp:

2025-05-07T10:41:29Z (5 weeks ago)

Author:

Miroslav Cimerman <mc@…>

Children:

af4ecb76

Parents:

ac4b70b

Message:

hr: IPC methods: don't create own hr_t session

File:

• uspace/app/hrctl/hrctl.c (modified) (15 diffs)

uspace/app/hrctl/hrctl.c

@@ -229 +229 @@
 }
 
-static int handle_create(int argc, char **argv)
+static int handle_create(hr_t *hr, int argc, char **argv)
 {
         if (optind >= argc) {
@@ -287 +287 @@
         }
 
-        hr_t *hr;
-        errno_t rc = hr_sess_init(&hr);
-        if (rc != EOK) {
-                printf(NAME ": server session init failed: %s\n",
-                    str_error(rc));
-                goto error;
-        }
-
-        rc = hr_create(hr, vol_config);
+        errno_t rc = hr_create(hr, vol_config);
         if (rc != EOK) {
                 printf(NAME ": creation failed: %s\n",
@@ -301 +293 @@
                 goto error;
         }
-
-        hr_sess_destroy(hr);
 
         free(vol_config);
@@ -311 +301 @@
 }
 
-static int handle_assemble(int argc, char **argv)
+static int handle_assemble(hr_t *hr, int argc, char **argv)
 {
         if (optind >= argc) {
                 size_t cnt;
-                errno_t rc = hr_auto_assemble(&cnt);
+                errno_t rc = hr_auto_assemble(hr, &cnt);
                 if (rc != EOK) {
                         /* XXX: here have own error codes */
@@ -353 +343 @@
         }
 
-        hr_t *hr;
-        errno_t rc = hr_sess_init(&hr);
-        if (rc != EOK) {
-                printf(NAME ": server session init failed: %s\n",
-                    str_error(rc));
-                goto error;
-        }
-
         size_t cnt;
-        rc = hr_assemble(hr, vol_config, &cnt);
+        errno_t rc = hr_assemble(hr, vol_config, &cnt);
         if (rc != EOK) {
                 printf(NAME ": assmeble failed: %s\n", str_error(rc));
@@ -369 +351 @@
 
         printf("hrctl: auto assembled %zu volumes\n", cnt);
-
-        hr_sess_destroy(hr);
 
         free(vol_config);
@@ -379 +359 @@
 }
 
-static int handle_disassemble(int argc, char **argv)
+static int handle_disassemble(hr_t *hr, int argc, char **argv)
 {
         if (optind >= argc) {
-                errno_t rc = hr_stop_all();
+                errno_t rc = hr_stop_all(hr);
                 if (rc != EOK) {
                         printf(NAME ": stopping some volumes failed: %s\n",
@@ -398 +378 @@
         const char *devname = argv[optind++];
 
-        errno_t rc = hr_stop(devname);
+        errno_t rc = hr_stop(hr, devname);
         if (rc != EOK) {
                 printf(NAME ": disassembly of device \"%s\" failed: %s\n",
@@ -408 +388 @@
 }
 
-static int handle_modify(int argc, char **argv)
+static int handle_modify(hr_t *hr, int argc, char **argv)
 {
         if (optind >= argc) {
@@ -432 +412 @@
                 optind++;
                 unsigned long extent = strtol(argv[optind++], NULL, 10);
-                errno_t rc = hr_fail_extent(volname, extent);
+                errno_t rc = hr_fail_extent(hr, volname, extent);
                 if (rc != EOK) {
                         printf(NAME ": failing extent failed: %s\n",
@@ -441 +421 @@
             str_cmp(argv[optind], "-h") == 0) {
                 optind++;
-                errno_t rc = hr_add_hotspare(volname, argv[optind++]);
+                errno_t rc = hr_add_hotspare(hr, volname, argv[optind++]);
                 if (rc != EOK) {
                         printf(NAME ": adding hotspare failed: %s\n",
@@ -455 +435 @@
 }
 
-static int handle_status(int argc, char **argv)
+static int handle_status(hr_t *hr, int argc, char **argv)
 {
         (void)argc;
         (void)argv;
 
-        errno_t rc = hr_print_status();
+        errno_t rc = hr_print_status(hr);
         if (rc != EOK) {
                 printf(NAME ": status printing failed: %s\n", str_error(rc));
@@ -472 +452 @@
 {
         int rc = EXIT_SUCCESS;
-        int c;
+        hr_t *hr = NULL;
 
         if (argc < 2) {
@@ -479 +459 @@
         }
 
-        c = 0;
+        if (hr_sess_init(&hr) != EOK) {
+                printf(NAME ": hr server session init failed: %s\n",
+                    str_error(rc));
+                return EXIT_FAILURE;
+        }
+
         optreset = 1;
         optind = 0;
@@ -493 +478 @@
         };
 
-        while (c != -1) {
-                c = getopt_long(argc, argv, "hcadms", top_level_opts, NULL);
-                switch (c) {
-                case 'h':
-                        usage();
-                        return EXIT_SUCCESS;
-                case 'c':
-                        rc = handle_create(argc, argv);
-                        goto end;
-                case 'a':
-                        rc = handle_assemble(argc, argv);
-                        goto end;
-                case 'd':
-                        rc = handle_disassemble(argc, argv);
-                        goto end;
-                case 'm':
-                        rc = handle_modify(argc, argv);
-                        goto end;
-                case 's':
-                        rc = handle_status(argc, argv);
-                        goto end;
-                default:
-                        goto end;
-                }
+        int c = getopt_long(argc, argv, "hcadms", top_level_opts, NULL);
+        switch (c) {
+        case 'h':
+                usage();
+                goto end;
+        case 'c':
+                rc = handle_create(hr, argc, argv);
+                goto end;
+        case 'a':
+                rc = handle_assemble(hr, argc, argv);
+                goto end;
+        case 'd':
+                rc = handle_disassemble(hr, argc, argv);
+                goto end;
+        case 'm':
+                rc = handle_modify(hr, argc, argv);
+                goto end;
+        case 's':
+                rc = handle_status(hr, argc, argv);
+                goto end;
+        default:
+                goto end;
         }
 
 end:
+        hr_sess_destroy(hr);
+
         if (rc != EXIT_SUCCESS)
                 printf(NAME ": use --help to see usage\n");