Changeset 4c6fd56 in mainline for uspace/srv/bd

Timestamp:

2023-09-16T19:58:18Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7d7f5e3

Parents:

6a0b2cc

git-author:

Jiri Svoboda <jiri@…> (2023-09-16 19:48:07)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-16 19:58:18)

Message:

loc_server_register() should be callable more than once (API only)

Now loc_server_register() returns a pointer to a loc_srv_t object,
that is then passed to loc_service_register() and
loc_service_add_to_cat().

Added loc_server_unregister() that unregisters the server
and frees the loc_srv_t object.

Updated all callers. The implementation, however, is a stub.
It is not actually possible to call loc_server_register() more
than once, yet.

Location:

uspace/srv/bd

Files:

• file_bd/file_bd.c (modified) (6 diffs)
• rd/rd.c (modified) (4 diffs)
• sata_bd/sata_bd.c (modified) (5 diffs)
• vbd/disk.c (modified) (6 diffs)
• vbd/disk.h (modified) (2 diffs)
• vbd/vbd.c (modified) (3 diffs)

uspace/srv/bd/file_bd/file_bd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -61 +61 @@
 static aoff64_t num_blocks;
 static FILE *img;
+static loc_srv_t *srv;
 
 static service_id_t service_id;
@@ -137 +138 @@
                 return -1;
 
-        rc = loc_service_register(device_name, &service_id);
+        rc = loc_service_register(srv, device_name, &service_id);
         if (rc != EOK) {
                 printf("%s: Unable to register device '%s': %s.\n",
@@ -150 +151 @@
         }
 
-        rc = loc_service_add_to_cat(service_id, disk_cat);
+        rc = loc_service_add_to_cat(srv, service_id, disk_cat);
         if (rc != EOK) {
                 printf("%s: Failed adding %s to category: %s",
@@ -176 +177 @@
 
         async_set_fallback_port_handler(file_bd_connection, NULL);
-        errno_t rc = loc_server_register(NAME);
+        errno_t rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf("%s: Unable to register driver.\n", NAME);
@@ -183 +184 @@
 
         img = fopen(fname, "rb+");
-        if (img == NULL)
-                return EINVAL;
+        if (img == NULL) {
+                rc = EINVAL;
+                goto error;
+        }
 
         if (fseek(img, 0, SEEK_END) != 0) {
-                fclose(img);
-                return EIO;
+                rc = EIO;
+                goto error;
         }
 
         off64_t img_size = ftell(img);
         if (img_size < 0) {
+                rc = EIO;
+                goto error;
+        }
+
+        num_blocks = img_size / block_size;
+
+        fibril_mutex_initialize(&dev_lock);
+
+        return EOK;
+error:
+        if (img != NULL) {
                 fclose(img);
-                return EIO;
-        }
-
-        num_blocks = img_size / block_size;
-
-        fibril_mutex_initialize(&dev_lock);
-
-        return EOK;
+                img = NULL;
+        }
+
+        if (srv != NULL) {
+                loc_server_unregister(srv);
+                srv = NULL;
+        }
+
+        return rc;
 }
 

uspace/srv/bd/rd/rd.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2007 Michal Konopa
  * Copyright (c) 2007 Martin Jelen
@@ -93 +94 @@
 
 static bd_srvs_t bd_srvs;
+static loc_srv_t *srv;
 
 static void rd_client_conn(ipc_call_t *icall, void *arg)
@@ -178 +180 @@
 
         async_set_fallback_port_handler(rd_client_conn, NULL);
-        ret = loc_server_register(NAME);
+        ret = loc_server_register(NAME, &srv);
         if (ret != EOK) {
                 printf("%s: Unable to register driver: %s\n", NAME, str_error(ret));
@@ -185 +187 @@
 
         service_id_t service_id;
-        ret = loc_service_register("bd/initrd", &service_id);
+        ret = loc_service_register(srv, "bd/initrd", &service_id);
         if (ret != EOK) {
                 printf("%s: Unable to register device service\n", NAME);

uspace/srv/bd/sata_bd/sata_bd.c

@@ -1 +1 @@
 /*
+ * Copyright (c) 2023 Jiri Svoboda
  * Copyright (c) 2012 Petr Jerman
  * All rights reserved.
@@ -57 +58 @@
 #define MAXDISKS  256
 
+static loc_srv_t *srv;
 static sata_bd_dev_t disk[MAXDISKS];
 static int disk_count;
@@ -249 +251 @@
 
         async_set_fallback_port_handler(sata_bd_connection, NULL);
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &srv);
         if (rc != EOK) {
                 printf(NAME ": Unable to register driver: %s.\n", str_error(rc));
@@ -270 +272 @@
                 char name[1024];
                 snprintf(name, 1024, "%s/%s", NAMESPACE, disk[i].dev_name);
-                rc = loc_service_register(name, &disk[i].service_id);
+                rc = loc_service_register(srv, name, &disk[i].service_id);
                 if (rc != EOK) {
                         printf(NAME ": Unable to register device %s: %s\n", name, str_error(rc));
@@ -276 +278 @@
                 }
 
-                rc = loc_service_add_to_cat(disk[i].service_id, disk_cat);
+                rc = loc_service_add_to_cat(srv, disk[i].service_id, disk_cat);
                 if (rc != EOK) {
                         printf("%s: Failed adding %s to category: %s.",

uspace/srv/bd/vbd/disk.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2016 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 #include "types/vbd.h"
 
+loc_srv_t *vbds_srv;
+
 static fibril_mutex_t vbds_disks_lock;
 static list_t vbds_disks; /* of vbds_disk_t */
@@ -1122 +1124 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "loc_service_register('%s')",
             name);
-        rc = loc_service_register(name, &psid);
+        rc = loc_service_register(vbds_srv, name, &psid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering "
@@ -1131 +1133 @@
         }
 
-        rc = loc_service_add_to_cat(psid, part_cid);
+        rc = loc_service_add_to_cat(vbds_srv, psid, part_cid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failled adding partition "
@@ -1138 +1140 @@
                 free(part);
 
-                rc = loc_service_unregister(psid);
+                rc = loc_service_unregister(vbds_srv, psid);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR, "Error unregistering "
@@ -1160 +1162 @@
             "disk->svc_name='%s', id=%zu)", part->disk->svc_name, part->svc_id);
 
-        rc = loc_service_unregister(part->svc_id);
+        rc = loc_service_unregister(vbds_srv, part->svc_id);
         if (rc != EOK)
                 return EIO;

uspace/srv/bd/vbd/disk.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -57 +57 @@
 extern void vbds_bd_conn(ipc_call_t *, void *);
 
+extern loc_srv_t *vbds_srv;
+
 #endif
 

uspace/srv/bd/vbd/vbd.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2015 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -68 +68 @@
         async_set_fallback_port_handler(vbds_client_conn, NULL);
 
-        rc = loc_server_register(NAME);
+        rc = loc_server_register(NAME, &vbds_srv);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server: %s.", str_error(rc));
@@ -74 +74 @@
         }
 
-        rc = loc_service_register(SERVICE_NAME_VBD, &ctl_sid);
+        rc = loc_service_register(vbds_srv, SERVICE_NAME_VBD, &ctl_sid);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service: %s.", str_error(rc));